diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 000000000..210f445ab --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,93 @@ +{ + "badgeTemplate": "\t\"๐Ÿ‘ช\" src=\"https://img.shields.io/badge/%F0%9F%91%AA_all_contributors-<%= contributors.length %>-21bb42.svg\" />", + "commit": false, + "commitConvention": "angular", + "commitType": "docs", + "contributors": [ + { + "login": "beyang", + "name": "Beyang Liu", + "avatar_url": "https://avatars.githubusercontent.com/u/1646931?v=4", + "profile": "https://sourcegraph.com/", + "contributions": ["code"] + }, + { + "login": "bitsnaps", + "name": "Ibrahim H.", + "avatar_url": "https://avatars.githubusercontent.com/u/1217741?v=4", + "profile": "https://stackoverflow.com/users/5494094/ibrahim-h", + "contributions": ["code"] + }, + { + "login": "danstiner", + "name": "Daniel Stiner", + "avatar_url": "https://avatars.githubusercontent.com/u/52513?v=4", + "profile": "https://danstiner.me/", + "contributions": ["bug"] + }, + { + "login": "emday4prez", + "name": "Emerson", + "avatar_url": "https://avatars.githubusercontent.com/u/35363144?v=4", + "profile": "https://github.com/emday4prez", + "contributions": ["code"] + }, + { + "login": "ghost", + "name": "Deleted user", + "avatar_url": "https://avatars.githubusercontent.com/u/10137?v=4", + "profile": "https://github.com/ghost", + "contributions": ["maintenance"] + }, + { + "login": "girishsontakke", + "name": "Girish Sontakke", + "avatar_url": "https://avatars.githubusercontent.com/u/61848210?v=4", + "profile": "https://girish.netlify.app/", + "contributions": ["code"] + }, + { + "login": "gutenye", + "name": "Guten", + "avatar_url": "https://avatars.githubusercontent.com/u/377544?v=4", + "profile": "https://maps.guten.me/", + "contributions": ["bug"] + }, + { + "login": "JoshuaKGoldberg", + "name": "Josh Goldberg โœจ", + "avatar_url": "https://avatars.githubusercontent.com/u/3335181?v=4", + "profile": "http://www.joshuakgoldberg.com/", + "contributions": ["maintenance", "bug", "tool", "code", "infra", "doc"] + }, + { + "login": "markjm", + "name": "Mark Molinaro", + "avatar_url": "https://avatars.githubusercontent.com/u/16494982?v=4", + "profile": "https://www.linkedin.com/in/markjm-1/", + "contributions": ["bug", "code"] + }, + { + "login": "micrology", + "name": "Nigel Gilbert", + "avatar_url": "https://avatars.githubusercontent.com/u/1449986?v=4", + "profile": "https://cress.soc.surrey.ac.uk/web/people/ngilbert", + "contributions": ["bug"] + }, + { + "login": "orionna319", + "name": "orionna319", + "avatar_url": "https://avatars.githubusercontent.com/u/85230052?v=4", + "profile": "https://orionna.me/", + "contributions": ["bug"] + } + ], + "contributorsPerLine": 7, + "contributorsSortAlphabetically": true, + "files": ["README.md"], + "imageSize": 100, + "projectName": "TypeStat", + "projectOwner": "JoshuaKGoldberg", + "repoHost": "https://github.com", + "repoType": "github" +} diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 19e9fd418..000000000 --- a/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -**/*.d.ts -test/cases/ \ No newline at end of file diff --git a/.eslintrc.cjs b/.eslintrc.cjs new file mode 100644 index 000000000..6aa7d8aae --- /dev/null +++ b/.eslintrc.cjs @@ -0,0 +1,176 @@ +/** @type {import("@types/eslint").Linter.Config} */ +module.exports = { + env: { + es2022: true, + node: true, + }, + extends: [ + "eslint:recommended", + "plugin:eslint-comments/recommended", + "plugin:n/recommended", + "plugin:perfectionist/recommended-natural", + "plugin:regexp/recommended", + "plugin:vitest/recommended", + ], + ignorePatterns: [ + "!.*", + "coverage", + "lib", + "node_modules", + "test/cases", + "pnpm-lock.yaml", + ], + overrides: [ + { + extends: ["plugin:markdown/recommended-legacy"], + files: ["**/*.md"], + processor: "markdown/markdown", + }, + { + extends: [ + "plugin:jsdoc/recommended-typescript-error", + "plugin:@typescript-eslint/strict", + "plugin:@typescript-eslint/stylistic", + ], + files: ["**/*.ts"], + parser: "@typescript-eslint/parser", + rules: { + // These off-by-default rules work well for this repo and we like them on. + "jsdoc/informative-docs": "error", + "logical-assignment-operators": [ + "error", + "always", + { enforceForIfStatements: true }, + ], + "operator-assignment": "error", + + // These on-by-default rules don't work well for this repo and we like them off. + "jsdoc/require-jsdoc": "off", + "jsdoc/require-param": "off", + "jsdoc/require-property": "off", + "jsdoc/require-returns": "off", + "no-undef": "error", + }, + }, + { + files: "**/*.md/*.ts", + rules: { + "n/no-missing-import": ["error", { allowModules: ["TypeStat"] }], + }, + }, + { + excludedFiles: ["**/*.md/*.ts"], + extends: [ + "plugin:@typescript-eslint/strict-type-checked", + "plugin:@typescript-eslint/stylistic-type-checked", + ], + files: ["**/*.ts"], + parser: "@typescript-eslint/parser", + parserOptions: { + project: "./tsconfig.eslint.json", + }, + rules: { + // These off-by-default rules work well for this repo and we like them on. + "deprecation/deprecation": "error", + + // These too-strict-by-default rules work well for this repo, once configured. + "@typescript-eslint/restrict-template-expressions": [ + "error", + { + allowNumber: true, + }, + ], + }, + }, + { + excludedFiles: ["package.json"], + extends: ["plugin:jsonc/recommended-with-json"], + files: ["*.json", "*.jsonc"], + parser: "jsonc-eslint-parser", + rules: { + "jsonc/comma-dangle": "off", + "jsonc/sort-keys": "error", + }, + }, + { + files: ["*.jsonc"], + rules: { + "jsonc/no-comments": "off", + }, + }, + { + extends: ["plugin:package-json/recommended"], + files: ["package.json"], + parser: "jsonc-eslint-parser", + plugins: ["package-json"], + }, + { + files: "**/*.test.ts", + rules: { + // These on-by-default rules aren't useful in test files. + "@typescript-eslint/no-unsafe-assignment": "off", + "@typescript-eslint/no-unsafe-call": "off", + }, + }, + { + extends: ["plugin:yml/standard", "plugin:yml/prettier"], + files: ["**/*.{yml,yaml}"], + parser: "yaml-eslint-parser", + rules: { + "yml/file-extension": ["error", { extension: "yml" }], + "yml/sort-keys": [ + "error", + { + order: { type: "asc" }, + pathPattern: "^.*$", + }, + ], + "yml/sort-sequence-values": [ + "error", + { + order: { type: "asc" }, + pathPattern: "^.*$", + }, + ], + }, + }, + ], + parser: "@typescript-eslint/parser", + plugins: [ + "@typescript-eslint", + "deprecation", + "jsdoc", + "perfectionist", + "regexp", + "vitest", + ], + reportUnusedDisableDirectives: true, + root: true, + rules: { + // These off/less-strict-by-default rules work well for this repo and we like them on. + "@typescript-eslint/no-unused-vars": ["error", { caughtErrors: "all" }], + "no-undef": "off", + + // These on-by-default rules don't work well for this repo and we like them off. + "no-case-declarations": "off", + "no-constant-condition": "off", + "no-inner-declarations": "off", + "no-mixed-spaces-and-tabs": "off", + + // Stylistic concerns that don't interfere with Prettier + "@typescript-eslint/padding-line-between-statements": [ + "error", + { blankLine: "always", next: "*", prev: "block-like" }, + ], + "no-useless-rename": "error", + "object-shorthand": "error", + "perfectionist/sort-objects": [ + "error", + { + order: "asc", + "partition-by-comment": true, + type: "natural", + }, + ], + }, +}; diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 998b20148..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - extends: ["eslint:recommended", "plugin:@typescript-eslint/strict-type-checked", "plugin:@typescript-eslint/stylistic-type-checked"], - parser: "@typescript-eslint/parser", - parserOptions: { - project: "tsconfig.eslint.json", - sourceType: "module", - }, - plugins: ["deprecation", "no-only-tests"], - rules: { - "deprecation/deprecation": "error", - "no-only-tests/no-only-tests": "error", - }, -}; diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index c0078fa2f..84f95ffd0 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -2,75 +2,131 @@ ## Our Pledge -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. ## Our Standards -Examples of behavior that contributes to creating a positive environment -include: +Examples of behavior that contributes to a positive environment for our +community include: -- Using welcoming and inclusive language -- Being respectful of differing viewpoints and experiences -- Gracefully accepting constructive criticism -- Focusing on what is best for the community -- Showing empathy towards other community members +- Demonstrating empathy and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +- Focusing on what is best not just for us as individuals, but for the overall + community -Examples of unacceptable behavior by participants include: +Examples of unacceptable behavior include: -- The use of sexualized language or imagery and unwelcome sexual attention or - advances -- Trolling, insulting/derogatory comments, and personal or political attacks -- Public or private harassment -- Publishing others' private information, such as a physical or electronic - address, without explicit permission -- Other conduct which could reasonably be considered inappropriate in a - professional setting +- The use of sexualized language or imagery, and sexual attention or advances of + any kind +- Trolling, insulting or derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or email address, + without their explicit permission +- Other conduct which could reasonably be considered inappropriate in a + professional setting -## Our Responsibilities +## Enforcement Responsibilities -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. ## Scope -This Code of Conduct applies within all project spaces, and it also applies when -an individual is representing the project or its community in public spaces. -Examples of representing a project or community include using an official -project e-mail address, posting via an official social media account, or acting -as an appointed representative at an online or offline event. Representation of -a project may be further defined and clarified by project maintainers. +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at me@joshuakgoldberg.com. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. +reported to the community leaders responsible for enforcement at +git@joshuakgoldberg.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. -[homepage]: https://www.contributor-covenant.org +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][mozilla coc]. -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][faq]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[mozilla coc]: https://github.com/mozilla/diversity +[faq]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 000000000..fee9a4dac --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,97 @@ +# Contributing + +Thanks for your interest in contributing to `TypeStat`! ๐Ÿ’– + +> After this page, see [DEVELOPMENT.md](./DEVELOPMENT.md) for local development instructions. + +## Code of Conduct + +This project contains a [Contributor Covenant code of conduct](./CODE_OF_CONDUCT.md) all contributors are expected to follow. + +## Reporting Issues + +Please do [report an issue on the issue tracker](https://github.com/JoshuaKGoldberg/TypeStat/issues/new/choose) if there's any bugfix, documentation improvement, or general enhancement you'd like to see in the repository! Please fully fill out all required fields in the most appropriate issue form. + +## Sending Contributions + +Sending your own changes as contribution is always appreciated! +There are two steps involved: + +1. [Finding an Issue](#finding-an-issue) +2. [Sending a Pull Request](#sending-a-pull-request) + +### Finding an Issue + +With the exception of very small typos, all changes to this repository generally need to correspond to an [unassigned open issue marked as `status: accepting prs` on the issue tracker](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue+is%3Aopen+label%3A%22status%3A+accepting+prs%22+no%3Aassignee+). +If this is your first time contributing, consider searching for [unassigned issues that also have the `good first issue` label](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+label%3A%22status%3A+accepting+prs%22+no%3Aassignee+). +If the issue you'd like to fix isn't found on the issue, see [Reporting Issues](#reporting-issues) for filing your own (please do!). + +#### Issue Claiming + +We don't use any kind of issue claiming system. +We've found in the past that they result in accidental ["licked cookie"](https://devblogs.microsoft.com/oldnewthing/20091201-00/?p=15843) situations where contributors claim an issue but run out of time or energy trying before sending a PR. + +If an unassigned issue has been marked as `status: accepting prs` and an open PR does not exist, feel free to send a PR. +Please don't post comments asking for permission or stating you will work on an issue. + +### Sending a Pull Request + +Once you've identified an open issue accepting PRs that doesn't yet have a PR sent, you're free to send a pull request. +Be sure to fill out the pull request template's requested information -- otherwise your PR will likely be closed. + +PRs are also expected to have a title that adheres to [conventional commits](https://www.conventionalcommits.org/en/v1.0.0). +Only PR titles need to be in that format, not individual commits. +Don't worry if you get this wrong: you can always change the PR title after sending it. +Check [previously merged PRs](https://github.com/JoshuaKGoldberg/TypeStat/pulls?q=is%3Apr+is%3Amerged+-label%3Adependencies+) for reference. + +#### Draft PRs + +If you don't think your PR is ready for review, [set it as a draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft). +Draft PRs won't be reviewed. + +#### Granular PRs + +Please keep pull requests single-purpose: in other words, don't attempt to solve multiple unrelated problems in one pull request. +Send one PR per area of concern. +Multi-purpose pull requests are harder and slower to review, block all changes from being merged until the whole pull request is reviewed, and are difficult to name well with semantic PR titles. + +#### Pull Request Reviews + +When a PR is not in draft, it's considered ready for review. +Please don't manually `@` tag anybody to request review. +A maintainer will look at it when they're next able to. + +PRs should have passing [GitHub status checks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) before review is requested (unless there are explicit questions asked in the PR about any failures). + +#### Asking Questions + +If you need help and/or have a question, posting a comment in the PR is a great way to do so. +There's no need to tag anybody individually. +One of us will drop by and help when we can. + +Please post comments as [line comments](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request) when possible, so that they can be threaded. +You can [resolve conversations](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request#resolving-conversations) on your own when you feel they're resolved - no need to comment explicitly and/or wait for a maintainer. + +#### Requested Changes + +After a maintainer reviews your PR, they may request changes on it. +Once you've made those changes, [re-request review on GitHub](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#re-requesting-a-review). + +Please try not to force-push commits to PRs that have already been reviewed. +Doing so makes it harder to review the changes. +We squash merge all commits so there's no need to try to preserve Git history within a PR branch. + +Once you've addressed all our feedback by making code changes and/or started a followup discussion, [re-request review](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#re-requesting-a-review) from each maintainer whose feedback you addressed. + +Once all feedback is addressed and the PR is approved, we'll ensure the branch is up to date with `main` and merge it for you. + +#### Post-Merge Recognition + +Once your PR is merged, if you haven't yet been added to the [_Contributors_ table in the README.md](../README.md#contributors) for its [type of contribution](https://allcontributors.org/docs/en/emoji-key "Allcontributors emoji key"), you should be soon. +Please do ping the maintainer who merged your PR if that doesn't happen within 24 hours - it was likely an oversight on our end! + +## Emojis & Appreciation + +If you made it all the way to the end, bravo dear user, we love you. +Please include your favorite emoji in the bottom of your issues and PRs to signal to us that you did in fact read this file and are trying to conform to it as best as possible. +๐Ÿ’– is a good starter if you're not sure which to use. diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md new file mode 100644 index 000000000..7cc0371e4 --- /dev/null +++ b/.github/DEVELOPMENT.md @@ -0,0 +1,155 @@ +# Development + +After [forking the repo from GitHub](https://help.github.com/articles/fork-a-repo) and [installing pnpm](https://pnpm.io): + +```shell +git clone https://github.com//TypeStat +cd TypeStat +pnpm +``` + +> This repository includes a list of suggested VS Code extensions. +> It's a good idea to use [VS Code](https://code.visualstudio.com) and accept its suggestion to install them, as they'll help with development. + +## Building + +Run [**tsup**](https://tsup.egoist.dev) locally to build source files from `src/` into output files in `lib/`: + +```shell +pnpm build +``` + +Add `--watch` to run the builder in a watch mode that continuously cleans and recreates `lib/` as you save files: + +```shell +pnpm build --watch +``` + +## Formatting + +[Prettier](https://prettier.io) is used to format code. +It should be applied automatically when you save files in VS Code or make a Git commit. + +To manually reformat all files, you can run: + +```shell +pnpm format --write +``` + +## Linting + +[ESLint](https://eslint.org) is used with with [typescript-eslint](https://typescript-eslint.io)) to lint JavaScript and TypeScript source files. +You can run it locally on the command-line: + +```shell +pnpm run lint +``` + +ESLint can be run with `--fix` to auto-fix some lint rule complaints: + +```shell +pnpm run lint --fix +``` + +Note that you'll likely need to run `pnpm build` before `pnpm lint` so that lint rules which check the file system can pick up on any built files. + +## Testing + +There are two kinds of tests: + +- [Unit tests](#unit-tests) +- [Mutation tests](#mutation-tests) + +### Unit TEsts + +[Vitest](https://vitest.dev) is used for tests. +You can run it locally on the command-line: + +```shell +pnpm run test +``` + +Add the `--coverage` flag to compute test coverage and place reports in the `coverage/` directory: + +```shell +pnpm run test --coverage +``` + +Note that [console-fail-test](https://github.com/JoshuaKGoldberg/console-fail-test) is enabled for all test runs. +Calls to `console.log`, `console.warn`, and other console methods will cause a test to fail. + +#### Debugging Unit Tests + +This repository includes a [VS Code launch configuration](https://code.visualstudio.com/docs/editor/debugging) for debugging unit tests. +To launch it, open a test file, then run _Debug Current Test File_ from the VS Code Debug panel (or press F5). + +### Mutation Tests + +Most TypeStat tests run TypeStat on checked-in files and are built on [`automutate-tests`](https://github.com/automutate/automutate-tests). +These tests are located under `test/cases`. + +`pnpm run test:mutation` may take in two parameters: + +#### `--accept` + +Whether to override existing expected test results instead of asserting equality. +Tests can still fail if TypeStat throws an error, but not if the contents aren't equal. + +```shell +pnpm run test:mutation --accept +``` + +#### `--include` + +Regular expression filter(s) to include only some tests. +If not provided (the default), all tests are run. +If provided, only tests whose name matches one or more include filter will run. + +Include filters are always prefixed and suffixed with `(.*)`, so you don't need to explicitly provide full test names. + +For example, to run all tests with `variable` in their name: + +```shell +pnpm run test:mutation --include "noImplicitAny" +``` + +To run the `noImplicitAny/variableDeclarations` tests, either would work: + +```shell +pnpm run test:mutation --accept --include "noImplicitAny/variableDeclarations" +pnpm run test:mutation --accept --include "ImplicitAn.*variableDeclaration" +``` + +#### Debugging Mutation Tests + +VS Code tasks to debug test files is shipped that allows directly placing breakpoints in source TypeScript code. + +- `Accept Current Mutation Test` runs with `--accept` on the test folder of a currently opened test file, such as an `original.ts` or `typestat.json`. +- `Debug Current Mutation Test` does not run with `--accept`, and thus logs any differences as errors. + +## Performance Debugging Tips + +You can use the debugger in Chrome to debug TypeStat on the CLI. +Run it with `node --inspect` then visit `chrome://inspect` to use the browser debugger. + +For example: + +```shell +node --inspect typestat --config typestat.json +``` + +## Type Checking + +You should be able to see suggestions from [TypeScript](https://typescriptlang.org) in your editor for all open files. + +However, it can be useful to run the TypeScript command-line (`tsc`) to type check all files in `src/`: + +```shell +pnpm tsc +``` + +Add `--watch` to keep the type checker running in a watch mode that updates the display as you save files: + +```shell +pnpm tsc --watch +``` diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1f7d8d1d4..398a67fa3 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,18 +1,9 @@ - + + -If your issue doesn't provide enough info to fully explain or reproduce your request, it will be closed. ๐Ÿ˜ฆ ---> + -### Overview +## Overview - - -#### Actual Behavior - - - -#### Expected Behavior - - +... diff --git a/.github/ISSUE_TEMPLATE/01-bug.yml b/.github/ISSUE_TEMPLATE/01-bug.yml new file mode 100644 index 000000000..d31bf6088 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/01-bug.yml @@ -0,0 +1,33 @@ +body: + - attributes: + description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you! + label: Bug Report Checklist + options: + - label: I have tried restarting my IDE and the issue persists. + required: true + - label: I have pulled the latest `main` branch of the repository. + required: true + - label: I have [searched for related issues](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue) and found none that matched my issue. + required: true + type: checkboxes + - attributes: + description: What did you expect to happen? + label: Expected + type: textarea + validations: + required: true + - attributes: + description: What happened instead? + label: Actual + type: textarea + validations: + required: true + - attributes: + description: Any additional info you'd like to provide. + label: Additional Info + type: textarea +description: Report a bug trying to run the code +labels: + - "type: bug" +name: ๐Ÿ› Bug +title: "๐Ÿ› Bug: " diff --git a/.github/ISSUE_TEMPLATE/02-documentation.yml b/.github/ISSUE_TEMPLATE/02-documentation.yml new file mode 100644 index 000000000..7c8f632be --- /dev/null +++ b/.github/ISSUE_TEMPLATE/02-documentation.yml @@ -0,0 +1,25 @@ +body: + - attributes: + description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you! + label: Bug Report Checklist + options: + - label: I have pulled the latest `main` branch of the repository. + required: true + - label: I have [searched for related issues](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue) and found none that matched my issue. + required: true + type: checkboxes + - attributes: + description: What would you like to report? + label: Overview + type: textarea + validations: + required: true + - attributes: + description: Any additional info you'd like to provide. + label: Additional Info + type: textarea +description: Report a typo or missing area of documentation +labels: + - "area: documentation" +name: ๐Ÿ“ Documentation +title: "๐Ÿ“ Documentation: " diff --git a/.github/ISSUE_TEMPLATE/03-feature.yml b/.github/ISSUE_TEMPLATE/03-feature.yml new file mode 100644 index 000000000..5f4859064 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/03-feature.yml @@ -0,0 +1,25 @@ +body: + - attributes: + description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you! + label: Bug Report Checklist + options: + - label: I have pulled the latest `main` branch of the repository. + required: true + - label: I have [searched for related issues](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue) and found none that matched my issue. + required: true + type: checkboxes + - attributes: + description: What did you expect to be able to do? + label: Overview + type: textarea + validations: + required: true + - attributes: + description: Any additional info you'd like to provide. + label: Additional Info + type: textarea +description: Request that a new feature be added or an existing feature improved +labels: + - "type: feature" +name: ๐Ÿš€ Feature +title: "๐Ÿš€ Feature: " diff --git a/.github/ISSUE_TEMPLATE/04-tooling.yml b/.github/ISSUE_TEMPLATE/04-tooling.yml new file mode 100644 index 000000000..88b6906d2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/04-tooling.yml @@ -0,0 +1,27 @@ +body: + - attributes: + description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you! + label: Bug Report Checklist + options: + - label: I have tried restarting my IDE and the issue persists. + required: true + - label: I have pulled the latest `main` branch of the repository. + required: true + - label: I have [searched for related issues](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue) and found none that matched my issue. + required: true + type: checkboxes + - attributes: + description: What did you expect to be able to do? + label: Overview + type: textarea + validations: + required: true + - attributes: + description: Any additional info you'd like to provide. + label: Additional Info + type: textarea +description: Report a bug or request an enhancement in repository tooling +labels: + - "area: tooling" +name: ๐Ÿ›  Tooling +title: "๐Ÿ›  Tooling: " diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b49a3a8cb..e43005ca4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,9 +12,9 @@ If your issue doesn't provide enough info to fully explain or reproduce your bug ### ๐Ÿ› Bug Report -- TypeStat version: X.X.X -- TypeScript version: X.X.X -- Node version: X.X.X +- TypeStat version: X.X.X +- TypeScript version: X.X.X +- Node version: X.X.X #### Actual Behavior diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2bdbd0ffb..9add33a0b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,13 @@ - + ## PR Checklist -- [ ] Addresses an existing issue: fixes #000 -- [ ] That issue was marked as [`status: accepting prs`](https://github.com/JoshuaKGoldberg/TypeStat/labels/status%3A%20accepting%20prs) +- [ ] Addresses an existing open issue: fixes #000 +- [ ] That issue was marked as [`status: accepting prs`](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aopen+is%3Aissue+label%3A%22status%3A+accepting+prs%22) +- [ ] Steps in [CONTRIBUTING.md](https://github.com/JoshuaKGoldberg/TypeStat/blob/main/.github/CONTRIBUTING.md) were taken ## Overview - + diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 000000000..08678393e --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,9 @@ +# Security Policy + +We take all security vulnerabilities seriously. +If you have a vulnerability or other security issues to disclose: + +- Thank you very much, please do! +- Please send them to us by emailing `git@joshuakgoldberg.com` + +We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions. diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml new file mode 100644 index 000000000..cb825e621 --- /dev/null +++ b/.github/actions/prepare/action.yml @@ -0,0 +1,14 @@ +description: Prepares the repo for a typical CI job + +name: Prepare + +runs: + steps: + - uses: pnpm/action-setup@v2 + - uses: actions/setup-node@v4 + with: + cache: pnpm + node-version: "20" + - run: pnpm install --frozen-lockfile + shell: bash + using: composite diff --git a/.github/codecov.yml b/.github/codecov.yml new file mode 100644 index 000000000..c1898f5a5 --- /dev/null +++ b/.github/codecov.yml @@ -0,0 +1,5 @@ +codecov: + notify: + after_n_builds: 2 +comment: + after_n_builds: 2 diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 000000000..639a14618 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "automerge": true, + "internalChecksFilter": "strict", + "labels": ["dependencies"], + "minimumReleaseAge": "3 days", + "postUpdateOptions": ["pnpmDedupe"] +} diff --git a/.github/workflows/accessibility-alt-text-bot.yml b/.github/workflows/accessibility-alt-text-bot.yml new file mode 100644 index 000000000..96af67f4b --- /dev/null +++ b/.github/workflows/accessibility-alt-text-bot.yml @@ -0,0 +1,26 @@ +jobs: + accessibility_alt_text_bot: + if: ${{ !endsWith(github.actor, '[bot]') }} + runs-on: ubuntu-latest + steps: + - uses: github/accessibility-alt-text-bot@v1.4.0 + +name: Accessibility Alt Text Bot + +on: + issue_comment: + types: + - created + - edited + issues: + types: + - edited + - opened + pull_request: + types: + - edited + - opened + +permissions: + issues: write + pull-requests: write diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..057fc5429 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,16 @@ +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm build + - run: node ./lib/index.js + +name: Build + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml new file mode 100644 index 000000000..341d28d56 --- /dev/null +++ b/.github/workflows/compliance.yml @@ -0,0 +1,28 @@ +jobs: + compliance: + runs-on: ubuntu-latest + steps: + - uses: mtfoley/pr-compliance-action@main + with: + body-auto-close: false + ignore-authors: |- + allcontributors + allcontributors[bot] + renovate + renovate[bot] + ignore-team-members: false + +name: Compliance + +on: + pull_request: + branches: + - main + types: + - edited + - opened + - reopened + - synchronize + +permissions: + pull-requests: write diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml new file mode 100644 index 000000000..9d22aa160 --- /dev/null +++ b/.github/workflows/contributors.yml @@ -0,0 +1,18 @@ +jobs: + contributors: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: ./.github/actions/prepare + - env: + GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + uses: JoshuaKGoldberg/all-contributors-auto-action@v0.4.3 + +name: Contributors + +on: + push: + branches: + - main diff --git a/.github/workflows/lint-knip.yml b/.github/workflows/lint-knip.yml new file mode 100644 index 000000000..781d52ef1 --- /dev/null +++ b/.github/workflows/lint-knip.yml @@ -0,0 +1,15 @@ +jobs: + lint_knip: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm lint:knip + +name: Lint Knip + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/lint-markdown.yml b/.github/workflows/lint-markdown.yml new file mode 100644 index 000000000..acac714de --- /dev/null +++ b/.github/workflows/lint-markdown.yml @@ -0,0 +1,15 @@ +jobs: + lint_markdown: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm lint:md + +name: Lint Markdown + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/lint-packages.yml b/.github/workflows/lint-packages.yml new file mode 100644 index 000000000..87520cac1 --- /dev/null +++ b/.github/workflows/lint-packages.yml @@ -0,0 +1,15 @@ +jobs: + lint_packages: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm lint:packages + +name: Lint Packages + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/lint-spelling.yml b/.github/workflows/lint-spelling.yml new file mode 100644 index 000000000..ef020b62c --- /dev/null +++ b/.github/workflows/lint-spelling.yml @@ -0,0 +1,15 @@ +jobs: + lint_spelling: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm lint:spelling + +name: Lint spelling + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..f174caa3d --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,15 @@ +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm lint + +name: Lint + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml new file mode 100644 index 000000000..5246faada --- /dev/null +++ b/.github/workflows/post-release.yml @@ -0,0 +1,27 @@ +jobs: + post_release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - run: echo "npm_version=$(npm pkg get version | tr -d '"')" >> "$GITHUB_ENV" + - uses: apexskier/github-release-commenter@v1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + comment-template: | + :tada: This is included in version {release_link} :tada: + + The release is available on: + + * [GitHub releases](https://github.com/JoshuaKGoldberg/TypeStat/releases/tag/{release_tag}) + * [npm package (@latest dist-tag)](https://www.npmjs.com/package/TypeStat/v/${{ env.npm_version }}) + + Cheers! ๐Ÿ“ฆ๐Ÿš€ + +name: Post Release + +on: + release: + types: + - published diff --git a/.github/workflows/pr-review-requested.yml b/.github/workflows/pr-review-requested.yml new file mode 100644 index 000000000..e2e518c8c --- /dev/null +++ b/.github/workflows/pr-review-requested.yml @@ -0,0 +1,21 @@ +jobs: + pr_review_requested: + runs-on: ubuntu-latest + steps: + - uses: actions-ecosystem/action-remove-labels@v1 + with: + labels: "status: waiting for author" + - if: failure() + run: | + echo "Don't worry if the previous step failed." + echo "See https://github.com/actions-ecosystem/action-remove-labels/issues/221." + +name: PR Review Requested + +on: + pull_request_target: + types: + - review_requested + +permissions: + pull-requests: write diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml new file mode 100644 index 000000000..ae43fc44d --- /dev/null +++ b/.github/workflows/prettier.yml @@ -0,0 +1,15 @@ +jobs: + prettier: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm format --list-different + +name: Prettier + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 52210941a..000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Publish to NPM - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: Codecademy/run-on-yarn@v2 - with: - command: compile - - uses: JS-DevTools/npm-publish@v3 - with: - token: ${{ secrets.NPM_TOKEN }} - -on: - push: - branches: - - main diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 90057f2bc..000000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Push CI - -jobs: - ci: - runs-on: ubuntu-latest - steps: - - uses: Codecademy/run-on-yarn@v2 - with: - command: ${{ matrix.command }} - node-version: 20 - - strategy: - fail-fast: false - matrix: - command: ["compile", "lint:eslint", "lint:markdownlint", "test:unit"] - - mutations: - runs-on: ubuntu-latest - steps: - - uses: Codecademy/run-on-yarn@v2 - with: - command: compile - node-version: 20 - - run: yarn test:mutation - -on: - push: - branches: - - main - pull_request: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..f1f8e3928 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,28 @@ +concurrency: + group: ${{ github.workflow }} + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: main + - uses: ./.github/actions/prepare + - run: pnpm build + - env: + GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + uses: JoshuaKGoldberg/release-it-action@v0.2.2 + +name: Release + +on: + push: + branches: + - main + +permissions: + contents: write + id-token: write diff --git a/.github/workflows/test-mutation.yml b/.github/workflows/test-mutation.yml new file mode 100644 index 000000000..50a0b0ffd --- /dev/null +++ b/.github/workflows/test-mutation.yml @@ -0,0 +1,20 @@ +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm run build --no-dts + - run: pnpm run test:mutation + - name: Codecov + uses: codecov/codecov-action@v3 + with: + flags: mutation + +name: Test Mutation + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..dae947fec --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,19 @@ +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm run test --coverage + - name: Codecov + uses: codecov/codecov-action@v3 + with: + flags: unit + +name: Test + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.github/workflows/tsc.yml b/.github/workflows/tsc.yml new file mode 100644 index 000000000..3b20f2428 --- /dev/null +++ b/.github/workflows/tsc.yml @@ -0,0 +1,15 @@ +jobs: + type_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/prepare + - run: pnpm tsc + +name: Type Check + +on: + pull_request: ~ + push: + branches: + - main diff --git a/.gitignore b/.gitignore index 5cb5ef48a..c5c0bee21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,4 @@ -*.d.ts -!src/types.d.ts -*.map +coverage/ +lib/ node_modules/ -npm-debug.log -src/**/*.js -test/**/actual.ts -test/**/actual.tsx +test/cases/**/actual.* diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 000000000..31354ec13 --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ diff --git a/.husky/pre-commit b/.husky/pre-commit index 6e9bf51fa..0ccfe480c 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,3 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" - -npm run precommit +npx lint-staged diff --git a/.markdownlint.json b/.markdownlint.json index 1253e2292..14f350bf7 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -1,8 +1,5 @@ { - "default": true, - "line-length": { - "line_length": 175 - }, - "no-inline-html": false, - "no-trailing-punctuation": false + "extends": "markdownlint/style/prettier", + "first-line-h1": false, + "no-inline-html": false } diff --git a/.markdownlintignore b/.markdownlintignore new file mode 100644 index 000000000..d6ea7b60e --- /dev/null +++ b/.markdownlintignore @@ -0,0 +1,4 @@ +.github/CODE_OF_CONDUCT.md +CHANGELOG.md +lib/ +node_modules/ diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 65e3ba2ed..000000000 --- a/.npmignore +++ /dev/null @@ -1 +0,0 @@ -test/ diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..8b0beab16 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20.11.0 diff --git a/.prettierignore b/.prettierignore index 3b256d5ff..ef4aac6ad 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ -*.md -docs/**/*.md -test/**/actual.* -test/**/expected.* -test/**/original.* +.all-contributorsrc +coverage/ +lib/ +test/cases/**/actual.* +test/cases/**/expected.* +pnpm-lock.yaml diff --git a/.prettierrc.json b/.prettierrc.json index 2a396ff1f..e3efe60fd 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,33 +1,6 @@ { - "arrowParens": "always", - "parser": "typescript", - "printWidth": 140, - "tabWidth": 4, - "trailingComma": "all", - "overrides": [ - { - "files": ".*.json", - "options": { - "parser": "json" - } - }, - { - "files": "*.json", - "options": { - "parser": "json" - } - }, - { - "files": ".vscode/*.json", - "options": { - "parser": "json" - } - }, - { - "files": "*.yml", - "options": { - "parser": "yaml" - } - } - ] + "$schema": "http://json.schemastore.org/prettierrc", + "overrides": [{ "files": ".nvmrc", "options": { "parser": "yaml" } }], + "plugins": ["prettier-plugin-curly", "prettier-plugin-packagejson"], + "useTabs": true } diff --git a/.release-it.json b/.release-it.json new file mode 100644 index 000000000..2b95facce --- /dev/null +++ b/.release-it.json @@ -0,0 +1,18 @@ +{ + "git": { + "commitMessage": "chore: release v${version}", + "requireCommits": true + }, + "github": { + "autoGenerate": true, + "release": true, + "releaseName": "v${version}" + }, + "npm": { "publishArgs": ["--access public", "--provenance"] }, + "plugins": { + "@release-it/conventional-changelog": { + "infile": "CHANGELOG.md", + "preset": "angular" + } + } +} diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..095512a0b --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "DavidAnson.vscode-markdownlint", + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "streetsidesoftware.code-spell-checker" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json index 865373f2f..b54ad1fb4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,29 +1,52 @@ { - "version": "2.0.0", - "configurations": [ - { - "args": ["--reporter", "spec", "--colors", "--no-timeouts", "${workspaceFolder}/src/tests/runTests.js"], - "env": { - "TEST_ACCEPT": "true", - "TEST_GLOB": "${relativeFileDirname}" - }, - "name": "Accept Current Mutation Test", - "preLaunchTask": "tsc", - "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", - "request": "launch", - "type": "node" - }, - { - "args": ["--reporter", "spec", "--colors", "--no-timeouts", "${workspaceFolder}/src/tests/runTests.js"], - "env": { - "TEST_ACCEPT": "true", - "TEST_GLOB": "${relativeFileDirname}" - }, - "name": "Debug Current Mutation Test", - "preLaunchTask": "tsc", - "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", - "request": "launch", - "type": "node" - } - ] + "configurations": [ + { + "args": [ + "--reporter", + "spec", + "--colors", + "--no-timeouts", + "${workspaceFolder}/lib/tests/runTests.js" + ], + "env": { + "TEST_ACCEPT": "true", + "TEST_GLOB": "${relativeFileDirname}" + }, + "name": "Accept Current Mutation Test", + "preLaunchTask": "tsc", + "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", + "request": "launch", + "type": "node" + }, + { + "args": [ + "--reporter", + "spec", + "--colors", + "--no-timeouts", + "${workspaceFolder}/lib/tests/runTests.js" + ], + "env": { + "TEST_ACCEPT": "true", + "TEST_GLOB": "${relativeFileDirname}" + }, + "name": "Debug Current Mutation Test", + "preLaunchTask": "tsc", + "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha", + "request": "launch", + "type": "node" + }, + { + "args": ["run", "${relativeFile}"], + "autoAttachChildProcesses": true, + "console": "integratedTerminal", + "name": "Debug Current Unit Test File", + "program": "${workspaceRoot}/node_modules/vitest/vitest.mjs", + "request": "launch", + "skipFiles": ["/**", "**/node_modules/**"], + "smartStep": true, + "type": "node" + } + ], + "version": "2.0.0" } diff --git a/.vscode/settings.json b/.vscode/settings.json index 2cd1c9e51..b8153ef35 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,18 @@ { - "files.exclude": { - "**/*.d.ts": true, - "**/*.js.map": true, - "**/*.js": { "when": "$(basename).ts" } - }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }], - "typescript.tsdk": "node_modules/typescript/lib" + "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit" }, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.rulers": [80], + "eslint.probe": [ + "javascript", + "javascriptreact", + "json", + "jsonc", + "markdown", + "typescript", + "typescriptreact", + "yaml" + ], + "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }], + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2b80fe2e1..4f72f7a1a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,11 +1,11 @@ { - "version": "2.0.0", - "command": "tsc", - "args": ["-w"], - "isBackground": true, - "presentation": { - "reveal": "silent" - }, - "problemMatcher": "$tsc-watch", - "type": "shell" + "args": ["-w"], + "command": "tsc", + "isBackground": true, + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$tsc-watch", + "type": "shell", + "version": "2.0.0" } diff --git a/LICENSE.md b/LICENSE.md index f7f743864..08520a1e2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,20 @@ -MIT License +# MIT License -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 3d1a1d08e..a7a4dca80 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@

TypeStat

-

Converts JavaScript to TypeScript and TypeScript to better TypeScript.

+

Converts JavaScript to TypeScript and TypeScript to better TypeScript. ๐Ÿงซ

- Code Style: Prettier - TypeScript: Strict - - Build Status - - - NPM version - + + + ๐Ÿ‘ช All Contributors: 11 + + + ๐Ÿค Code of Conduct: Kept + ๐Ÿงช Coverage + ๐Ÿ“ License: MIT + ๐Ÿ“ฆ npm version + ๐Ÿ’ช TypeScript: Strict

-TypeStat logo: the TypeScript blue square with rounded corners, but a plus sign instead of 'TS' - ## Usage TypeStat is a CLI utility that modifies TypeScript types in existing code. @@ -55,4 +55,40 @@ To get a deeper understanding of TypeStat, read the following docs pages in orde ## Development -See [Development.md](./docs/Development.md). ๐Ÿ’– +See [`.github/CONTRIBUTING.md`](./.github/CONTRIBUTING.md), then [`.github/DEVELOPMENT.md`](./.github/DEVELOPMENT.md) for general tooling documentation. +For understanding the project, see `./docs` in general, and especially [`./docs/Architecture.md`](./docs/Architecture.md). +Thanks! ๐Ÿ’– + +## Contributors + + + + + + + + + + + + + + + + + + + + + + + +
Beyang Liu
Beyang Liu
๐Ÿ’ป		Daniel Stiner
Daniel Stiner
๐Ÿ›		Deleted user
Deleted user
๐Ÿšง		Emerson
Emerson
๐Ÿ’ป		Girish Sontakke
Girish Sontakke
๐Ÿ’ป		Guten
Guten
๐Ÿ›		Ibrahim H.
Ibrahim H.
๐Ÿ’ป
Josh Goldberg โœจ
Josh Goldberg โœจ
๐Ÿšง ๐Ÿ› ๐Ÿ”ง ๐Ÿ’ป ๐Ÿš‡ ๐Ÿ“–		Mark Molinaro
Mark Molinaro
๐Ÿ› ๐Ÿ’ป		Nigel Gilbert
Nigel Gilbert
๐Ÿ›		orionna319
orionna319
๐Ÿ›
+ + + + + + + +> ๐Ÿ’™ This package is based on [@JoshuaKGoldberg](https://github.com/JoshuaKGoldberg)'s [TypeStat](https://github.com/JoshuaKGoldberg/TypeStat). diff --git a/babel.config.js b/babel.config.js deleted file mode 100644 index 6cac2cc99..000000000 --- a/babel.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - plugins: ["@babel/plugin-proposal-nullish-coalescing-operator", "@babel/plugin-proposal-optional-chaining"], - presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-typescript"], -}; diff --git a/bin/typestat b/bin/typestat index 2c8aba371..ccae6c59d 100644 --- a/bin/typestat +++ b/bin/typestat @@ -3,12 +3,12 @@ const { runCli } = require("../src/cli/runCli"); runCli(process.argv) - .then((resultStatus) => { - if (resultStatus !== 0) { - process.exitCode = 1; - } - }) - .catch((error) => { - console.error("Error in TypeStat: " + error); - process.exitCode = 1; - }); + .then((resultStatus) => { + if (resultStatus !== 0) { + process.exitCode = 1; + } + }) + .catch((error) => { + console.error("Error in TypeStat: " + error); + process.exitCode = 1; + }); diff --git a/cspell.json b/cspell.json new file mode 100644 index 000000000..5a42eb395 --- /dev/null +++ b/cspell.json @@ -0,0 +1,38 @@ +{ + "dictionaries": ["typescript"], + "ignorePaths": [ + ".github", + "CHANGELOG.md", + "coverage", + "lib", + "node_modules", + "pnpm-lock.yaml" + ], + "words": [ + "arrayify", + "automerge", + "automutate", + "automutator", + "endlines", + "execa", + "extensionless", + "hackily", + "globbed", + "IIFE", + "inferables", + "intrinsic", + "jscodeshift", + "knip", + "logfile", + "nodenext", + "packagejson", + "phenomnomnominal", + "predeclared", + "slashify", + "tsquery", + "tsup", + "typestat", + "undefineds", + "uniquify" + ] +} diff --git a/dependabot.yml b/dependabot.yml deleted file mode 100644 index 9b580b8ca..000000000 --- a/dependabot.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" diff --git a/docs/Architecture.md b/docs/Architecture.md index ebb85a336..ea351683e 100644 --- a/docs/Architecture.md +++ b/docs/Architecture.md @@ -3,10 +3,10 @@ This document goes over how TypeStart runs and generates fixes. Before reading this, you should read: -* TypeStat's [README.md](../README.md) -* Documentation on the types of [fixes](./Fixes.md) -* Recommended TypeStat [usage](./Usage.md) -* [automutate](https://github.com/automutate/automutate) and [automutate-tests](https://github.com/automutate/automutate) +- TypeStat's [README.md](../README.md) +- Documentation on the types of [fixes](./Fixes.md) +- Recommended TypeStat [usage](./Usage.md) +- [automutate](https://github.com/automutate/automutate) and [automutate-tests](https://github.com/automutate/automutate) ## Runtime @@ -40,8 +40,8 @@ Each round of mutations in the core mutation provider roughly: 1. Records the starting time 2. Creates a set of TypeScript language services 3. For each file to be visited: - 1. Retrieves file mutations for that file - 2. If more than 100 mutations have been collected, or mutations have been collected and it's been more than 10 seconds since the round started, stops the round + 1. Retrieves file mutations for that file + 2. If more than 100 mutations have been collected, or mutations have been collected and it's been more than 10 seconds since the round started, stops the round Subsequent rounds will pick up where the previous round left off. For example, given files `a.ts`, `b.ts`, and `c.ts` in order, @@ -52,19 +52,19 @@ TypeStat crashing before a round is complete shouldn't lose all accumulated muta Once TypeStat has visited each file, it will either: -* Stop if no file had mutations applied -* Restart _(and reload language services)_ if any file had mutations applied +- Stop if no file had mutations applied +- Restart _(and reload language services)_ if any file had mutations applied #### File Mutations For each file it visits, [`findMutationsInFile`](../src/runtime/findMutationsInFile.ts) will attempt to apply [built-in file mutators](../src/mutators/builtIn/index.ts): -* [`fixIncompleteTypes`](../src/mutators/builtIn/fixIncompleteTypes/README.md) -* [`fixMissingProperties`](../src/mutators/builtIn/fixMissingProperties/README.md) -* [`fixNoImplicitAny`](../src/mutators/builtIn/fixNoImplicitAny/README.md) -* [`fixNoImplicitThis`](../src/mutators/builtIn/fixNoImplicitThis/README.md) -* [`fixStrictNonNullAssertions`](../src/mutators/builtIn/fixStrictNonNullAssertions/README.md) +- [`fixIncompleteTypes`](../src/mutators/builtIn/fixIncompleteTypes/README.md) +- [`fixMissingProperties`](../src/mutators/builtIn/fixMissingProperties/README.md) +- [`fixNoImplicitAny`](../src/mutators/builtIn/fixNoImplicitAny/README.md) +- [`fixNoImplicitThis`](../src/mutators/builtIn/fixNoImplicitThis/README.md) +- [`fixStrictNonNullAssertions`](../src/mutators/builtIn/fixStrictNonNullAssertions/README.md) Each fixer targets a general range of potential type improvements and contains a series of sub-fixers that target individual improvements. For example, `fixIncompleteTypes` contains a `fixIncompleteParameterTypes` fixer that fills in incomplete types for parameters. @@ -97,8 +97,8 @@ The `mutators` directory figures out which types should be modified, then `mutat We should note two common pieces of terminology used in this directory: -* **"Flags"** refers to type nodes for primitive types, such as `boolean` -* **"Types"** refers to rich (non-primitive) types, such as `MyClass` +- **"Flags"** refers to type nodes for primitive types, such as `boolean` +- **"Types"** refers to rich (non-primitive) types, such as `MyClass` ### `options` diff --git a/docs/Cleanups.md b/docs/Cleanups.md index 9af1c97f5..b0410f19b 100644 --- a/docs/Cleanups.md +++ b/docs/Cleanups.md @@ -8,9 +8,9 @@ These all default to `false` but can be enabled by being set to `true`. ```json { - "cleanups": { - "suppressTypeErrors": true - } + "cleanups": { + "suppressTypeErrors": true + } } ``` diff --git a/docs/Custom Mutators.md b/docs/Custom Mutators.md index fbb214c45..3fcd1b688 100644 --- a/docs/Custom Mutators.md +++ b/docs/Custom Mutators.md @@ -9,9 +9,7 @@ Use the `-m`/`--mutators` CLI flag and/or `mutators` configuration setting to ad ```json { - "mutators": [ - "my-mutator-module" - ] + "mutators": ["my-mutator-module"] } ``` @@ -31,8 +29,8 @@ import { Mutation } from "automutate"; import { FileMutationsRequest } from "typestat"; export const mutator = (request: FileMutationsRequest): Mutation[] => { - // TODO: Implement! - return []; + // TODO: Implement! + return []; }; ``` @@ -44,14 +42,16 @@ For example, this mutator will add a `/* foo */` mutation at the beginning of ea const prefix = "/* foo */ "; module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().startsWith(prefix) - ? [] - : [{ - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }]; + return request.sourceFile.getFullText().startsWith(prefix) + ? [] + : [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ]; }; ``` diff --git a/docs/Development.md b/docs/Development.md deleted file mode 100644 index af8c97146..000000000 --- a/docs/Development.md +++ /dev/null @@ -1,75 +0,0 @@ -# Development - -Thanks for looking at TypeStat! -It's very new and I very much would appreciate your help. - -Any issue marked as [accepting prs](https://github.com/JoshuaKGoldberg/TypeStat/issues?q=is%3Aissue+is%3Aopen+label%3A%22status%3A+accepting+prs%22+) on the issue tracker is fair game to take on. -Please do file issues if you find bugs or lacking features! - -## Local Setup - -After installing [Node >=10](https://nodejs.org/en/download) and [yarn](https://yarnpkg.com), clone and install packages locally with: - -```shell -git clone https://github.com/joshuakgoldberg/typestat -cd typestat -yarn -``` - -Compile with `yarn run tsc`, lint with `yarn run lint`, and run tests with `yarn run test`. -Do all three with `yarn run verify`. - -## Mutation Tests - -Most TypeStat tests run TypeStat on checked-in files and are built on [`automutate-tests`](https://github.com/automutate/automutate-tests). -These tests are located under `test/cases`. - -`yarn run test:mutation` may take in two parameters: - -### `--accept` - -Whether to override existing expected test results instead of asserting equality. -Tests can still fail if TypeStat throws an error, but not if the contents aren't equal. - -```shell -yarn run test:mutation --accept -``` - -### `--include` - -Regular expression filter(s) to include only some tests. -If not provided (the default), all tests are run. -If provided, only tests whose name matches one or more include filter will run. - -Include filters are always prefixed and suffixed with `(.*)`, so you don't need to explicitly provide full test names. - -For example, to run all tests with `variable` in their name: - -```shell -yarn run test:mutation --include "noImplicitAny" -``` - -To run the `noImplicitAny/variableDeclarations` tests, either would work: - -```shell -yarn run test:mutation --accept --include "noImplicitAny/variableDeclarations" -yarn run test:mutation --accept --include "mplicitAn.*variableDeclar" -``` - -### Debugging - -VS Code tasks to debug test files is shipped that allows directly placing breakpoints in source TypeScript code. - -* `Accept Current Mutation Test` runs with `--accept` on the test folder of a currently opened test file, such as an `original.ts` or `typestat.json`. -* `Debug Current Mutation Test` does not run with `--accept`, and thus logs any differences as errors. - -#### Performance Debugging Tips - -You can use the debugger in Chrome to debug TypeStat on the CLI. -Run it with `node --inspect` then visit `chrome://inspect` to use the browser debugger. - -For example: - -```shell -node --inspect typestat --config typestat.json -``` diff --git a/docs/Files.md b/docs/Files.md index f17358528..7a4de594b 100644 --- a/docs/Files.md +++ b/docs/Files.md @@ -4,11 +4,11 @@ An optional set of configuration fields containing file-level changes to make ou ```json { - "files": { - "above": "/* Above file */", - "below": "/* Below file */", - "renameExtensions": true - } + "files": { + "above": "/* Above file */", + "below": "/* Below file */", + "renameExtensions": true + } } ``` @@ -16,9 +16,9 @@ An optional set of configuration fields containing file-level changes to make ou ```json { - "files": { - "above": "/* Above file */" - } + "files": { + "above": "/* Above file */" + } } ``` @@ -32,9 +32,9 @@ If a value is provided on the CLI, it will override a configuration file value ( ```json { - "files": { - "below": "/* Below file */" - } + "files": { + "below": "/* Below file */" + } } ``` @@ -48,9 +48,9 @@ If a value is provided on the CLI, it will override a configuration file value ( ```json { - "files": { - "renameExtensions": true - } + "files": { + "renameExtensions": true + } } ``` @@ -62,41 +62,41 @@ regardless of whether mutations are added, will be renamed to the equivalent Typ This field has four potential allowed configurations: -* `false` _(default)_: skip renaming file extensions -* `true`: auto-detect whether a file should be `.ts` or `.tsx` - - ```json - { - "files": { - "renameExtensions": true - } - } - ``` - -* `"ts"`: always convert to `.ts` - - ```json - { - "files": { - "renameExtensions": "ts" - } - } - ``` - -* `"tsx"`: always convert to `.tsx` - - ```json - { - "files": { - "renameExtensions": "tsx" - } - } - ``` +- `false` _(default)_: skip renaming file extensions +- `true`: auto-detect whether a file should be `.ts` or `.tsx` + + ```json + { + "files": { + "renameExtensions": true + } + } + ``` + +- `"ts"`: always convert to `.ts` + + ```json + { + "files": { + "renameExtensions": "ts" + } + } + ``` + +- `"tsx"`: always convert to `.tsx` + + ```json + { + "files": { + "renameExtensions": "tsx" + } + } + ``` When auto-detection is enabled, a file will be converted to `.tsx` if either of the following is true: -* It `import`s or `require`s from the `"react"` module -* Its original file extension is `.jsx` +- It `import`s or `require`s from the `"react"` module +- Its original file extension is `.jsx` ### Handling `require`s diff --git a/docs/Filters.md b/docs/Filters.md index 0385965f1..867e1a085 100644 --- a/docs/Filters.md +++ b/docs/Filters.md @@ -3,8 +3,8 @@ TypeStat ships with built-in support for using [tsquery](https://github.com/phenomnomnominal/tsquery) to ignore sections of source files. This is useful for... -* ...when sections of source files can be safely excluded from type coverage -* ...when you want to only touch up certain parts of source files +- ...when sections of source files can be safely excluded from type coverage +- ...when you want to only touch up certain parts of source files `filter` will _exclude_ any portions of source code that match them. Sub-sections (child nodes) of those portions will not be visited. @@ -16,8 +16,6 @@ You can use filter to exclude these `null`s from type calculations. ```json { - "filter": [ - "MethodDeclaration[name.text=dispose]" - ] + "filter": ["MethodDeclaration[name.text=dispose]"] } ``` diff --git a/docs/Fixes.md b/docs/Fixes.md index ad5178d50..450e5067b 100644 --- a/docs/Fixes.md +++ b/docs/Fixes.md @@ -3,20 +3,20 @@ TypeStat will apply mutations ("fixes") to files as it finds them. These mutations are all purely additive and limited to the type system, meaning they will _not_ change your JavaScript output. -Each classifiation of fix can be individually configured in your `typestat.json` file. +Each classification of fix can be individually configured in your `typestat.json` file. These all default to `false` but can be enabled by being set to `true`. ```json { - "fixes": { - "importExtensions": true, - "incompleteTypes": true, - "missingProperties": true, - "noImplicitAny": true, - "noImplicitThis": true, - "noInferableTypes": true, - "strictNonNullAssertions": true - } + "fixes": { + "importExtensions": true, + "incompleteTypes": true, + "missingProperties": true, + "noImplicitAny": true, + "noImplicitThis": true, + "noInferableTypes": true, + "strictNonNullAssertions": true + } } ``` @@ -38,7 +38,7 @@ See [fixIncompleteTypes/README.md](../src/mutators/builtIn/fixIncompleteTypes/RE Whether to apply TypeScript's fixer for missing properties on classes. -See [fixMisingProperties/README.md](../src/mutators/builtIn/fixMissingProperties/README.md). +See [fixMissingProperties/README.md](../src/mutators/builtIn/fixMissingProperties/README.md). ### `noImplicitAny` diff --git a/docs/Package.md b/docs/Package.md index dfc480ad9..5696776d0 100644 --- a/docs/Package.md +++ b/docs/Package.md @@ -4,11 +4,11 @@ An optional set of configuration fields containing package-level changes to make ```json { - "package": { - "directory": "../MyRepo", - "file": "./node/package.json", - "missingTypes": "yarn" - } + "package": { + "directory": "../MyRepo", + "file": "./node/package.json", + "missingTypes": "yarn" + } } ``` @@ -16,9 +16,9 @@ An optional set of configuration fields containing package-level changes to make ```json { - "package": { - "directory": "../MyRepo" - } + "package": { + "directory": "../MyRepo" + } } ``` @@ -29,9 +29,9 @@ All non-absolute paths within all settings except `-c`/`--config` will be resolv ```json { - "package": { - "file": "./node/package.json" - } + "package": { + "file": "./node/package.json" + } } ``` @@ -44,9 +44,9 @@ If `package.file` is relative, `package.directory` will be used as a root path t ```json { - "package": { - "missingTypes": true - } + "package": { + "missingTypes": true + } } ``` @@ -66,41 +66,41 @@ TypeStat will attempt to install `@types/lodash` unless it's already any form of This field has four potential allowed configurations: -* `false` _(default)_: skip installing missing packages -* `true`: auto-detect whether to use Yarn _(if a `yarn.lock` exists)_ or npm _(default)_ - - ```json - { - "package": { - "missingTypes": true - } - } - ``` - -* `"npm"`: install using npm - - ```json - { - "package": { - "missingTypes": "npm" - } - } - ``` - -* `"yarn"`: install using Yarn - - ```json - { - "package": { - "missingTypes": "yarn" - } - } - ``` +- `false` _(default)_: skip installing missing packages +- `true`: auto-detect whether to use Yarn _(if a `yarn.lock` exists)_ or npm _(default)_ + + ```json + { + "package": { + "missingTypes": true + } + } + ``` + +- `"npm"`: install using npm + + ```json + { + "package": { + "missingTypes": "npm" + } + } + ``` + +- `"yarn"`: install using Yarn + + ```json + { + "package": { + "missingTypes": "yarn" + } + } + ``` ### Node types `@types/node` will be installed in any of the following cases: -* `module =`, `module.exports =`, or `module.exports.*` = statement(s) exist -* [Built-in modules](https://www.npmjs.com/package/builtin-modules) are imported from -* A global [`process` object](https://nodejs.org/api/process.html#process_process) is referenced +- `module =`, `module.exports =`, or `module.exports.*` = statement(s) exist +- [Built-in modules](https://www.npmjs.com/package/builtin-modules) are imported from +- A global [`process` object](https://nodejs.org/api/process.html#process_process) is referenced diff --git a/docs/Types.md b/docs/Types.md index af0c9aa07..9982fa55c 100644 --- a/docs/Types.md +++ b/docs/Types.md @@ -7,13 +7,13 @@ If true, TypeStat will set `strictNullChecks` to `true` regardless of your `tsco ```json { - "types": { - "strictNullChecks": true - } + "types": { + "strictNullChecks": true + } } ``` This interacts with fixers in a few ways: -* Type additions will now include `null` and/or `undefined` -* [Property Accesses](./Nodes.md#Strict%20Property%20Accesses) will have `!`s added as needeed +- Type additions will now include `null` and/or `undefined` +- [Property Accesses](./Nodes.md#Strict%20Property%20Accesses) will have `!`s added as needed diff --git a/docs/Usage.md b/docs/Usage.md index ed6de3d42..96c22e93c 100644 --- a/docs/Usage.md +++ b/docs/Usage.md @@ -20,9 +20,9 @@ For example, the following `typestat.json` will add auto-fixes for missing type ```json { - "fixes": { - "noImplicitAny": true, - } + "fixes": { + "noImplicitAny": true + } } ``` @@ -37,16 +37,16 @@ For example, the following `typestat.json` will: ```json [ - { - "fixes": { - "noImplicitAny": true - } - }, - { - "fixes": { - "noInferableTypes": true - } - } + { + "fixes": { + "noImplicitAny": true + } + }, + { + "fixes": { + "noInferableTypes": true + } + } ] ``` @@ -62,7 +62,6 @@ npx typestat --logfile typestat.log ## More Examples Use these examples as more granular references of how to perform targeted changes with TypeStat. -Reach out on [Gitter](https://gitter.im/TypeStat/community) or [Twitter](https://twitter.com/JoshuaKGoldberg) if you want help! -* [Converting Classes from JavaScript to TypeScript.md](./Usage/Converting%20Classes%20from%20JavaScript%20to%20TypeScript.md) -* [Enabling Strict Null Checks](./Usage/Enabling%20Strict%20Null%20Checks.md) +- [Converting Classes from JavaScript to TypeScript.md](./Usage/Converting%20Classes%20from%20JavaScript%20to%20TypeScript.md) +- [Enabling Strict Null Checks](./Usage/Enabling%20Strict%20Null%20Checks.md) diff --git a/docs/Usage/Converting Classes from JavaScript to TypeScript.md b/docs/Usage/Converting Classes from JavaScript to TypeScript.md index c4a1cc79c..c1ef1d918 100644 --- a/docs/Usage/Converting Classes from JavaScript to TypeScript.md +++ b/docs/Usage/Converting Classes from JavaScript to TypeScript.md @@ -8,8 +8,8 @@ Use `fixes.missingProperties` to apply those mutations across all files: ```json { - "fixes": { - "missingProperties": true - } + "fixes": { + "missingProperties": true + } } -``` \ No newline at end of file +``` diff --git a/docs/Usage/Enabling Strict Null Checks.md b/docs/Usage/Enabling Strict Null Checks.md index 0195b3c6b..bf8db1784 100644 --- a/docs/Usage/Enabling Strict Null Checks.md +++ b/docs/Usage/Enabling Strict Null Checks.md @@ -9,15 +9,13 @@ For example, this configuration will add `!`s only to `*.test.ts` test files, su ```json { - "fixes": { - "strictNonNullAssertions": true - }, - "include": [ - "./src/**/*.test.ts" - ], - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "include": ["./src/**/*.test.ts"], + "types": { + "strictNullChecks": true + } } ``` @@ -26,27 +24,25 @@ For example, this configuration will add `!`s only to `*.test.ts` test files, su Alternately, you can enable the `incompleteTypes` fix, which will prefer adding `| null` and `| undefined` to types as properties, parameters, and so on. This configuration will add those with: -* `filters` to ignore class and test disposal methods, as they might assign `null` or `undefined` unnecessarily -* `types.matching` to only add `null` and `undefined` as types -* `types.onlyPrimitives` to skip computing advanced types as a performance improvement +- `filters` to ignore class and test disposal methods, as they might assign `null` or `undefined` unnecessarily +- `types.matching` to only add `null` and `undefined` as types +- `types.onlyPrimitives` to skip computing advanced types as a performance improvement ```json { - "filters": [ - "CallExpression[expression.text=suiteTeardown]", - "CallExpression[expression.text=teardown]", - "MethodDeclaration[name.text=dispose]" - ], - "fixes": { - "incompleteTypes": true - }, - "types": { - "matching": [ - "^(null|undefined)$" - ], - "onlyPrimitives": true, - "strictNullChecks": true - } + "filters": [ + "CallExpression[expression.text=suiteTeardown]", + "CallExpression[expression.text=teardown]", + "MethodDeclaration[name.text=dispose]" + ], + "fixes": { + "incompleteTypes": true + }, + "types": { + "matching": ["^(null|undefined)$"], + "onlyPrimitives": true, + "strictNullChecks": true + } } ``` diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index ab38da47b..000000000 --- a/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"], - roots: ["/src"], - testRegex: "src(.*)\\.test\\.tsx?$", -}; diff --git a/knip.json b/knip.json new file mode 100644 index 000000000..f681ce25b --- /dev/null +++ b/knip.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://unpkg.com/knip@latest/schema.json", + "entry": ["src/index.ts!", "test/**/*.ts!", "test/**/*.tsx!"], + "ignore": ["test/cases/fixes/importExtensions/*"], + "ignoreExportsUsedInFile": { "interface": true, "type": true }, + "project": ["src/**/*.ts!", "test/**/*.ts!", "test/**/*.tsx!"] +} diff --git a/package.json b/package.json index 9a2fc7003..74bc19d02 100644 --- a/package.json +++ b/package.json @@ -1,80 +1,95 @@ { - "author": "josh Goldberg", - "bin": { - "typestat": "bin/typestat" - }, - "dependencies": { - "@phenomnomnominal/tsquery": "^6.0.0", - "automutate": "^0.9.0", - "builtin-modules": "^3.2.0", - "chalk": "^4.1.1", - "commander": "^11.0.0", - "enquirer": "^2.3.6", - "glob": "^10.0.0", - "minimatch": "^8.0.0", - "mz": "^2.7.0", - "strip-ansi": "^6.0.0", - "ts-api-utils": "^1.0.3", - "typescript": "^5.1.6" - }, - "description": "Converts JavaScript to TypeScript and TypeScript to better TypeScript.", - "devDependencies": { - "@babel/core": "7.23.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", - "@babel/plugin-proposal-optional-chaining": "7.21.0", - "@babel/preset-env": "7.23.5", - "@babel/preset-typescript": "7.23.3", - "@types/glob": "8.1.0", - "@types/jest": "29.5.11", - "@types/minimatch": "^5.0.0", - "@types/mz": "2.7.8", - "@types/node": "20.10.3", - "@types/prop-types": "15.7.11", - "@types/react": "18.2.69", - "@typescript-eslint/eslint-plugin": "^6.4.0", - "@typescript-eslint/parser": "^6.4.0", - "automutate-tests": "0.5.0", - "babel-jest": "29.7.0", - "chai": "4.3.10", - "eslint": "8.55.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-deprecation": "2.0.0", - "eslint-plugin-no-only-tests": "3.1.0", - "husky": "8.0.3", - "jest": "29.7.0", - "lint-staged": "14.0.1", - "markdownlint": "0.32.1", - "markdownlint-cli": "0.37.0", - "mocha": "10.2.0", - "npm-run-all": "4.1.5", - "prettier": "3.1.0", - "sentences-per-line": "0.2.1" - }, - "license": "MIT", - "lint-staged": { - "**/*.{js,json,md,ts,xml,yaml}": [ - "prettier --write" - ] - }, - "main": "src/index.js", - "name": "typestat", - "repository": { - "type": "git", - "url": "git+https://github.com/JoshuaKGoldberg/TypeStat.git" - }, - "scripts": { - "compile": "tsc", - "format": "yarn prettier --write", - "format:verify": "yarn prettier --list-different \"**/*.{js,json,md,ts,yml}\"", - "format:write": "yarn format:verify --write", - "lint": "run-p lint:*", - "lint:eslint": "eslint ./src/**/*.ts", - "lint:markdownlint": "markdownlint --config .markdownlint.json --rules ./node_modules/sentences-per-line/index.js README.md", - "precommit": "lint-staged", - "test": "yarn run test:unit && yarn run test:mutation", - "test:mutation": "mocha src/tests/runTests.js --timeout 50000", - "test:unit": "jest --config=jest.config.js", - "verify": "yarn run tsc && yarn run lint && yarn run test" - }, - "version": "0.7.3" + "name": "typestat", + "version": "0.7.3", + "description": "Converts JavaScript to TypeScript and TypeScript to better TypeScript. ๐Ÿงซ", + "repository": "JoshuaKGoldberg/TypeStat", + "license": "MIT", + "author": { + "name": "JoshuaKGoldberg", + "email": "npm@joshuakgoldberg.com" + }, + "type": "module", + "main": "./lib/index.js", + "files": [ + "lib/", + "package.json", + "LICENSE.md", + "README.md" + ], + "scripts": { + "build": "NODE_OPTIONS='--max-old-space-size=16384' tsup", + "format": "prettier .", + "lint": "eslint . .*js --max-warnings 0", + "lint:knip": "knip", + "lint:md": "markdownlint \"**/*.md\" \".github/**/*.md\" --rules sentences-per-line", + "lint:packages": "pnpm dedupe --check", + "lint:spelling": "cspell \"**\" \".github/**/*\"", + "prepare": "husky", + "test": "vitest", + "test:mutation": "mocha lib/tests/runTests.js --timeout 50000", + "tsc": "tsc" + }, + "lint-staged": { + "*": "prettier --ignore-unknown --write" + }, + "dependencies": { + "@phenomnomnominal/tsquery": "^6.1.3", + "automutate": "^0.9.0", + "builtin-modules": "^3.3.0", + "chalk": "^5.3.0", + "commander": "^12.0.0", + "enquirer": "^2.4.1", + "glob": "^10.3.10", + "minimatch": "^9.0.3", + "strip-ansi": "^7.1.0", + "ts-api-utils": "^1.3.0" + }, + "devDependencies": { + "@types/eslint": "^8.56.6", + "@types/glob": "8.1.0", + "@types/minimatch": "^5.1.2", + "@types/node": "^20.11.30", + "@types/prop-types": "15.7.12", + "@types/react": "18.2.69", + "@typescript-eslint/eslint-plugin": "^7.3.1", + "@typescript-eslint/parser": "^7.3.1", + "@vitest/coverage-v8": "^1.4.0", + "automutate-tests": "0.5.0", + "console-fail-test": "^0.2.3", + "cspell": "^8.6.0", + "eslint": "8.57.0", + "eslint-plugin-deprecation": "2.0.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-jsdoc": "^48.2.1", + "eslint-plugin-jsonc": "^2.14.1", + "eslint-plugin-markdown": "^4.0.1", + "eslint-plugin-n": "^16.6.2", + "eslint-plugin-package-json": "^0.10.4", + "eslint-plugin-perfectionist": "^2.7.0", + "eslint-plugin-regexp": "^2.3.0", + "eslint-plugin-vitest": "^0.3.26", + "eslint-plugin-yml": "^1.13.2", + "husky": "9.0.11", + "jsonc-eslint-parser": "^2.4.0", + "knip": "^5.2.2", + "lint-staged": "15.2.2", + "markdownlint": "0.34.0", + "markdownlint-cli": "0.39.0", + "mocha": "^10.3.0", + "prettier": "3.2.5", + "prettier-plugin-curly": "^0.2.1", + "prettier-plugin-packagejson": "^2.4.12", + "sentences-per-line": "0.2.1", + "tsup": "^8.0.2", + "typescript": "^5.4.3", + "vitest": "^1.4.0", + "yaml-eslint-parser": "^1.2.2" + }, + "packageManager": "pnpm@8.9.2", + "engines": { + "node": ">=18" + }, + "publishConfig": { + "provenance": true + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 000000000..f7adf1496 --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,5709 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +dependencies: + '@phenomnomnominal/tsquery': + specifier: ^6.1.3 + version: 6.1.3(typescript@5.4.3) + automutate: + specifier: ^0.9.0 + version: 0.9.0 + builtin-modules: + specifier: ^3.3.0 + version: 3.3.0 + chalk: + specifier: ^5.3.0 + version: 5.3.0 + commander: + specifier: ^12.0.0 + version: 12.0.0 + enquirer: + specifier: ^2.4.1 + version: 2.4.1 + glob: + specifier: ^10.3.10 + version: 10.3.10 + minimatch: + specifier: ^9.0.3 + version: 9.0.3 + strip-ansi: + specifier: ^7.1.0 + version: 7.1.0 + ts-api-utils: + specifier: ^1.3.0 + version: 1.3.0(typescript@5.4.3) + +devDependencies: + '@types/eslint': + specifier: ^8.56.6 + version: 8.56.6 + '@types/glob': + specifier: 8.1.0 + version: 8.1.0 + '@types/minimatch': + specifier: ^5.1.2 + version: 5.1.2 + '@types/node': + specifier: ^20.11.30 + version: 20.11.30 + '@types/prop-types': + specifier: 15.7.12 + version: 15.7.12 + '@types/react': + specifier: 18.2.69 + version: 18.2.69 + '@typescript-eslint/eslint-plugin': + specifier: ^7.3.1 + version: 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/parser': + specifier: ^7.3.1 + version: 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@vitest/coverage-v8': + specifier: ^1.4.0 + version: 1.4.0(vitest@1.4.0) + automutate-tests: + specifier: 0.5.0 + version: 0.5.0 + console-fail-test: + specifier: ^0.2.3 + version: 0.2.3 + cspell: + specifier: ^8.6.0 + version: 8.6.0 + eslint: + specifier: 8.57.0 + version: 8.57.0 + eslint-plugin-deprecation: + specifier: 2.0.0 + version: 2.0.0(eslint@8.57.0)(typescript@5.4.3) + eslint-plugin-eslint-comments: + specifier: ^3.2.0 + version: 3.2.0(eslint@8.57.0) + eslint-plugin-jsdoc: + specifier: ^48.2.1 + version: 48.2.1(eslint@8.57.0) + eslint-plugin-jsonc: + specifier: ^2.14.1 + version: 2.14.1(eslint@8.57.0) + eslint-plugin-markdown: + specifier: ^4.0.1 + version: 4.0.1(eslint@8.57.0) + eslint-plugin-n: + specifier: ^16.6.2 + version: 16.6.2(eslint@8.57.0) + eslint-plugin-package-json: + specifier: ^0.10.4 + version: 0.10.4(eslint@8.57.0)(jsonc-eslint-parser@2.4.0) + eslint-plugin-perfectionist: + specifier: ^2.7.0 + version: 2.7.0(eslint@8.57.0)(typescript@5.4.3) + eslint-plugin-regexp: + specifier: ^2.3.0 + version: 2.3.0(eslint@8.57.0) + eslint-plugin-vitest: + specifier: ^0.3.26 + version: 0.3.26(@typescript-eslint/eslint-plugin@7.3.1)(eslint@8.57.0)(typescript@5.4.3)(vitest@1.4.0) + eslint-plugin-yml: + specifier: ^1.13.2 + version: 1.13.2(eslint@8.57.0) + husky: + specifier: 9.0.11 + version: 9.0.11 + jsonc-eslint-parser: + specifier: ^2.4.0 + version: 2.4.0 + knip: + specifier: ^5.2.2 + version: 5.2.2(@types/node@20.11.30)(typescript@5.4.3) + lint-staged: + specifier: 15.2.2 + version: 15.2.2 + markdownlint: + specifier: 0.34.0 + version: 0.34.0 + markdownlint-cli: + specifier: 0.39.0 + version: 0.39.0 + mocha: + specifier: ^10.3.0 + version: 10.3.0 + prettier: + specifier: 3.2.5 + version: 3.2.5 + prettier-plugin-curly: + specifier: ^0.2.1 + version: 0.2.1(prettier@3.2.5) + prettier-plugin-packagejson: + specifier: ^2.4.12 + version: 2.4.12(prettier@3.2.5) + sentences-per-line: + specifier: 0.2.1 + version: 0.2.1 + tsup: + specifier: ^8.0.2 + version: 8.0.2(typescript@5.4.3) + typescript: + specifier: ^5.4.3 + version: 5.4.3 + vitest: + specifier: ^1.4.0 + version: 1.4.0(@types/node@20.11.30) + yaml-eslint-parser: + specifier: ^1.2.2 + version: 1.2.2 + +packages: + + /@aashutoshrathi/word-wrap@1.2.6: + resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} + engines: {node: '>=0.10.0'} + dev: true + + /@ampproject/remapping@2.3.0: + resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + dev: true + + /@babel/code-frame@7.24.2: + resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.24.2 + picocolors: 1.0.0 + dev: true + + /@babel/generator@7.24.1: + resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.0 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 2.5.2 + dev: true + + /@babel/helper-environment-visitor@7.22.20: + resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} + engines: {node: '>=6.9.0'} + dev: true + + /@babel/helper-function-name@7.23.0: + resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.24.0 + '@babel/types': 7.24.0 + dev: true + + /@babel/helper-hoist-variables@7.22.5: + resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.0 + dev: true + + /@babel/helper-split-export-declaration@7.22.6: + resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.0 + dev: true + + /@babel/helper-string-parser@7.24.1: + resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} + engines: {node: '>=6.9.0'} + dev: true + + /@babel/helper-validator-identifier@7.22.20: + resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} + engines: {node: '>=6.9.0'} + dev: true + + /@babel/highlight@7.24.2: + resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.22.20 + chalk: 2.4.2 + js-tokens: 4.0.0 + picocolors: 1.0.0 + dev: true + + /@babel/parser@7.24.1: + resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.24.0 + dev: true + + /@babel/template@7.24.0: + resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.24.2 + '@babel/parser': 7.24.1 + '@babel/types': 7.24.0 + dev: true + + /@babel/traverse@7.24.1: + resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.24.2 + '@babel/generator': 7.24.1 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.24.1 + '@babel/types': 7.24.0 + debug: 4.3.4(supports-color@8.1.1) + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/types@7.24.0: + resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.24.1 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 + dev: true + + /@bcoe/v8-coverage@0.2.3: + resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} + dev: true + + /@cspell/cspell-bundled-dicts@8.6.0: + resolution: {integrity: sha512-hRVvir4G4276Kz/Cru34AJg1FObIw5MrzezAwHkD3obNMwZkof8aX3MEN6AzWusJSVG2ZxZxZAEnYbgqvGr2Fg==} + engines: {node: '>=18'} + dependencies: + '@cspell/dict-ada': 4.0.2 + '@cspell/dict-aws': 4.0.1 + '@cspell/dict-bash': 4.1.3 + '@cspell/dict-companies': 3.0.31 + '@cspell/dict-cpp': 5.1.3 + '@cspell/dict-cryptocurrencies': 5.0.0 + '@cspell/dict-csharp': 4.0.2 + '@cspell/dict-css': 4.0.12 + '@cspell/dict-dart': 2.0.3 + '@cspell/dict-django': 4.1.0 + '@cspell/dict-docker': 1.1.7 + '@cspell/dict-dotnet': 5.0.0 + '@cspell/dict-elixir': 4.0.3 + '@cspell/dict-en-common-misspellings': 2.0.0 + '@cspell/dict-en-gb': 1.1.33 + '@cspell/dict-en_us': 4.3.17 + '@cspell/dict-filetypes': 3.0.3 + '@cspell/dict-fonts': 4.0.0 + '@cspell/dict-fsharp': 1.0.1 + '@cspell/dict-fullstack': 3.1.5 + '@cspell/dict-gaming-terms': 1.0.5 + '@cspell/dict-git': 3.0.0 + '@cspell/dict-golang': 6.0.5 + '@cspell/dict-haskell': 4.0.1 + '@cspell/dict-html': 4.0.5 + '@cspell/dict-html-symbol-entities': 4.0.0 + '@cspell/dict-java': 5.0.6 + '@cspell/dict-k8s': 1.0.2 + '@cspell/dict-latex': 4.0.0 + '@cspell/dict-lorem-ipsum': 4.0.0 + '@cspell/dict-lua': 4.0.3 + '@cspell/dict-makefile': 1.0.0 + '@cspell/dict-node': 4.0.3 + '@cspell/dict-npm': 5.0.15 + '@cspell/dict-php': 4.0.6 + '@cspell/dict-powershell': 5.0.3 + '@cspell/dict-public-licenses': 2.0.6 + '@cspell/dict-python': 4.1.11 + '@cspell/dict-r': 2.0.1 + '@cspell/dict-ruby': 5.0.2 + '@cspell/dict-rust': 4.0.2 + '@cspell/dict-scala': 5.0.0 + '@cspell/dict-software-terms': 3.3.18 + '@cspell/dict-sql': 2.1.3 + '@cspell/dict-svelte': 1.0.2 + '@cspell/dict-swift': 2.0.1 + '@cspell/dict-typescript': 3.1.2 + '@cspell/dict-vue': 3.0.0 + dev: true + + /@cspell/cspell-json-reporter@8.6.0: + resolution: {integrity: sha512-fPpE4a3zpdfwgTyfLgCmxZn4owkZ4IP6A/oL4XLW22IxW5xBIbXEveOSY+uiWAnVfEnqfrMNRLAGj7JoXnJ1Vg==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-types': 8.6.0 + dev: true + + /@cspell/cspell-pipe@8.6.0: + resolution: {integrity: sha512-gbAZksz38OHaN8s4fOmmgtgQfie1K8dRGlo9z/uxSx5FIELV48GWTbHn9t1TY2yBXBwJ7+4NF2+r624rtlPoHQ==} + engines: {node: '>=18'} + dev: true + + /@cspell/cspell-resolver@8.6.0: + resolution: {integrity: sha512-ARwO6TWKy8fLHNhC/ls5Wo/AK86E1oLVChwWtHdq7eVyEUIykQaXGLqoRThkIT2jyLfGDrhSvaU+yqcXVLE48Q==} + engines: {node: '>=18'} + dependencies: + global-directory: 4.0.1 + dev: true + + /@cspell/cspell-service-bus@8.6.0: + resolution: {integrity: sha512-veCGlhlNGmYMgzX/rMiDp8j7ndLxFHIZq3h6DNlIsIoSjP1v5Rk6UcCwEoWYexwKmNXo7c2VooB0GM9LSBcPAQ==} + engines: {node: '>=18'} + dev: true + + /@cspell/cspell-types@8.6.0: + resolution: {integrity: sha512-+CU/nuFOpswJAA3IS2TcKGskfM/o/4aNG1IMUVaOEQi1Sc5qZQ4Wj1qDIWJArSHFYW1Q4XFa4U8K1jnVHkAhZQ==} + engines: {node: '>=18'} + dev: true + + /@cspell/dict-ada@4.0.2: + resolution: {integrity: sha512-0kENOWQeHjUlfyId/aCM/mKXtkEgV0Zu2RhUXCBr4hHo9F9vph+Uu8Ww2b0i5a4ZixoIkudGA+eJvyxrG1jUpA==} + dev: true + + /@cspell/dict-aws@4.0.1: + resolution: {integrity: sha512-NXO+kTPQGqaaJKa4kO92NAXoqS+i99dQzf3/L1BxxWVSBS3/k1f3uhmqIh7Crb/n22W793lOm0D9x952BFga3Q==} + dev: true + + /@cspell/dict-bash@4.1.3: + resolution: {integrity: sha512-tOdI3QVJDbQSwPjUkOiQFhYcu2eedmX/PtEpVWg0aFps/r6AyjUQINtTgpqMYnYuq8O1QUIQqnpx21aovcgZCw==} + dev: true + + /@cspell/dict-companies@3.0.31: + resolution: {integrity: sha512-hKVpV/lcGKP4/DpEPS8P4osPvFH/YVLJaDn9cBIOH6/HSmL5LbFgJNKpMGaYRbhm2FEX56MKE3yn/MNeNYuesQ==} + dev: true + + /@cspell/dict-cpp@5.1.3: + resolution: {integrity: sha512-sqnriXRAInZH9W75C+APBh6dtben9filPqVbIsiRMUXGg+s02ekz0z6LbS7kXeJ5mD2qXoMLBrv13qH2eIwutQ==} + dev: true + + /@cspell/dict-cryptocurrencies@5.0.0: + resolution: {integrity: sha512-Z4ARIw5+bvmShL+4ZrhDzGhnc9znaAGHOEMaB/GURdS/jdoreEDY34wdN0NtdLHDO5KO7GduZnZyqGdRoiSmYA==} + dev: true + + /@cspell/dict-csharp@4.0.2: + resolution: {integrity: sha512-1JMofhLK+4p4KairF75D3A924m5ERMgd1GvzhwK2geuYgd2ZKuGW72gvXpIV7aGf52E3Uu1kDXxxGAiZ5uVG7g==} + dev: true + + /@cspell/dict-css@4.0.12: + resolution: {integrity: sha512-vGBgPM92MkHQF5/2jsWcnaahOZ+C6OE/fPvd5ScBP72oFY9tn5GLuomcyO0z8vWCr2e0nUSX1OGimPtcQAlvSw==} + dev: true + + /@cspell/dict-dart@2.0.3: + resolution: {integrity: sha512-cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw==} + dev: true + + /@cspell/dict-data-science@1.0.11: + resolution: {integrity: sha512-TaHAZRVe0Zlcc3C23StZqqbzC0NrodRwoSAc8dis+5qLeLLnOCtagYQeROQvDlcDg3X/VVEO9Whh4W/z4PAmYQ==} + dev: true + + /@cspell/dict-django@4.1.0: + resolution: {integrity: sha512-bKJ4gPyrf+1c78Z0Oc4trEB9MuhcB+Yg+uTTWsvhY6O2ncFYbB/LbEZfqhfmmuK/XJJixXfI1laF2zicyf+l0w==} + dev: true + + /@cspell/dict-docker@1.1.7: + resolution: {integrity: sha512-XlXHAr822euV36GGsl2J1CkBIVg3fZ6879ZOg5dxTIssuhUOCiV2BuzKZmt6aIFmcdPmR14+9i9Xq+3zuxeX0A==} + dev: true + + /@cspell/dict-dotnet@5.0.0: + resolution: {integrity: sha512-EOwGd533v47aP5QYV8GlSSKkmM9Eq8P3G/eBzSpH3Nl2+IneDOYOBLEUraHuiCtnOkNsz0xtZHArYhAB2bHWAw==} + dev: true + + /@cspell/dict-elixir@4.0.3: + resolution: {integrity: sha512-g+uKLWvOp9IEZvrIvBPTr/oaO6619uH/wyqypqvwpmnmpjcfi8+/hqZH8YNKt15oviK8k4CkINIqNhyndG9d9Q==} + dev: true + + /@cspell/dict-en-common-misspellings@2.0.0: + resolution: {integrity: sha512-NOg8dlv37/YqLkCfBs5OXeJm/Wcfb/CzeOmOZJ2ZXRuxwsNuolb4TREUce0yAXRqMhawahY5TSDRJJBgKjBOdw==} + dev: true + + /@cspell/dict-en-gb@1.1.33: + resolution: {integrity: sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==} + dev: true + + /@cspell/dict-en_us@4.3.17: + resolution: {integrity: sha512-CS0Tb2f2YwQZ4VZ6+WLAO5uOzb0iO/iYSRl34kX4enq6quXxLYzwdfGAwv85wSYHPdga8tGiZFP+p8GPsi2JEg==} + dev: true + + /@cspell/dict-filetypes@3.0.3: + resolution: {integrity: sha512-J9UP+qwwBLfOQ8Qg9tAsKtSY/WWmjj21uj6zXTI9hRLD1eG1uUOLcfVovAmtmVqUWziPSKMr87F6SXI3xmJXgw==} + dev: true + + /@cspell/dict-fonts@4.0.0: + resolution: {integrity: sha512-t9V4GeN/m517UZn63kZPUYP3OQg5f0OBLSd3Md5CU3eH1IFogSvTzHHnz4Wqqbv8NNRiBZ3HfdY/pqREZ6br3Q==} + dev: true + + /@cspell/dict-fsharp@1.0.1: + resolution: {integrity: sha512-23xyPcD+j+NnqOjRHgW3IU7Li912SX9wmeefcY0QxukbAxJ/vAN4rBpjSwwYZeQPAn3fxdfdNZs03fg+UM+4yQ==} + dev: true + + /@cspell/dict-fullstack@3.1.5: + resolution: {integrity: sha512-6ppvo1dkXUZ3fbYn/wwzERxCa76RtDDl5Afzv2lijLoijGGUw5yYdLBKJnx8PJBGNLh829X352ftE7BElG4leA==} + dev: true + + /@cspell/dict-gaming-terms@1.0.5: + resolution: {integrity: sha512-C3riccZDD3d9caJQQs1+MPfrUrQ+0KHdlj9iUR1QD92FgTOF6UxoBpvHUUZ9YSezslcmpFQK4xQQ5FUGS7uWfw==} + dev: true + + /@cspell/dict-git@3.0.0: + resolution: {integrity: sha512-simGS/lIiXbEaqJu9E2VPoYW1OTC2xrwPPXNXFMa2uo/50av56qOuaxDrZ5eH1LidFXwoc8HROCHYeKoNrDLSw==} + dev: true + + /@cspell/dict-golang@6.0.5: + resolution: {integrity: sha512-w4mEqGz4/wV+BBljLxduFNkMrd3rstBNDXmoX5kD4UTzIb4Sy0QybWCtg2iVT+R0KWiRRA56QKOvBsgXiddksA==} + dev: true + + /@cspell/dict-haskell@4.0.1: + resolution: {integrity: sha512-uRrl65mGrOmwT7NxspB4xKXFUenNC7IikmpRZW8Uzqbqcu7ZRCUfstuVH7T1rmjRgRkjcIjE4PC11luDou4wEQ==} + dev: true + + /@cspell/dict-html-symbol-entities@4.0.0: + resolution: {integrity: sha512-HGRu+48ErJjoweR5IbcixxETRewrBb0uxQBd6xFGcxbEYCX8CnQFTAmKI5xNaIt2PKaZiJH3ijodGSqbKdsxhw==} + dev: true + + /@cspell/dict-html@4.0.5: + resolution: {integrity: sha512-p0brEnRybzSSWi8sGbuVEf7jSTDmXPx7XhQUb5bgG6b54uj+Z0Qf0V2n8b/LWwIPJNd1GygaO9l8k3HTCy1h4w==} + dev: true + + /@cspell/dict-java@5.0.6: + resolution: {integrity: sha512-kdE4AHHHrixyZ5p6zyms1SLoYpaJarPxrz8Tveo6gddszBVVwIUZ+JkQE1bWNLK740GWzIXdkznpUfw1hP9nXw==} + dev: true + + /@cspell/dict-k8s@1.0.2: + resolution: {integrity: sha512-tLT7gZpNPnGa+IIFvK9SP1LrSpPpJ94a/DulzAPOb1Q2UBFwdpFd82UWhio0RNShduvKG/WiMZf/wGl98pn+VQ==} + dev: true + + /@cspell/dict-latex@4.0.0: + resolution: {integrity: sha512-LPY4y6D5oI7D3d+5JMJHK/wxYTQa2lJMSNxps2JtuF8hbAnBQb3igoWEjEbIbRRH1XBM0X8dQqemnjQNCiAtxQ==} + dev: true + + /@cspell/dict-lorem-ipsum@4.0.0: + resolution: {integrity: sha512-1l3yjfNvMzZPibW8A7mQU4kTozwVZVw0AvFEdy+NcqtbxH+TvbSkNMqROOFWrkD2PjnKG0+Ea0tHI2Pi6Gchnw==} + dev: true + + /@cspell/dict-lua@4.0.3: + resolution: {integrity: sha512-lDHKjsrrbqPaea13+G9s0rtXjMO06gPXPYRjRYawbNmo4E/e3XFfVzeci3OQDQNDmf2cPOwt9Ef5lu2lDmwfJg==} + dev: true + + /@cspell/dict-makefile@1.0.0: + resolution: {integrity: sha512-3W9tHPcSbJa6s0bcqWo6VisEDTSN5zOtDbnPabF7rbyjRpNo0uHXHRJQF8gAbFzoTzBBhgkTmrfSiuyQm7vBUQ==} + dev: true + + /@cspell/dict-node@4.0.3: + resolution: {integrity: sha512-sFlUNI5kOogy49KtPg8SMQYirDGIAoKBO3+cDLIwD4MLdsWy1q0upc7pzGht3mrjuyMiPRUV14Bb0rkVLrxOhg==} + dev: true + + /@cspell/dict-npm@5.0.15: + resolution: {integrity: sha512-sX0X5YWNW54F4baW7b5JJB6705OCBIZtUqjOghlJNORS5No7QY1IX1zc5FxNNu4gsaCZITAmfMi4ityXEsEThA==} + dev: true + + /@cspell/dict-php@4.0.6: + resolution: {integrity: sha512-ySAXisf7twoVFZqBV2o/DKiCLIDTHNqfnj0EfH9OoOUR7HL3rb6zJkm0viLUFDO2G/8SyIi6YrN/6KX+Scjjjg==} + dev: true + + /@cspell/dict-powershell@5.0.3: + resolution: {integrity: sha512-lEdzrcyau6mgzu1ie98GjOEegwVHvoaWtzQnm1ie4DyZgMr+N6D0Iyj1lzvtmt0snvsDFa5F2bsYzf3IMKcpcA==} + dev: true + + /@cspell/dict-public-licenses@2.0.6: + resolution: {integrity: sha512-bHqpSpJvLCUcWxj1ov/Ki8WjmESpYwRpQlqfdchekOTc93Huhvjm/RXVN1R4fVf4Hspyem1QVkCGqAmjJMj6sw==} + dev: true + + /@cspell/dict-python@4.1.11: + resolution: {integrity: sha512-XG+v3PumfzUW38huSbfT15Vqt3ihNb462ulfXifpQllPok5OWynhszCLCRQjQReV+dgz784ST4ggRxW452/kVg==} + dependencies: + '@cspell/dict-data-science': 1.0.11 + dev: true + + /@cspell/dict-r@2.0.1: + resolution: {integrity: sha512-KCmKaeYMLm2Ip79mlYPc8p+B2uzwBp4KMkzeLd5E6jUlCL93Y5Nvq68wV5fRLDRTf7N1LvofkVFWfDcednFOgA==} + dev: true + + /@cspell/dict-ruby@5.0.2: + resolution: {integrity: sha512-cIh8KTjpldzFzKGgrqUX4bFyav5lC52hXDKo4LbRuMVncs3zg4hcSf4HtURY+f2AfEZzN6ZKzXafQpThq3dl2g==} + dev: true + + /@cspell/dict-rust@4.0.2: + resolution: {integrity: sha512-RhziKDrklzOntxAbY3AvNR58wnFGIo3YS8+dNeLY36GFuWOvXDHFStYw5Pod4f/VXbO/+1tXtywCC4zWfB2p1w==} + dev: true + + /@cspell/dict-scala@5.0.0: + resolution: {integrity: sha512-ph0twaRoV+ylui022clEO1dZ35QbeEQaKTaV2sPOsdwIokABPIiK09oWwGK9qg7jRGQwVaRPEq0Vp+IG1GpqSQ==} + dev: true + + /@cspell/dict-software-terms@3.3.18: + resolution: {integrity: sha512-LJZGGMGqS8KzgXJrSMs3T+6GoqHG9z8Bc+rqLzLzbtoR3FbsMasE9U8oP2PmS3q7jJLFjQkzmg508DrcuZuo2g==} + dev: true + + /@cspell/dict-sql@2.1.3: + resolution: {integrity: sha512-SEyTNKJrjqD6PAzZ9WpdSu6P7wgdNtGV2RV8Kpuw1x6bV+YsSptuClYG+JSdRExBTE6LwIe1bTklejUp3ZP8TQ==} + dev: true + + /@cspell/dict-svelte@1.0.2: + resolution: {integrity: sha512-rPJmnn/GsDs0btNvrRBciOhngKV98yZ9SHmg8qI6HLS8hZKvcXc0LMsf9LLuMK1TmS2+WQFAan6qeqg6bBxL2Q==} + dev: true + + /@cspell/dict-swift@2.0.1: + resolution: {integrity: sha512-gxrCMUOndOk7xZFmXNtkCEeroZRnS2VbeaIPiymGRHj5H+qfTAzAKxtv7jJbVA3YYvEzWcVE2oKDP4wcbhIERw==} + dev: true + + /@cspell/dict-typescript@3.1.2: + resolution: {integrity: sha512-lcNOYWjLUvDZdLa0UMNd/LwfVdxhE9rKA+agZBGjL3lTA3uNvH7IUqSJM/IXhJoBpLLMVEOk8v1N9xi+vDuCdA==} + dev: true + + /@cspell/dict-vue@3.0.0: + resolution: {integrity: sha512-niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A==} + dev: true + + /@cspell/dynamic-import@8.6.0: + resolution: {integrity: sha512-yDJZ/uXCpZcAkXwaWa0JcCZHZFxnF3qtiFiq2WG5cEw8tiJiNdawjSCd8/D35dT3QFNaInMP+H3sOf68dNueew==} + engines: {node: '>=18.0'} + dependencies: + import-meta-resolve: 4.0.0 + dev: true + + /@cspell/strong-weak-map@8.6.0: + resolution: {integrity: sha512-QenBOdIT1zRa0kF3Z1mwObcvmdhxn+rzQDdmkxwSyRB/9KsNnib6XXTUo8P+Z/ZKXOYbP9Wmf4FX+vKd3yVX0Q==} + engines: {node: '>=18'} + dev: true + + /@ericcornelissen/bash-parser@0.5.2: + resolution: {integrity: sha512-4pIMTa1nEFfMXitv7oaNEWOdM+zpOZavesa5GaiWTgda6Zk32CFGxjUp/iIaN0PwgUW1yTq/fztSjbpE8SLGZQ==} + engines: {node: '>=4'} + dependencies: + array-last: 1.3.0 + babylon: 6.18.0 + compose-function: 3.0.3 + deep-freeze: 0.0.1 + filter-iterator: 0.0.1 + filter-obj: 1.1.0 + has-own-property: 0.1.0 + identity-function: 1.0.0 + is-iterable: 1.1.1 + iterable-lookahead: 1.0.0 + lodash.curry: 4.1.1 + magic-string: 0.16.0 + map-obj: 2.0.0 + object-pairs: 0.1.0 + object-values: 1.0.0 + reverse-arguments: 1.0.0 + shell-quote-word: 1.0.1 + to-pascal-case: 1.0.0 + unescape-js: 1.1.4 + dev: true + + /@es-joy/jsdoccomment@0.42.0: + resolution: {integrity: sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==} + engines: {node: '>=16'} + dependencies: + comment-parser: 1.4.1 + esquery: 1.5.0 + jsdoc-type-pratt-parser: 4.0.0 + dev: true + + /@esbuild/aix-ppc64@0.19.12: + resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/aix-ppc64@0.20.2: + resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.12: + resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.20.2: + resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm@0.19.12: + resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm@0.20.2: + resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64@0.19.12: + resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64@0.20.2: + resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64@0.19.12: + resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64@0.20.2: + resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64@0.19.12: + resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64@0.20.2: + resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64@0.19.12: + resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64@0.20.2: + resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64@0.19.12: + resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64@0.20.2: + resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64@0.19.12: + resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64@0.20.2: + resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm@0.19.12: + resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm@0.20.2: + resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32@0.19.12: + resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32@0.20.2: + resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64@0.19.12: + resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64@0.20.2: + resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el@0.19.12: + resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el@0.20.2: + resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64@0.19.12: + resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64@0.20.2: + resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64@0.19.12: + resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64@0.20.2: + resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x@0.19.12: + resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x@0.20.2: + resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64@0.19.12: + resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64@0.20.2: + resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64@0.19.12: + resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64@0.20.2: + resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64@0.19.12: + resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64@0.20.2: + resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64@0.19.12: + resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64@0.20.2: + resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64@0.19.12: + resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64@0.20.2: + resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32@0.19.12: + resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32@0.20.2: + resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64@0.19.12: + resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64@0.20.2: + resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.57.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@eslint-community/regexpp@4.10.0: + resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dev: true + + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + ajv: 6.12.6 + debug: 4.3.4(supports-color@8.1.1) + espree: 9.6.1 + globals: 13.24.0 + ignore: 5.3.1 + import-fresh: 3.3.0 + js-yaml: 4.1.0 + minimatch: 3.1.2 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@eslint/js@8.57.0: + resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /@humanwhocodes/config-array@0.11.14: + resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 2.0.2 + debug: 4.3.4(supports-color@8.1.1) + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@humanwhocodes/module-importer@1.0.1: + resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} + engines: {node: '>=12.22'} + dev: true + + /@humanwhocodes/object-schema@2.0.2: + resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} + dev: true + + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + + /@istanbuljs/schema@0.1.3: + resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} + engines: {node: '>=8'} + dev: true + + /@jest/schemas@29.6.3: + resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@sinclair/typebox': 0.27.8 + dev: true + + /@jridgewell/gen-mapping@0.3.5: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.25 + dev: true + + /@jridgewell/resolve-uri@3.1.2: + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} + engines: {node: '>=6.0.0'} + dev: true + + /@jridgewell/set-array@1.2.1: + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} + engines: {node: '>=6.0.0'} + dev: true + + /@jridgewell/sourcemap-codec@1.4.15: + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + dev: true + + /@jridgewell/trace-mapping@0.3.25: + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + + /@nodelib/fs.scandir@2.1.5: + resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} + engines: {node: '>= 8'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + run-parallel: 1.2.0 + dev: true + + /@nodelib/fs.scandir@3.0.0: + resolution: {integrity: sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==} + engines: {node: '>=16.14.0'} + dependencies: + '@nodelib/fs.stat': 3.0.0 + run-parallel: 1.2.0 + dev: true + + /@nodelib/fs.stat@2.0.5: + resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} + engines: {node: '>= 8'} + dev: true + + /@nodelib/fs.stat@3.0.0: + resolution: {integrity: sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==} + engines: {node: '>=16.14.0'} + dev: true + + /@nodelib/fs.walk@1.2.8: + resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} + engines: {node: '>= 8'} + dependencies: + '@nodelib/fs.scandir': 2.1.5 + fastq: 1.17.1 + dev: true + + /@nodelib/fs.walk@2.0.0: + resolution: {integrity: sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==} + engines: {node: '>=16.14.0'} + dependencies: + '@nodelib/fs.scandir': 3.0.0 + fastq: 1.17.1 + dev: true + + /@npmcli/git@5.0.4: + resolution: {integrity: sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + '@npmcli/promise-spawn': 7.0.1 + lru-cache: 10.2.0 + npm-pick-manifest: 9.0.0 + proc-log: 3.0.0 + promise-inflight: 1.0.1 + promise-retry: 2.0.1 + semver: 7.6.0 + which: 4.0.0 + transitivePeerDependencies: + - bluebird + dev: true + + /@npmcli/map-workspaces@3.0.4: + resolution: {integrity: sha512-Z0TbvXkRbacjFFLpVpV0e2mheCh+WzQpcqL+4xp49uNJOxOnIAPZyXtUxZ5Qn3QBTGKA11Exjd9a5411rBrhDg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + '@npmcli/name-from-folder': 2.0.0 + glob: 10.3.10 + minimatch: 9.0.3 + read-package-json-fast: 3.0.2 + dev: true + + /@npmcli/name-from-folder@2.0.0: + resolution: {integrity: sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /@npmcli/package-json@5.0.0: + resolution: {integrity: sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + '@npmcli/git': 5.0.4 + glob: 10.3.10 + hosted-git-info: 7.0.1 + json-parse-even-better-errors: 3.0.1 + normalize-package-data: 6.0.0 + proc-log: 3.0.0 + semver: 7.6.0 + transitivePeerDependencies: + - bluebird + dev: true + + /@npmcli/promise-spawn@7.0.1: + resolution: {integrity: sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + which: 4.0.0 + dev: true + + /@phenomnomnominal/tsquery@6.1.3(typescript@5.4.3): + resolution: {integrity: sha512-CEqpJ872StsxRmwv9ePCZ4BCisrJSlREUC5XxIRYxhvODt4aQoJFFmjTgaP6meyKiiXxxN/VWPZ58j4yHXRkmw==} + peerDependencies: + typescript: ^3 || ^4 || ^5 + dependencies: + '@types/esquery': 1.5.3 + esquery: 1.5.0 + typescript: 5.4.3 + dev: false + + /@pkgjs/parseargs@0.11.0: + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + requiresBuild: true + optional: true + + /@pkgr/core@0.1.1: + resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dev: true + + /@pnpm/constants@7.1.1: + resolution: {integrity: sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==} + engines: {node: '>=16.14'} + dev: true + + /@pnpm/core-loggers@9.0.6(@pnpm/logger@5.0.0): + resolution: {integrity: sha512-iK67SGbp+06bA/elpg51wygPFjNA7JKHtKkpLxqXXHw+AjFFBC3f2OznJsCIuDK6HdGi5UhHLYqo5QxJ2gMqJQ==} + engines: {node: '>=16.14'} + peerDependencies: + '@pnpm/logger': ^5.0.0 + dependencies: + '@pnpm/logger': 5.0.0 + '@pnpm/types': 9.4.2 + dev: true + + /@pnpm/error@5.0.3: + resolution: {integrity: sha512-ONJU5cUeoeJSy50qOYsMZQHTA/9QKmGgh1ATfEpCLgtbdwqUiwD9MxHNeXUYYI/pocBCz6r1ZCFqiQvO+8SUKA==} + engines: {node: '>=16.14'} + dependencies: + '@pnpm/constants': 7.1.1 + dev: true + + /@pnpm/fetching-types@5.0.0: + resolution: {integrity: sha512-o9gdO1v8Uc5P2fBBuW6GSpfTqIivQmQlqjQJdFiQX0m+tgxlrMRneIg392jZuc6fk7kFqjLheInlslgJfwY+4Q==} + engines: {node: '>=16.14'} + dependencies: + '@zkochan/retry': 0.2.0 + node-fetch: 3.0.0-beta.9 + transitivePeerDependencies: + - domexception + dev: true + + /@pnpm/graceful-fs@3.2.0: + resolution: {integrity: sha512-vRoXJxscDpHak7YE9SqCkzfrayn+Lw+YueOeHIPEqkgokrHeYgYeONoc2kGh0ObHaRtNSsonozVfJ456kxLNvA==} + engines: {node: '>=16.14'} + dependencies: + graceful-fs: 4.2.11 + dev: true + + /@pnpm/logger@5.0.0: + resolution: {integrity: sha512-YfcB2QrX+Wx1o6LD1G2Y2fhDhOix/bAY/oAnMpHoNLsKkWIRbt1oKLkIFvxBMzLwAEPqnYWguJrYC+J6i4ywbw==} + engines: {node: '>=12.17'} + dependencies: + bole: 5.0.11 + ndjson: 2.0.0 + dev: true + + /@pnpm/npm-package-arg@1.0.0: + resolution: {integrity: sha512-oQYP08exi6mOPdAZZWcNIGS+KKPsnNwUBzSuAEGWuCcqwMAt3k/WVCqVIXzBxhO5sP2b43og69VHmPj6IroKqw==} + engines: {node: '>=14.6'} + dependencies: + hosted-git-info: 4.1.0 + semver: 7.6.0 + validate-npm-package-name: 4.0.0 + dev: true + + /@pnpm/npm-resolver@18.1.1(@pnpm/logger@5.0.0): + resolution: {integrity: sha512-NptzncmMD5ZMimbjWkGpMzuBRhlCY+sh7mzypPdBOTNlh5hmEQe/VaRKjNK4V9/b0C/llElkvIePL6acybu86w==} + engines: {node: '>=16.14'} + peerDependencies: + '@pnpm/logger': ^5.0.0 + dependencies: + '@pnpm/core-loggers': 9.0.6(@pnpm/logger@5.0.0) + '@pnpm/error': 5.0.3 + '@pnpm/fetching-types': 5.0.0 + '@pnpm/graceful-fs': 3.2.0 + '@pnpm/logger': 5.0.0 + '@pnpm/resolve-workspace-range': 5.0.1 + '@pnpm/resolver-base': 11.1.0 + '@pnpm/types': 9.4.2 + '@zkochan/retry': 0.2.0 + encode-registry: 3.0.1 + load-json-file: 6.2.0 + lru-cache: 10.2.0 + normalize-path: 3.0.0 + p-limit: 3.1.0 + p-memoize: 4.0.1 + parse-npm-tarball-url: 3.0.0 + path-temp: 2.1.0 + ramda: /@pnpm/ramda@0.28.1 + rename-overwrite: 5.0.0 + semver: 7.6.0 + ssri: 10.0.5 + version-selector-type: 3.0.0 + transitivePeerDependencies: + - domexception + dev: true + + /@pnpm/ramda@0.28.1: + resolution: {integrity: sha512-zcAG+lvU0fMziNeGXpPyCyCJYp5ZVrPElEE4t14jAmViaihohocZ+dDkcRIyAomox8pQsuZnv1EyHR+pOhmUWw==} + dev: true + + /@pnpm/resolve-workspace-range@5.0.1: + resolution: {integrity: sha512-yQ0pMthlw8rTgS/C9hrjne+NEnnSNevCjtdodd7i15I59jMBYciHifZ/vjg0NY+Jl+USTc3dBE+0h/4tdYjMKg==} + engines: {node: '>=16.14'} + dependencies: + semver: 7.6.0 + dev: true + + /@pnpm/resolver-base@11.1.0: + resolution: {integrity: sha512-y2qKaj18pwe1VWc3YXEitdYFo+WqOOt60aqTUuOVkJAirUzz0DzuYh3Ifct4znYWPdgUXHaN5DMphNF5iL85rA==} + engines: {node: '>=16.14'} + dependencies: + '@pnpm/types': 9.4.2 + dev: true + + /@pnpm/types@9.4.2: + resolution: {integrity: sha512-g1hcF8Nv4gd76POilz9gD4LITAPXOe5nX4ijgr8ixCbLQZfcpYiMfJ+C1RlMNRUDo8vhlNB4O3bUlxmT6EAQXA==} + engines: {node: '>=16.14'} + dev: true + + /@pnpm/workspace.pkgs-graph@2.0.15(@pnpm/logger@5.0.0): + resolution: {integrity: sha512-Txxd5FzzVfBfGCTngISaxFlJzZhzdS8BUrCEtAWJfZOFbQzpWy27rzkaS7TaWW2dHiFcCVYzPI/2vgxfeRansA==} + engines: {node: '>=16.14'} + dependencies: + '@pnpm/npm-package-arg': 1.0.0 + '@pnpm/npm-resolver': 18.1.1(@pnpm/logger@5.0.0) + '@pnpm/resolve-workspace-range': 5.0.1 + ramda: /@pnpm/ramda@0.28.1 + transitivePeerDependencies: + - '@pnpm/logger' + - domexception + dev: true + + /@rollup/rollup-android-arm-eabi@4.13.0: + resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-android-arm64@4.13.0: + resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-arm64@4.13.0: + resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-x64@4.13.0: + resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.13.0: + resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.13.0: + resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-musl@4.13.0: + resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.13.0: + resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.13.0: + resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.13.0: + resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.13.0: + resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.13.0: + resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.13.0: + resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@sinclair/typebox@0.27.8: + resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + dev: true + + /@snyk/github-codeowners@1.1.0: + resolution: {integrity: sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==} + engines: {node: '>=8.10'} + hasBin: true + dependencies: + commander: 4.1.1 + ignore: 5.3.1 + p-map: 4.0.0 + dev: true + + /@types/eslint@8.56.6: + resolution: {integrity: sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==} + dependencies: + '@types/estree': 1.0.5 + '@types/json-schema': 7.0.15 + dev: true + + /@types/esquery@1.5.3: + resolution: {integrity: sha512-c55hQOcoPkWDfuEN9EdP1YyNH4D909U40gUEpY0nB5PWHExWHEPxcx3sx0fJ1Gzf4j1OpWktmIgciIlpgHtfDg==} + dependencies: + '@types/estree': 1.0.5 + dev: false + + /@types/estree@1.0.5: + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + + /@types/glob@7.2.0: + resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} + dependencies: + '@types/minimatch': 5.1.2 + '@types/node': 20.11.30 + dev: true + + /@types/glob@8.1.0: + resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} + dependencies: + '@types/minimatch': 5.1.2 + '@types/node': 20.11.30 + dev: true + + /@types/istanbul-lib-coverage@2.0.6: + resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==} + dev: true + + /@types/json-schema@7.0.15: + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + dev: true + + /@types/mdast@3.0.15: + resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} + dependencies: + '@types/unist': 2.0.10 + dev: true + + /@types/minimatch@5.1.2: + resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} + dev: true + + /@types/node@20.11.30: + resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} + dependencies: + undici-types: 5.26.5 + dev: true + + /@types/picomatch@2.3.3: + resolution: {integrity: sha512-Yll76ZHikRFCyz/pffKGjrCwe/le2CDwOP5F210KQo27kpRE46U2rDnzikNlVn6/ezH3Mhn46bJMTfeVTtcYMg==} + dev: true + + /@types/prop-types@15.7.12: + resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} + dev: true + + /@types/react@18.2.69: + resolution: {integrity: sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==} + dependencies: + '@types/prop-types': 15.7.12 + '@types/scheduler': 0.16.8 + csstype: 3.1.3 + dev: true + + /@types/scheduler@0.16.8: + resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} + dev: true + + /@types/semver@7.5.8: + resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} + dev: true + + /@types/unist@2.0.10: + resolution: {integrity: sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==} + dev: true + + /@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + '@typescript-eslint/parser': ^7.0.0 + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/scope-manager': 7.3.1 + '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/visitor-keys': 7.3.1 + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.57.0 + graphemer: 1.4.0 + ignore: 5.3.1 + natural-compare: 1.4.0 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 7.3.1 + '@typescript-eslint/types': 7.3.1 + '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) + '@typescript-eslint/visitor-keys': 7.3.1 + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.57.0 + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/scope-manager@6.21.0: + resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.21.0 + '@typescript-eslint/visitor-keys': 6.21.0 + dev: true + + /@typescript-eslint/scope-manager@7.3.1: + resolution: {integrity: sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.3.1 + '@typescript-eslint/visitor-keys': 7.3.1 + dev: true + + /@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) + '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.57.0 + ts-api-utils: 1.3.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/types@6.21.0: + resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} + engines: {node: ^16.0.0 || >=18.0.0} + dev: true + + /@typescript-eslint/types@7.3.1: + resolution: {integrity: sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==} + engines: {node: ^18.18.0 || >=20.0.0} + dev: true + + /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.3): + resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.21.0 + '@typescript-eslint/visitor-keys': 6.21.0 + debug: 4.3.4(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.3 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.3): + resolution: {integrity: sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 7.3.1 + '@typescript-eslint/visitor-keys': 7.3.1 + debug: 4.3.4(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.3 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@types/json-schema': 7.0.15 + '@types/semver': 7.5.8 + '@typescript-eslint/scope-manager': 6.21.0 + '@typescript-eslint/types': 6.21.0 + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.3) + eslint: 8.57.0 + semver: 7.6.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@types/json-schema': 7.0.15 + '@types/semver': 7.5.8 + '@typescript-eslint/scope-manager': 7.3.1 + '@typescript-eslint/types': 7.3.1 + '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) + eslint: 8.57.0 + semver: 7.6.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /@typescript-eslint/visitor-keys@6.21.0: + resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.21.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@typescript-eslint/visitor-keys@7.3.1: + resolution: {integrity: sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.3.1 + eslint-visitor-keys: 3.4.3 + dev: true + + /@ungap/structured-clone@1.2.0: + resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} + dev: true + + /@vitest/coverage-v8@1.4.0(vitest@1.4.0): + resolution: {integrity: sha512-4hDGyH1SvKpgZnIByr9LhGgCEuF9DKM34IBLCC/fVfy24Z3+PZ+Ii9hsVBsHvY1umM1aGPEjceRkzxCfcQ10wg==} + peerDependencies: + vitest: 1.4.0 + dependencies: + '@ampproject/remapping': 2.3.0 + '@bcoe/v8-coverage': 0.2.3 + debug: 4.3.4(supports-color@8.1.1) + istanbul-lib-coverage: 3.2.2 + istanbul-lib-report: 3.0.1 + istanbul-lib-source-maps: 5.0.4 + istanbul-reports: 3.1.7 + magic-string: 0.30.8 + magicast: 0.3.3 + picocolors: 1.0.0 + std-env: 3.7.0 + strip-literal: 2.0.0 + test-exclude: 6.0.0 + v8-to-istanbul: 9.2.0 + vitest: 1.4.0(@types/node@20.11.30) + transitivePeerDependencies: + - supports-color + dev: true + + /@vitest/expect@1.4.0: + resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} + dependencies: + '@vitest/spy': 1.4.0 + '@vitest/utils': 1.4.0 + chai: 4.4.1 + dev: true + + /@vitest/runner@1.4.0: + resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} + dependencies: + '@vitest/utils': 1.4.0 + p-limit: 5.0.0 + pathe: 1.1.2 + dev: true + + /@vitest/snapshot@1.4.0: + resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} + dependencies: + magic-string: 0.30.8 + pathe: 1.1.2 + pretty-format: 29.7.0 + dev: true + + /@vitest/spy@1.4.0: + resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} + dependencies: + tinyspy: 2.2.1 + dev: true + + /@vitest/utils@1.4.0: + resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==} + dependencies: + diff-sequences: 29.6.3 + estree-walker: 3.0.3 + loupe: 2.3.7 + pretty-format: 29.7.0 + dev: true + + /@zkochan/retry@0.2.0: + resolution: {integrity: sha512-WhB+2B/ZPlW2Xy/kMJBrMbqecWXcbDDgn0K0wKBAgO2OlBTz1iLJrRWduo+DGGn0Akvz1Lu4Xvls7dJojximWw==} + engines: {node: '>=10'} + dev: true + + /@zkochan/rimraf@2.1.3: + resolution: {integrity: sha512-mCfR3gylCzPC+iqdxEA6z5SxJeOgzgbwmyxanKriIne5qZLswDe/M43aD3p5MNzwzXRhbZg/OX+MpES6Zk1a6A==} + engines: {node: '>=12.10'} + dependencies: + rimraf: 3.0.2 + dev: true + + /acorn-jsx@5.3.2(acorn@8.11.3): + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + acorn: 8.11.3 + dev: true + + /acorn-walk@8.3.2: + resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} + engines: {node: '>=0.4.0'} + dev: true + + /acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + + /aggregate-error@3.1.0: + resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} + engines: {node: '>=8'} + dependencies: + clean-stack: 2.2.0 + indent-string: 4.0.0 + dev: true + + /ajv@6.12.6: + resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + dependencies: + fast-deep-equal: 3.1.3 + fast-json-stable-stringify: 2.1.0 + json-schema-traverse: 0.4.1 + uri-js: 4.4.1 + dev: true + + /ansi-colors@4.1.1: + resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} + engines: {node: '>=6'} + dev: true + + /ansi-colors@4.1.3: + resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} + engines: {node: '>=6'} + dev: false + + /ansi-escapes@6.2.0: + resolution: {integrity: sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==} + engines: {node: '>=14.16'} + dependencies: + type-fest: 3.13.1 + dev: true + + /ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + + /ansi-styles@3.2.1: + resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} + engines: {node: '>=4'} + dependencies: + color-convert: 1.9.3 + dev: true + + /ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + dependencies: + color-convert: 2.0.1 + + /ansi-styles@5.2.0: + resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} + engines: {node: '>=10'} + dev: true + + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + + /any-promise@1.3.0: + resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + dev: true + + /anymatch@3.1.3: + resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} + engines: {node: '>= 8'} + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + dev: true + + /are-docs-informative@0.0.2: + resolution: {integrity: sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==} + engines: {node: '>=14'} + dev: true + + /argparse@1.0.10: + resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} + dependencies: + sprintf-js: 1.0.3 + dev: true + + /argparse@2.0.1: + resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + dev: true + + /arity-n@1.0.4: + resolution: {integrity: sha512-fExL2kFDC1Q2DUOx3whE/9KoN66IzkY4b4zUHUBFM1ojEYjZZYDcUW3bek/ufGionX9giIKDC5redH2IlGqcQQ==} + dev: true + + /array-last@1.3.0: + resolution: {integrity: sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==} + engines: {node: '>=0.10.0'} + dependencies: + is-number: 4.0.0 + dev: true + + /array-timsort@1.0.3: + resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==} + dev: true + + /array-union@2.1.0: + resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} + engines: {node: '>=8'} + dev: true + + /assertion-error@1.1.0: + resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} + dev: true + + /automutate-tests@0.5.0: + resolution: {integrity: sha512-MqYx7tloN0HhwE/1uaow81ld8URhm9UJ6j6SIlFTLLqDjtj3qAL0FfeFsfz4yidrxGIvSX5RNMs8NwZ63RtJJg==} + dependencies: + automutate: 0.9.0 + chai: 4.4.1 + chalk: 2.4.2 + glob: 7.2.3 + mz: 2.7.0 + dev: true + + /automutate@0.9.0: + resolution: {integrity: sha512-A1AydgfyQCGAihiu3NciBtRAbVw0HPHfwz7wRow3rYRSpT3BrTGSWX7vFJlXjbF1On3hKfzsa4ZWsAcAnAgTVg==} + + /babylon@6.18.0: + resolution: {integrity: sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==} + hasBin: true + dev: true + + /balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + + /binary-extensions@2.3.0: + resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} + engines: {node: '>=8'} + dev: true + + /bole@5.0.11: + resolution: {integrity: sha512-KB0Ye0iMAW5BnNbnLfMSQcnI186hKUzE2fpkZWqcxsoTR7eqzlTidSOMYPHJOn/yR7VGH7uSZp37qH9q2Et0zQ==} + dependencies: + fast-safe-stringify: 2.1.1 + individual: 3.0.0 + dev: true + + /brace-expansion@1.1.11: + resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} + dependencies: + balanced-match: 1.0.2 + concat-map: 0.0.1 + dev: true + + /brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + dependencies: + balanced-match: 1.0.2 + + /braces@3.0.2: + resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + engines: {node: '>=8'} + dependencies: + fill-range: 7.0.1 + dev: true + + /browser-stdout@1.3.1: + resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} + dev: true + + /builtin-modules@3.3.0: + resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} + engines: {node: '>=6'} + + /builtins@5.0.1: + resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} + dependencies: + semver: 7.6.0 + dev: true + + /bundle-require@4.0.2(esbuild@0.19.12): + resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + esbuild: '>=0.17' + dependencies: + esbuild: 0.19.12 + load-tsconfig: 0.2.5 + dev: true + + /cac@6.7.14: + resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} + engines: {node: '>=8'} + dev: true + + /callsites@3.1.0: + resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} + engines: {node: '>=6'} + dev: true + + /camelcase@6.3.0: + resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} + engines: {node: '>=10'} + dev: true + + /chai@4.4.1: + resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} + engines: {node: '>=4'} + dependencies: + assertion-error: 1.1.0 + check-error: 1.0.3 + deep-eql: 4.1.3 + get-func-name: 2.0.2 + loupe: 2.3.7 + pathval: 1.1.1 + type-detect: 4.0.8 + dev: true + + /chalk-template@1.1.0: + resolution: {integrity: sha512-T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==} + engines: {node: '>=14.16'} + dependencies: + chalk: 5.3.0 + dev: true + + /chalk@2.4.2: + resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} + engines: {node: '>=4'} + dependencies: + ansi-styles: 3.2.1 + escape-string-regexp: 1.0.5 + supports-color: 5.5.0 + dev: true + + /chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + dev: true + + /chalk@5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + + /character-entities-legacy@1.1.4: + resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==} + dev: true + + /character-entities@1.2.4: + resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==} + dev: true + + /character-reference-invalid@1.1.4: + resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==} + dev: true + + /check-error@1.0.3: + resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + dependencies: + get-func-name: 2.0.2 + dev: true + + /chokidar@3.5.3: + resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /clean-stack@2.2.0: + resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} + engines: {node: '>=6'} + dev: true + + /clear-module@4.1.2: + resolution: {integrity: sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==} + engines: {node: '>=8'} + dependencies: + parent-module: 2.0.0 + resolve-from: 5.0.0 + dev: true + + /cli-cursor@4.0.0: + resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + restore-cursor: 4.0.0 + dev: true + + /cli-truncate@4.0.0: + resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==} + engines: {node: '>=18'} + dependencies: + slice-ansi: 5.0.0 + string-width: 7.1.0 + dev: true + + /cliui@7.0.4: + resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + dev: true + + /clone@1.0.4: + resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} + engines: {node: '>=0.8'} + requiresBuild: true + dev: true + optional: true + + /color-convert@1.9.3: + resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} + dependencies: + color-name: 1.1.3 + dev: true + + /color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + dependencies: + color-name: 1.1.4 + + /color-name@1.1.3: + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} + dev: true + + /color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + + /colorette@2.0.20: + resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} + dev: true + + /commander@11.1.0: + resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} + engines: {node: '>=16'} + dev: true + + /commander@12.0.0: + resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==} + engines: {node: '>=18'} + + /commander@4.1.1: + resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} + engines: {node: '>= 6'} + dev: true + + /comment-json@4.2.3: + resolution: {integrity: sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==} + engines: {node: '>= 6'} + dependencies: + array-timsort: 1.0.3 + core-util-is: 1.0.3 + esprima: 4.0.1 + has-own-prop: 2.0.0 + repeat-string: 1.6.1 + dev: true + + /comment-parser@1.4.1: + resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==} + engines: {node: '>= 12.0.0'} + dev: true + + /compose-function@3.0.3: + resolution: {integrity: sha512-xzhzTJ5eC+gmIzvZq+C3kCJHsp9os6tJkrigDRZclyGtOKINbZtE8n1Tzmeh32jW+BUDPbvZpibwvJHBLGMVwg==} + dependencies: + arity-n: 1.0.4 + dev: true + + /concat-map@0.0.1: + resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + dev: true + + /configstore@6.0.0: + resolution: {integrity: sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==} + engines: {node: '>=12'} + dependencies: + dot-prop: 6.0.1 + graceful-fs: 4.2.11 + unique-string: 3.0.0 + write-file-atomic: 3.0.3 + xdg-basedir: 5.1.0 + dev: true + + /console-fail-test@0.2.3: + resolution: {integrity: sha512-p1xfi9ubVM2X3NpjPH1Gm8Gxc7vXyTwcOIquU8rpUDA+ISSitAOiBDnT/Bti1We5YzZKRxgI0JU+fFvOmOXtvA==} + dev: true + + /convert-source-map@2.0.0: + resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} + dev: true + + /core-util-is@1.0.3: + resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + dev: true + + /cross-spawn@7.0.3: + resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + engines: {node: '>= 8'} + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + + /crypto-random-string@2.0.0: + resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} + engines: {node: '>=8'} + dev: true + + /crypto-random-string@4.0.0: + resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==} + engines: {node: '>=12'} + dependencies: + type-fest: 1.4.0 + dev: true + + /cspell-config-lib@8.6.0: + resolution: {integrity: sha512-Q1rvQFUDJTu4hUtxwL6+q83Hjx/a5grEjMS5axxFJzjJuFRbRsXCagncdSCx/YBqLkNM5noBbRP/0rVh7ufqxw==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-types': 8.6.0 + comment-json: 4.2.3 + yaml: 2.4.1 + dev: true + + /cspell-dictionary@8.6.0: + resolution: {integrity: sha512-ohToeOQznIrb2/z7RfKxX3NID0WiO4sXK3IxKdnbn2viGgdn17tQ8Z2f4Xuy9egjSGRKyr6N25Z5AOes1C8R3w==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-pipe': 8.6.0 + '@cspell/cspell-types': 8.6.0 + cspell-trie-lib: 8.6.0 + fast-equals: 5.0.1 + gensequence: 7.0.0 + dev: true + + /cspell-gitignore@8.6.0: + resolution: {integrity: sha512-6INRlNb17iKtQH7NmDM/EsX5OZOD2TzIwHiJnnWci0Y5l10V/zN9WGLDegTjMh9HU3TS6uUuN4I/ffkCs9m+LA==} + engines: {node: '>=18'} + hasBin: true + dependencies: + cspell-glob: 8.6.0 + find-up-simple: 1.0.0 + dev: true + + /cspell-glob@8.6.0: + resolution: {integrity: sha512-AyuExc34F8JsEYNl4inx1m1v5VoSRA/cTptREq/AoNTcMTyG5s+wt5J+VWBfvJjEDEEpd9Cb2it0j8TMo/Tpjw==} + engines: {node: '>=18'} + dependencies: + micromatch: 4.0.5 + dev: true + + /cspell-grammar@8.6.0: + resolution: {integrity: sha512-wVpZ4pPOqRoOmzLUc34wyOQnBi/6RsV3Y1KiPn8BNSkObb9XSohb1xJJMJ69unEmgE0snQDMHIeUaLTQH414MA==} + engines: {node: '>=18'} + hasBin: true + dependencies: + '@cspell/cspell-pipe': 8.6.0 + '@cspell/cspell-types': 8.6.0 + dev: true + + /cspell-io@8.6.0: + resolution: {integrity: sha512-jx7ccRpcshqxN6xnOiGnX4VycaqTpmatRjHITn4vLoDmQNfxQeU69YT62bhyjogCBuJsZS9ksjo7GQIsrYBekA==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-service-bus': 8.6.0 + dev: true + + /cspell-lib@8.6.0: + resolution: {integrity: sha512-l1bBxBz8noPOxEIIu1Ahvd4e/j6Re1PNDD9FwZgaRmvMyIPZbupTxzCM0MZWvYz1VymBmrrVEKRwtZ34VocaCw==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-bundled-dicts': 8.6.0 + '@cspell/cspell-pipe': 8.6.0 + '@cspell/cspell-resolver': 8.6.0 + '@cspell/cspell-types': 8.6.0 + '@cspell/dynamic-import': 8.6.0 + '@cspell/strong-weak-map': 8.6.0 + clear-module: 4.1.2 + comment-json: 4.2.3 + configstore: 6.0.0 + cspell-config-lib: 8.6.0 + cspell-dictionary: 8.6.0 + cspell-glob: 8.6.0 + cspell-grammar: 8.6.0 + cspell-io: 8.6.0 + cspell-trie-lib: 8.6.0 + fast-equals: 5.0.1 + gensequence: 7.0.0 + import-fresh: 3.3.0 + resolve-from: 5.0.0 + vscode-languageserver-textdocument: 1.0.11 + vscode-uri: 3.0.8 + dev: true + + /cspell-trie-lib@8.6.0: + resolution: {integrity: sha512-S8nGCnEJBL1maiKPd3FhI54QG+OgtOkcJ/yUDXGXGrokSruWFdNocioPirlFAHf959ax1GBUVEYNIgnu/EIWNg==} + engines: {node: '>=18'} + dependencies: + '@cspell/cspell-pipe': 8.6.0 + '@cspell/cspell-types': 8.6.0 + gensequence: 7.0.0 + dev: true + + /cspell@8.6.0: + resolution: {integrity: sha512-aAaVD3v1105OQePCpcdYkHnHxxkxKxxQzFcfJ4tKsH06dlW04Sp1oQLlsjgWDa3y6cdYTpSYj1eSenavBvfOFg==} + engines: {node: '>=18'} + hasBin: true + dependencies: + '@cspell/cspell-json-reporter': 8.6.0 + '@cspell/cspell-pipe': 8.6.0 + '@cspell/cspell-types': 8.6.0 + '@cspell/dynamic-import': 8.6.0 + chalk: 5.3.0 + chalk-template: 1.1.0 + commander: 12.0.0 + cspell-gitignore: 8.6.0 + cspell-glob: 8.6.0 + cspell-io: 8.6.0 + cspell-lib: 8.6.0 + fast-glob: 3.3.2 + fast-json-stable-stringify: 2.1.0 + file-entry-cache: 8.0.0 + get-stdin: 9.0.0 + semver: 7.6.0 + strip-ansi: 7.1.0 + vscode-uri: 3.0.8 + dev: true + + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + dev: true + + /data-uri-to-buffer@3.0.1: + resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==} + engines: {node: '>= 6'} + dev: true + + /debug@4.3.4(supports-color@8.1.1): + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + supports-color: 8.1.1 + dev: true + + /decamelize@4.0.0: + resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==} + engines: {node: '>=10'} + dev: true + + /deep-eql@4.1.3: + resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} + engines: {node: '>=6'} + dependencies: + type-detect: 4.0.8 + dev: true + + /deep-extend@0.6.0: + resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} + engines: {node: '>=4.0.0'} + dev: true + + /deep-freeze@0.0.1: + resolution: {integrity: sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==} + dev: true + + /deep-is@0.1.4: + resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} + dev: true + + /defaults@1.0.4: + resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} + requiresBuild: true + dependencies: + clone: 1.0.4 + dev: true + optional: true + + /detect-indent@6.1.0: + resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} + engines: {node: '>=8'} + dev: true + + /detect-indent@7.0.1: + resolution: {integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==} + engines: {node: '>=12.20'} + dev: true + + /detect-newline@3.1.0: + resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} + engines: {node: '>=8'} + dev: true + + /detect-newline@4.0.1: + resolution: {integrity: sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + + /diff-sequences@29.6.3: + resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dev: true + + /diff@5.0.0: + resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} + engines: {node: '>=0.3.1'} + dev: true + + /dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + dependencies: + path-type: 4.0.0 + dev: true + + /doctrine@3.0.0: + resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} + engines: {node: '>=6.0.0'} + dependencies: + esutils: 2.0.3 + dev: true + + /dot-prop@6.0.1: + resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==} + engines: {node: '>=10'} + dependencies: + is-obj: 2.0.0 + dev: true + + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + + /easy-table@1.2.0: + resolution: {integrity: sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==} + dependencies: + ansi-regex: 5.0.1 + optionalDependencies: + wcwidth: 1.0.1 + dev: true + + /emoji-regex@10.3.0: + resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==} + dev: true + + /emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + + /emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + + /encode-registry@3.0.1: + resolution: {integrity: sha512-6qOwkl1g0fv0DN3Y3ggr2EaZXN71aoAqPp3p/pVaWSBSIo+YjLOWN61Fva43oVyQNPf7kgm8lkudzlzojwE2jw==} + engines: {node: '>=10'} + dependencies: + mem: 8.1.1 + dev: true + + /enquirer@2.4.1: + resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} + engines: {node: '>=8.6'} + dependencies: + ansi-colors: 4.1.3 + strip-ansi: 6.0.1 + dev: false + + /entities@1.1.2: + resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==} + dev: true + + /entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + dev: true + + /err-code@2.0.3: + resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} + dev: true + + /error-ex@1.3.2: + resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + dependencies: + is-arrayish: 0.2.1 + dev: true + + /esbuild@0.19.12: + resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.19.12 + '@esbuild/android-arm': 0.19.12 + '@esbuild/android-arm64': 0.19.12 + '@esbuild/android-x64': 0.19.12 + '@esbuild/darwin-arm64': 0.19.12 + '@esbuild/darwin-x64': 0.19.12 + '@esbuild/freebsd-arm64': 0.19.12 + '@esbuild/freebsd-x64': 0.19.12 + '@esbuild/linux-arm': 0.19.12 + '@esbuild/linux-arm64': 0.19.12 + '@esbuild/linux-ia32': 0.19.12 + '@esbuild/linux-loong64': 0.19.12 + '@esbuild/linux-mips64el': 0.19.12 + '@esbuild/linux-ppc64': 0.19.12 + '@esbuild/linux-riscv64': 0.19.12 + '@esbuild/linux-s390x': 0.19.12 + '@esbuild/linux-x64': 0.19.12 + '@esbuild/netbsd-x64': 0.19.12 + '@esbuild/openbsd-x64': 0.19.12 + '@esbuild/sunos-x64': 0.19.12 + '@esbuild/win32-arm64': 0.19.12 + '@esbuild/win32-ia32': 0.19.12 + '@esbuild/win32-x64': 0.19.12 + dev: true + + /esbuild@0.20.2: + resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.20.2 + '@esbuild/android-arm': 0.20.2 + '@esbuild/android-arm64': 0.20.2 + '@esbuild/android-x64': 0.20.2 + '@esbuild/darwin-arm64': 0.20.2 + '@esbuild/darwin-x64': 0.20.2 + '@esbuild/freebsd-arm64': 0.20.2 + '@esbuild/freebsd-x64': 0.20.2 + '@esbuild/linux-arm': 0.20.2 + '@esbuild/linux-arm64': 0.20.2 + '@esbuild/linux-ia32': 0.20.2 + '@esbuild/linux-loong64': 0.20.2 + '@esbuild/linux-mips64el': 0.20.2 + '@esbuild/linux-ppc64': 0.20.2 + '@esbuild/linux-riscv64': 0.20.2 + '@esbuild/linux-s390x': 0.20.2 + '@esbuild/linux-x64': 0.20.2 + '@esbuild/netbsd-x64': 0.20.2 + '@esbuild/openbsd-x64': 0.20.2 + '@esbuild/sunos-x64': 0.20.2 + '@esbuild/win32-arm64': 0.20.2 + '@esbuild/win32-ia32': 0.20.2 + '@esbuild/win32-x64': 0.20.2 + dev: true + + /escalade@3.1.2: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} + engines: {node: '>=6'} + dev: true + + /escape-string-regexp@1.0.5: + resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} + engines: {node: '>=0.8.0'} + dev: true + + /escape-string-regexp@4.0.0: + resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} + engines: {node: '>=10'} + dev: true + + /eslint-compat-utils@0.5.0(eslint@8.57.0): + resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==} + engines: {node: '>=12'} + peerDependencies: + eslint: '>=6.0.0' + dependencies: + eslint: 8.57.0 + semver: 7.6.0 + dev: true + + /eslint-plugin-deprecation@2.0.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-OAm9Ohzbj11/ZFyICyR5N6LbOIvQMp7ZU2zI7Ej0jIc8kiGUERXPNMfw2QqqHD1ZHtjMub3yPZILovYEYucgoQ==} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: ^4.2.4 || ^5.0.0 + dependencies: + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.3) + eslint: 8.57.0 + tslib: 2.6.2 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-es-x@7.6.0(eslint@8.57.0): + resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + eslint: '>=8' + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/regexpp': 4.10.0 + eslint: 8.57.0 + eslint-compat-utils: 0.5.0(eslint@8.57.0) + dev: true + + /eslint-plugin-eslint-comments@3.2.0(eslint@8.57.0): + resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==} + engines: {node: '>=6.5.0'} + peerDependencies: + eslint: '>=4.19.1' + dependencies: + escape-string-regexp: 1.0.5 + eslint: 8.57.0 + ignore: 5.3.1 + dev: true + + /eslint-plugin-jsdoc@48.2.1(eslint@8.57.0): + resolution: {integrity: sha512-iUvbcyDZSO/9xSuRv2HQBw++8VkV/pt3UWtX9cpPH0l7GKPq78QC/6+PmyQHHvNZaTjAce6QVciEbnc6J/zH5g==} + engines: {node: '>=18'} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 + dependencies: + '@es-joy/jsdoccomment': 0.42.0 + are-docs-informative: 0.0.2 + comment-parser: 1.4.1 + debug: 4.3.4(supports-color@8.1.1) + escape-string-regexp: 4.0.0 + eslint: 8.57.0 + esquery: 1.5.0 + is-builtin-module: 3.2.1 + semver: 7.6.0 + spdx-expression-parse: 4.0.0 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-jsonc@2.14.1(eslint@8.57.0): + resolution: {integrity: sha512-Tei6G4N7pZulP5MHi0EIdtseiCqUPkDMd0O8Zrw4muMIlsjJ5/B9X+U3Pfo6B7l0mTL9LN9FwuWT70dRJ6z7tg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + eslint: 8.57.0 + eslint-compat-utils: 0.5.0(eslint@8.57.0) + espree: 9.6.1 + graphemer: 1.4.0 + jsonc-eslint-parser: 2.4.0 + natural-compare: 1.4.0 + synckit: 0.6.2 + dev: true + + /eslint-plugin-markdown@4.0.1(eslint@8.57.0): + resolution: {integrity: sha512-5/MnGvYU0i8MbHH5cg8S+Vl3DL+bqRNYshk1xUO86DilNBaxtTkhH+5FD0/yO03AmlI6+lfNFdk2yOw72EPzpA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: '>=8' + dependencies: + eslint: 8.57.0 + mdast-util-from-markdown: 0.8.5 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-n@16.6.2(eslint@8.57.0): + resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==} + engines: {node: '>=16.0.0'} + peerDependencies: + eslint: '>=7.0.0' + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + builtins: 5.0.1 + eslint: 8.57.0 + eslint-plugin-es-x: 7.6.0(eslint@8.57.0) + get-tsconfig: 4.7.3 + globals: 13.24.0 + ignore: 5.3.1 + is-builtin-module: 3.2.1 + is-core-module: 2.13.1 + minimatch: 3.1.2 + resolve: 1.22.8 + semver: 7.6.0 + dev: true + + /eslint-plugin-package-json@0.10.4(eslint@8.57.0)(jsonc-eslint-parser@2.4.0): + resolution: {integrity: sha512-dape6w9G7hCXDkoVWoPwrQjUK0V6636qAgUPewduXLH9RdEw/y4XGqCyvD5KujlMBQuagadMkxuGNluW0GC4vQ==} + engines: {node: '>=18'} + peerDependencies: + eslint: '>=8.0.0' + jsonc-eslint-parser: ^2.0.0 + dependencies: + eslint: 8.57.0 + jsonc-eslint-parser: 2.4.0 + package-json-validator: 0.6.3 + semver: 7.6.0 + sort-package-json: 1.57.0 + validate-npm-package-name: 5.0.0 + dev: true + + /eslint-plugin-perfectionist@2.7.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-RpSMc0T0DT9DlOj4APzwlAjCqQMxFdsIYlupe73eDkKLn1mMK7fVw2z3nj2y822szKOpvHA7bDa56ySOlr4GXw==} + peerDependencies: + astro-eslint-parser: ^0.16.0 + eslint: '>=8.0.0' + svelte: '>=3.0.0' + svelte-eslint-parser: ^0.33.0 + vue-eslint-parser: '>=9.0.0' + peerDependenciesMeta: + astro-eslint-parser: + optional: true + svelte: + optional: true + svelte-eslint-parser: + optional: true + vue-eslint-parser: + optional: true + dependencies: + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.3) + eslint: 8.57.0 + minimatch: 9.0.3 + natural-compare-lite: 1.4.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /eslint-plugin-regexp@2.3.0(eslint@8.57.0): + resolution: {integrity: sha512-T8JUs7ssRGbuXb+CGfdUJbcxTBMCNOpNqNBLuC8JUKAEIez72J37RaOi5/4dAUsGz92GbWVtqTLPSJZGyP/sQA==} + engines: {node: ^18 || >=20} + peerDependencies: + eslint: '>=8.44.0' + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/regexpp': 4.10.0 + comment-parser: 1.4.1 + eslint: 8.57.0 + jsdoc-type-pratt-parser: 4.0.0 + refa: 0.12.1 + regexp-ast-analysis: 0.7.1 + scslre: 0.3.0 + dev: true + + /eslint-plugin-vitest@0.3.26(@typescript-eslint/eslint-plugin@7.3.1)(eslint@8.57.0)(typescript@5.4.3)(vitest@1.4.0): + resolution: {integrity: sha512-oxe5JSPgRjco8caVLTh7Ti8PxpwJdhSV0hTQAmkFcNcmy/9DnqLB/oNVRA11RmVRP//2+jIIT6JuBEcpW3obYg==} + engines: {node: ^18.0.0 || >= 20.0.0} + peerDependencies: + '@typescript-eslint/eslint-plugin': '*' + eslint: '>=8.0.0' + vitest: '*' + peerDependenciesMeta: + '@typescript-eslint/eslint-plugin': + optional: true + vitest: + optional: true + dependencies: + '@typescript-eslint/eslint-plugin': 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + eslint: 8.57.0 + vitest: 1.4.0(@types/node@20.11.30) + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /eslint-plugin-yml@1.13.2(eslint@8.57.0): + resolution: {integrity: sha512-1i71VhmsG5UxE41rIJmJjhlTTxYy7upAY5Hqj8AdBc7rfJzRIZr3a2spuOS8+N7ZDCWsHAWY3J6lzQNQHDv6Uw==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + dependencies: + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.57.0 + eslint-compat-utils: 0.5.0(eslint@8.57.0) + lodash: 4.17.21 + natural-compare: 1.4.0 + yaml-eslint-parser: 1.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-scope@7.2.2: + resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + dev: true + + /eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /eslint@8.57.0: + resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/regexpp': 4.10.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.57.0 + '@humanwhocodes/config-array': 0.11.14 + '@humanwhocodes/module-importer': 1.0.1 + '@nodelib/fs.walk': 1.2.8 + '@ungap/structured-clone': 1.2.0 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4(supports-color@8.1.1) + doctrine: 3.0.0 + escape-string-regexp: 4.0.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + find-up: 5.0.0 + glob-parent: 6.0.2 + globals: 13.24.0 + graphemer: 1.4.0 + ignore: 5.3.1 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + is-path-inside: 3.0.3 + js-yaml: 4.1.0 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.3 + strip-ansi: 6.0.1 + text-table: 0.2.0 + transitivePeerDependencies: + - supports-color + dev: true + + /espree@9.6.1: + resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + acorn: 8.11.3 + acorn-jsx: 5.3.2(acorn@8.11.3) + eslint-visitor-keys: 3.4.3 + dev: true + + /esprima@4.0.1: + resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} + engines: {node: '>=4'} + hasBin: true + dev: true + + /esquery@1.5.0: + resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} + engines: {node: '>=0.10'} + dependencies: + estraverse: 5.3.0 + + /esrecurse@4.3.0: + resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} + engines: {node: '>=4.0'} + dependencies: + estraverse: 5.3.0 + dev: true + + /estraverse@5.3.0: + resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} + engines: {node: '>=4.0'} + + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.5 + dev: true + + /esutils@2.0.3: + resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} + engines: {node: '>=0.10.0'} + dev: true + + /eventemitter3@5.0.1: + resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} + dev: true + + /execa@5.1.1: + resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} + engines: {node: '>=10'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 2.1.0 + is-stream: 2.0.1 + merge-stream: 2.0.0 + npm-run-path: 4.0.1 + onetime: 5.1.2 + signal-exit: 3.0.7 + strip-final-newline: 2.0.0 + dev: true + + /execa@8.0.1: + resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} + engines: {node: '>=16.17'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 8.0.1 + human-signals: 5.0.0 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.3.0 + onetime: 6.0.0 + signal-exit: 4.1.0 + strip-final-newline: 3.0.0 + dev: true + + /fast-deep-equal@3.1.3: + resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + dev: true + + /fast-equals@5.0.1: + resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==} + engines: {node: '>=6.0.0'} + dev: true + + /fast-glob@3.3.2: + resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} + engines: {node: '>=8.6.0'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.5 + dev: true + + /fast-json-stable-stringify@2.1.0: + resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + dev: true + + /fast-levenshtein@2.0.6: + resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + dev: true + + /fast-safe-stringify@2.1.1: + resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} + dev: true + + /fastq@1.17.1: + resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + dependencies: + reusify: 1.0.4 + dev: true + + /fetch-blob@2.1.2: + resolution: {integrity: sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==} + engines: {node: ^10.17.0 || >=12.3.0} + peerDependencies: + domexception: '*' + peerDependenciesMeta: + domexception: + optional: true + dev: true + + /file-entry-cache@6.0.1: + resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + flat-cache: 3.2.0 + dev: true + + /file-entry-cache@8.0.0: + resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} + engines: {node: '>=16.0.0'} + dependencies: + flat-cache: 4.0.1 + dev: true + + /fill-range@7.0.1: + resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + engines: {node: '>=8'} + dependencies: + to-regex-range: 5.0.1 + dev: true + + /filter-iterator@0.0.1: + resolution: {integrity: sha512-v4lhL7Qa8XpbW3LN46CEnmhGk3eHZwxfNl5at20aEkreesht4YKb/Ba3BUIbnPhAC/r3dmu7ABaGk6MAvh2alA==} + dev: true + + /filter-obj@1.1.0: + resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==} + engines: {node: '>=0.10.0'} + dev: true + + /find-up-simple@1.0.0: + resolution: {integrity: sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==} + engines: {node: '>=18'} + dev: true + + /find-up@5.0.0: + resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} + engines: {node: '>=10'} + dependencies: + locate-path: 6.0.0 + path-exists: 4.0.0 + dev: true + + /flat-cache@3.2.0: + resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + flatted: 3.3.1 + keyv: 4.5.4 + rimraf: 3.0.2 + dev: true + + /flat-cache@4.0.1: + resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} + engines: {node: '>=16'} + dependencies: + flatted: 3.3.1 + keyv: 4.5.4 + dev: true + + /flat@5.0.2: + resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} + hasBin: true + dev: true + + /flatted@3.3.1: + resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} + dev: true + + /foreground-child@3.1.1: + resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + + /fs-extra@10.1.0: + resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} + engines: {node: '>=12'} + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.1 + dev: true + + /fs.realpath@1.0.0: + resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} + dev: true + + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + dev: true + + /gensequence@7.0.0: + resolution: {integrity: sha512-47Frx13aZh01afHJTB3zTtKIlFI6vWY+MYCN9Qpew6i52rfKjnhCF/l1YlC8UmEMvvntZZ6z4PiCcmyuedR2aQ==} + engines: {node: '>=18'} + dev: true + + /get-caller-file@2.0.5: + resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} + engines: {node: 6.* || 8.* || >= 10.*} + dev: true + + /get-east-asian-width@1.2.0: + resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==} + engines: {node: '>=18'} + dev: true + + /get-func-name@2.0.2: + resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} + dev: true + + /get-stdin@9.0.0: + resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==} + engines: {node: '>=12'} + dev: true + + /get-stream@6.0.1: + resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} + engines: {node: '>=10'} + dev: true + + /get-stream@8.0.1: + resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} + engines: {node: '>=16'} + dev: true + + /get-tsconfig@4.7.3: + resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + + /git-hooks-list@1.0.3: + resolution: {integrity: sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==} + dev: true + + /git-hooks-list@3.1.0: + resolution: {integrity: sha512-LF8VeHeR7v+wAbXqfgRlTSX/1BJR9Q1vEMR8JAz1cEg6GX07+zyj3sAdDvYjj/xnlIfVuGgj4qBei1K3hKH+PA==} + dev: true + + /glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + dependencies: + is-glob: 4.0.3 + dev: true + + /glob-parent@6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} + engines: {node: '>=10.13.0'} + dependencies: + is-glob: 4.0.3 + dev: true + + /glob@10.3.10: + resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + dependencies: + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.3 + minipass: 7.0.4 + path-scurry: 1.10.1 + + /glob@7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.1.2 + once: 1.4.0 + path-is-absolute: 1.0.1 + dev: true + + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.0.1 + once: 1.4.0 + dev: true + + /global-directory@4.0.1: + resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==} + engines: {node: '>=18'} + dependencies: + ini: 4.1.1 + dev: true + + /globals@11.12.0: + resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} + engines: {node: '>=4'} + dev: true + + /globals@13.24.0: + resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} + engines: {node: '>=8'} + dependencies: + type-fest: 0.20.2 + dev: true + + /globby@10.0.0: + resolution: {integrity: sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw==} + engines: {node: '>=8'} + dependencies: + '@types/glob': 7.2.0 + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.2 + glob: 7.2.3 + ignore: 5.3.1 + merge2: 1.4.1 + slash: 3.0.0 + dev: true + + /globby@11.1.0: + resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} + engines: {node: '>=10'} + dependencies: + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.2 + ignore: 5.3.1 + merge2: 1.4.1 + slash: 3.0.0 + dev: true + + /globby@13.2.2: + resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + dir-glob: 3.0.1 + fast-glob: 3.3.2 + ignore: 5.3.1 + merge2: 1.4.1 + slash: 4.0.0 + dev: true + + /graceful-fs@4.2.11: + resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + dev: true + + /graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + dev: true + + /has-flag@3.0.0: + resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} + engines: {node: '>=4'} + dev: true + + /has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + dev: true + + /has-own-prop@2.0.0: + resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==} + engines: {node: '>=8'} + dev: true + + /has-own-property@0.1.0: + resolution: {integrity: sha512-14qdBKoonU99XDhWcFKZTShK+QV47qU97u8zzoVo9cL5TZ3BmBHXogItSt9qJjR0KUMFRhcCW8uGIGl8nkl7Aw==} + dev: true + + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + dev: true + + /he@1.2.0: + resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} + hasBin: true + dev: true + + /hosted-git-info@4.1.0: + resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==} + engines: {node: '>=10'} + dependencies: + lru-cache: 6.0.0 + dev: true + + /hosted-git-info@7.0.1: + resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + lru-cache: 10.2.0 + dev: true + + /html-escaper@2.0.2: + resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} + dev: true + + /human-signals@2.1.0: + resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} + engines: {node: '>=10.17.0'} + dev: true + + /human-signals@5.0.0: + resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} + engines: {node: '>=16.17.0'} + dev: true + + /husky@9.0.11: + resolution: {integrity: sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==} + engines: {node: '>=18'} + hasBin: true + dev: true + + /identity-function@1.0.0: + resolution: {integrity: sha512-kNrgUK0qI+9qLTBidsH85HjDLpZfrrS0ElquKKe/fJFdB3D7VeKdXXEvOPDUHSHOzdZKCAAaQIWWyp0l2yq6pw==} + dev: true + + /ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} + engines: {node: '>= 4'} + dev: true + + /import-fresh@3.3.0: + resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} + engines: {node: '>=6'} + dependencies: + parent-module: 1.0.1 + resolve-from: 4.0.0 + dev: true + + /import-meta-resolve@4.0.0: + resolution: {integrity: sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==} + dev: true + + /imurmurhash@0.1.4: + resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} + engines: {node: '>=0.8.19'} + dev: true + + /indent-string@4.0.0: + resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} + engines: {node: '>=8'} + dev: true + + /individual@3.0.0: + resolution: {integrity: sha512-rUY5vtT748NMRbEMrTNiFfy29BgGZwGXUi2NFUVMWQrogSLzlJvQV9eeMWi+g1aVaQ53tpyLAQtd5x/JH0Nh1g==} + dev: true + + /inflight@1.0.6: + resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + dev: true + + /inherits@2.0.4: + resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + dev: true + + /ini@4.1.1: + resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /ini@4.1.2: + resolution: {integrity: sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /is-alphabetical@1.0.4: + resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==} + dev: true + + /is-alphanumerical@1.0.4: + resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==} + dependencies: + is-alphabetical: 1.0.4 + is-decimal: 1.0.4 + dev: true + + /is-arrayish@0.2.1: + resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + dev: true + + /is-binary-path@2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + dependencies: + binary-extensions: 2.3.0 + dev: true + + /is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + dependencies: + builtin-modules: 3.3.0 + dev: true + + /is-core-module@2.13.1: + resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} + dependencies: + hasown: 2.0.2 + dev: true + + /is-decimal@1.0.4: + resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==} + dev: true + + /is-extglob@2.1.1: + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} + engines: {node: '>=0.10.0'} + dev: true + + /is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + + /is-fullwidth-code-point@4.0.0: + resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} + engines: {node: '>=12'} + dev: true + + /is-fullwidth-code-point@5.0.0: + resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==} + engines: {node: '>=18'} + dependencies: + get-east-asian-width: 1.2.0 + dev: true + + /is-glob@4.0.3: + resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} + engines: {node: '>=0.10.0'} + dependencies: + is-extglob: 2.1.1 + dev: true + + /is-hexadecimal@1.0.4: + resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==} + dev: true + + /is-iterable@1.1.1: + resolution: {integrity: sha512-EdOZCr0NsGE00Pot+x1ZFx9MJK3C6wy91geZpXwvwexDLJvA4nzYyZf7r+EIwSeVsOLDdBz7ATg9NqKTzuNYuQ==} + engines: {node: '>= 4'} + dev: true + + /is-number@4.0.0: + resolution: {integrity: sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==} + engines: {node: '>=0.10.0'} + dev: true + + /is-number@7.0.0: + resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} + engines: {node: '>=0.12.0'} + dev: true + + /is-obj@2.0.0: + resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} + engines: {node: '>=8'} + dev: true + + /is-path-inside@3.0.3: + resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} + engines: {node: '>=8'} + dev: true + + /is-plain-obj@2.1.0: + resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==} + engines: {node: '>=8'} + dev: true + + /is-plain-obj@4.1.0: + resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} + engines: {node: '>=12'} + dev: true + + /is-stream@2.0.1: + resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} + engines: {node: '>=8'} + dev: true + + /is-stream@3.0.0: + resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + + /is-typedarray@1.0.0: + resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} + dev: true + + /is-unicode-supported@0.1.0: + resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} + engines: {node: '>=10'} + dev: true + + /isexe@2.0.0: + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + + /isexe@3.1.1: + resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} + engines: {node: '>=16'} + dev: true + + /istanbul-lib-coverage@3.2.2: + resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} + engines: {node: '>=8'} + dev: true + + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} + dependencies: + istanbul-lib-coverage: 3.2.2 + make-dir: 4.0.0 + supports-color: 7.2.0 + dev: true + + /istanbul-lib-source-maps@5.0.4: + resolution: {integrity: sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==} + engines: {node: '>=10'} + dependencies: + '@jridgewell/trace-mapping': 0.3.25 + debug: 4.3.4(supports-color@8.1.1) + istanbul-lib-coverage: 3.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /istanbul-reports@3.1.7: + resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==} + engines: {node: '>=8'} + dependencies: + html-escaper: 2.0.2 + istanbul-lib-report: 3.0.1 + dev: true + + /iterable-lookahead@1.0.0: + resolution: {integrity: sha512-hJnEP2Xk4+44DDwJqUQGdXal5VbyeWLaPyDl2AQc242Zr7iqz4DgpQOrEzglWVMGHMDCkguLHEKxd1+rOsmgSQ==} + engines: {node: '>=4'} + dev: true + + /jackspeak@2.3.6: + resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} + engines: {node: '>=14'} + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + + /jiti@1.21.0: + resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} + hasBin: true + dev: true + + /joycon@3.1.1: + resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} + engines: {node: '>=10'} + dev: true + + /js-tokens@4.0.0: + resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + dev: true + + /js-tokens@8.0.3: + resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} + dev: true + + /js-yaml@4.1.0: + resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} + hasBin: true + dependencies: + argparse: 2.0.1 + dev: true + + /jsdoc-type-pratt-parser@4.0.0: + resolution: {integrity: sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==} + engines: {node: '>=12.0.0'} + dev: true + + /jsesc@2.5.2: + resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} + engines: {node: '>=4'} + hasBin: true + dev: true + + /json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + dev: true + + /json-parse-even-better-errors@2.3.1: + resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + dev: true + + /json-parse-even-better-errors@3.0.1: + resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /json-schema-traverse@0.4.1: + resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + dev: true + + /json-stable-stringify-without-jsonify@1.0.1: + resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} + dev: true + + /json-stringify-safe@5.0.1: + resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} + dev: true + + /jsonc-eslint-parser@2.4.0: + resolution: {integrity: sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + acorn: 8.11.3 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + semver: 7.6.0 + dev: true + + /jsonc-parser@3.2.1: + resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} + dev: true + + /jsonfile@6.1.0: + resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} + dependencies: + universalify: 2.0.1 + optionalDependencies: + graceful-fs: 4.2.11 + dev: true + + /keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + dependencies: + json-buffer: 3.0.1 + dev: true + + /knip@5.2.2(@types/node@20.11.30)(typescript@5.4.3): + resolution: {integrity: sha512-4HMMUFk34KOE37NzmDnxWhBH6WMfStqN5jTPGXS7lq+Z6WvQxjWMo/ewuhPje4+BBN6LYWw+aiQOsbo9FHYhpw==} + engines: {node: '>=18.6.0'} + hasBin: true + peerDependencies: + '@types/node': '>=18' + typescript: '>=5.0.4' + dependencies: + '@ericcornelissen/bash-parser': 0.5.2 + '@nodelib/fs.walk': 2.0.0 + '@npmcli/map-workspaces': 3.0.4 + '@npmcli/package-json': 5.0.0 + '@pnpm/logger': 5.0.0 + '@pnpm/workspace.pkgs-graph': 2.0.15(@pnpm/logger@5.0.0) + '@snyk/github-codeowners': 1.1.0 + '@types/node': 20.11.30 + '@types/picomatch': 2.3.3 + easy-table: 1.2.0 + fast-glob: 3.3.2 + jiti: 1.21.0 + js-yaml: 4.1.0 + micromatch: 4.0.5 + minimist: 1.2.8 + picocolors: 1.0.0 + picomatch: 4.0.1 + pretty-ms: 9.0.0 + smol-toml: 1.1.4 + strip-json-comments: 5.0.1 + summary: 2.1.0 + typescript: 5.4.3 + zod: 3.22.4 + zod-validation-error: 3.0.3(zod@3.22.4) + transitivePeerDependencies: + - bluebird + - domexception + dev: true + + /levn@0.4.1: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + type-check: 0.4.0 + dev: true + + /lilconfig@3.0.0: + resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==} + engines: {node: '>=14'} + dev: true + + /lilconfig@3.1.1: + resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==} + engines: {node: '>=14'} + dev: true + + /lines-and-columns@1.2.4: + resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + dev: true + + /linkify-it@2.2.0: + resolution: {integrity: sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==} + dependencies: + uc.micro: 1.0.6 + dev: true + + /linkify-it@5.0.0: + resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + dependencies: + uc.micro: 2.1.0 + dev: true + + /lint-staged@15.2.2: + resolution: {integrity: sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==} + engines: {node: '>=18.12.0'} + hasBin: true + dependencies: + chalk: 5.3.0 + commander: 11.1.0 + debug: 4.3.4(supports-color@8.1.1) + execa: 8.0.1 + lilconfig: 3.0.0 + listr2: 8.0.1 + micromatch: 4.0.5 + pidtree: 0.6.0 + string-argv: 0.3.2 + yaml: 2.3.4 + transitivePeerDependencies: + - supports-color + dev: true + + /listr2@8.0.1: + resolution: {integrity: sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==} + engines: {node: '>=18.0.0'} + dependencies: + cli-truncate: 4.0.0 + colorette: 2.0.20 + eventemitter3: 5.0.1 + log-update: 6.0.0 + rfdc: 1.3.1 + wrap-ansi: 9.0.0 + dev: true + + /load-json-file@6.2.0: + resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==} + engines: {node: '>=8'} + dependencies: + graceful-fs: 4.2.11 + parse-json: 5.2.0 + strip-bom: 4.0.0 + type-fest: 0.6.0 + dev: true + + /load-tsconfig@0.2.5: + resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + + /local-pkg@0.5.0: + resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} + engines: {node: '>=14'} + dependencies: + mlly: 1.6.1 + pkg-types: 1.0.3 + dev: true + + /locate-path@6.0.0: + resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} + engines: {node: '>=10'} + dependencies: + p-locate: 5.0.0 + dev: true + + /lodash.curry@4.1.1: + resolution: {integrity: sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==} + dev: true + + /lodash.merge@4.6.2: + resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + dev: true + + /lodash.sortby@4.7.0: + resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} + dev: true + + /lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: true + + /log-symbols@4.1.0: + resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} + engines: {node: '>=10'} + dependencies: + chalk: 4.1.2 + is-unicode-supported: 0.1.0 + dev: true + + /log-update@6.0.0: + resolution: {integrity: sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==} + engines: {node: '>=18'} + dependencies: + ansi-escapes: 6.2.0 + cli-cursor: 4.0.0 + slice-ansi: 7.1.0 + strip-ansi: 7.1.0 + wrap-ansi: 9.0.0 + dev: true + + /loupe@2.3.7: + resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} + dependencies: + get-func-name: 2.0.2 + dev: true + + /lru-cache@10.2.0: + resolution: {integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==} + engines: {node: 14 || >=16.14} + + /lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + dependencies: + yallist: 4.0.0 + dev: true + + /magic-string@0.16.0: + resolution: {integrity: sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==} + dependencies: + vlq: 0.2.3 + dev: true + + /magic-string@0.30.8: + resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + + /magicast@0.3.3: + resolution: {integrity: sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==} + dependencies: + '@babel/parser': 7.24.1 + '@babel/types': 7.24.0 + source-map-js: 1.2.0 + dev: true + + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} + dependencies: + semver: 7.6.0 + dev: true + + /map-age-cleaner@0.1.3: + resolution: {integrity: sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==} + engines: {node: '>=6'} + dependencies: + p-defer: 1.0.0 + dev: true + + /map-obj@2.0.0: + resolution: {integrity: sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==} + engines: {node: '>=4'} + dev: true + + /markdown-it@14.0.0: + resolution: {integrity: sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==} + hasBin: true + dependencies: + argparse: 2.0.1 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.1.0 + dev: true + + /markdown-it@14.1.0: + resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} + hasBin: true + dependencies: + argparse: 2.0.1 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.1.0 + dev: true + + /markdown-it@8.4.2: + resolution: {integrity: sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==} + hasBin: true + dependencies: + argparse: 1.0.10 + entities: 1.1.2 + linkify-it: 2.2.0 + mdurl: 1.0.1 + uc.micro: 1.0.6 + dev: true + + /markdownlint-cli@0.39.0: + resolution: {integrity: sha512-ZuFN7Xpsbn1Nbp0YYkeLOfXOMOfLQBik2lKRy8pVI/llmKQ2uW7x+8k5OMgF6o7XCsTDSYC/OOmeJ+3qplvnJQ==} + engines: {node: '>=18'} + hasBin: true + dependencies: + commander: 11.1.0 + get-stdin: 9.0.0 + glob: 10.3.10 + ignore: 5.3.1 + js-yaml: 4.1.0 + jsonc-parser: 3.2.1 + markdownlint: 0.33.0 + minimatch: 9.0.3 + run-con: 1.3.2 + dev: true + + /markdownlint-micromark@0.1.8: + resolution: {integrity: sha512-1ouYkMRo9/6gou9gObuMDnvZM8jC/ly3QCFQyoSPCS2XV1ZClU0xpKbL1Ar3bWWRT1RnBZkWUEiNKrI2CwiBQA==} + engines: {node: '>=16'} + dev: true + + /markdownlint-micromark@0.1.9: + resolution: {integrity: sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==} + engines: {node: '>=18'} + dev: true + + /markdownlint@0.11.0: + resolution: {integrity: sha512-wE5WdKD6zW2DQaPQ5TFBTXh5j76DnWd/IFffnDQgHmi6Y61DJXBDfLftZ/suJHuv6cwPjM6gKw2GaRLJMOR+Mg==} + engines: {node: '>=6'} + dependencies: + markdown-it: 8.4.2 + dev: true + + /markdownlint@0.33.0: + resolution: {integrity: sha512-4lbtT14A3m0LPX1WS/3d1m7Blg+ZwiLq36WvjQqFGsX3Gik99NV+VXp/PW3n+Q62xyPdbvGOCfjPqjW+/SKMig==} + engines: {node: '>=18'} + dependencies: + markdown-it: 14.0.0 + markdownlint-micromark: 0.1.8 + dev: true + + /markdownlint@0.34.0: + resolution: {integrity: sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==} + engines: {node: '>=18'} + dependencies: + markdown-it: 14.1.0 + markdownlint-micromark: 0.1.9 + dev: true + + /mdast-util-from-markdown@0.8.5: + resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==} + dependencies: + '@types/mdast': 3.0.15 + mdast-util-to-string: 2.0.0 + micromark: 2.11.4 + parse-entities: 2.0.0 + unist-util-stringify-position: 2.0.3 + transitivePeerDependencies: + - supports-color + dev: true + + /mdast-util-to-string@2.0.0: + resolution: {integrity: sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==} + dev: true + + /mdurl@1.0.1: + resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} + dev: true + + /mdurl@2.0.0: + resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} + dev: true + + /mem@6.1.1: + resolution: {integrity: sha512-Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==} + engines: {node: '>=8'} + dependencies: + map-age-cleaner: 0.1.3 + mimic-fn: 3.1.0 + dev: true + + /mem@8.1.1: + resolution: {integrity: sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==} + engines: {node: '>=10'} + dependencies: + map-age-cleaner: 0.1.3 + mimic-fn: 3.1.0 + dev: true + + /merge-stream@2.0.0: + resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} + dev: true + + /merge2@1.4.1: + resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} + engines: {node: '>= 8'} + dev: true + + /micromark@2.11.4: + resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + parse-entities: 2.0.0 + transitivePeerDependencies: + - supports-color + dev: true + + /micromatch@4.0.5: + resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + engines: {node: '>=8.6'} + dependencies: + braces: 3.0.2 + picomatch: 2.3.1 + dev: true + + /mimic-fn@2.1.0: + resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} + engines: {node: '>=6'} + dev: true + + /mimic-fn@3.1.0: + resolution: {integrity: sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==} + engines: {node: '>=8'} + dev: true + + /mimic-fn@4.0.0: + resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} + engines: {node: '>=12'} + dev: true + + /minimatch@3.1.2: + resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} + dependencies: + brace-expansion: 1.1.11 + dev: true + + /minimatch@5.0.1: + resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + dev: true + + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + + /minimist@0.0.10: + resolution: {integrity: sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==} + dev: true + + /minimist@1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + dev: true + + /minipass@7.0.4: + resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + engines: {node: '>=16 || 14 >=14.17'} + + /mlly@1.6.1: + resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} + dependencies: + acorn: 8.11.3 + pathe: 1.1.2 + pkg-types: 1.0.3 + ufo: 1.5.3 + dev: true + + /mocha@10.3.0: + resolution: {integrity: sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==} + engines: {node: '>= 14.0.0'} + hasBin: true + dependencies: + ansi-colors: 4.1.1 + browser-stdout: 1.3.1 + chokidar: 3.5.3 + debug: 4.3.4(supports-color@8.1.1) + diff: 5.0.0 + escape-string-regexp: 4.0.0 + find-up: 5.0.0 + glob: 8.1.0 + he: 1.2.0 + js-yaml: 4.1.0 + log-symbols: 4.1.0 + minimatch: 5.0.1 + ms: 2.1.3 + serialize-javascript: 6.0.0 + strip-json-comments: 3.1.1 + supports-color: 8.1.1 + workerpool: 6.2.1 + yargs: 16.2.0 + yargs-parser: 20.2.4 + yargs-unparser: 2.0.0 + dev: true + + /ms@2.1.2: + resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + dev: true + + /ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + dev: true + + /mz@2.7.0: + resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + dev: true + + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + dev: true + + /natural-compare-lite@1.4.0: + resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} + dev: true + + /natural-compare@1.4.0: + resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + dev: true + + /ndjson@2.0.0: + resolution: {integrity: sha512-nGl7LRGrzugTtaFcJMhLbpzJM6XdivmbkdlaGcrk/LXg2KL/YBC6z1g70xh0/al+oFuVFP8N8kiWRucmeEH/qQ==} + engines: {node: '>=10'} + hasBin: true + dependencies: + json-stringify-safe: 5.0.1 + minimist: 1.2.8 + readable-stream: 3.6.2 + split2: 3.2.2 + through2: 4.0.2 + dev: true + + /node-fetch@3.0.0-beta.9: + resolution: {integrity: sha512-RdbZCEynH2tH46+tj0ua9caUHVWrd/RHnRfvly2EVdqGmI3ndS1Vn/xjm5KuGejDt2RNDQsVRLPNd2QPwcewVg==} + engines: {node: ^10.17 || >=12.3} + dependencies: + data-uri-to-buffer: 3.0.1 + fetch-blob: 2.1.2 + transitivePeerDependencies: + - domexception + dev: true + + /normalize-package-data@6.0.0: + resolution: {integrity: sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + hosted-git-info: 7.0.1 + is-core-module: 2.13.1 + semver: 7.6.0 + validate-npm-package-license: 3.0.4 + dev: true + + /normalize-path@3.0.0: + resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} + engines: {node: '>=0.10.0'} + dev: true + + /npm-install-checks@6.3.0: + resolution: {integrity: sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + semver: 7.6.0 + dev: true + + /npm-normalize-package-bin@3.0.1: + resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /npm-package-arg@11.0.1: + resolution: {integrity: sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + hosted-git-info: 7.0.1 + proc-log: 3.0.0 + semver: 7.6.0 + validate-npm-package-name: 5.0.0 + dev: true + + /npm-pick-manifest@9.0.0: + resolution: {integrity: sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + npm-install-checks: 6.3.0 + npm-normalize-package-bin: 3.0.1 + npm-package-arg: 11.0.1 + semver: 7.6.0 + dev: true + + /npm-run-path@4.0.1: + resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} + engines: {node: '>=8'} + dependencies: + path-key: 3.1.1 + dev: true + + /npm-run-path@5.3.0: + resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + path-key: 4.0.0 + dev: true + + /object-assign@4.1.1: + resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} + engines: {node: '>=0.10.0'} + dev: true + + /object-pairs@0.1.0: + resolution: {integrity: sha512-3ECr6K831I4xX/Mduxr9UC+HPOz/d6WKKYj9p4cmC8Lg8p7g8gitzsxNX5IWlSIgFWN/a4JgrJaoAMKn20oKwA==} + dev: true + + /object-values@1.0.0: + resolution: {integrity: sha512-+8hwcz/JnQ9EpLIXzN0Rs7DLsBpJNT/xYehtB/jU93tHYr5BFEO8E+JGQNOSqE7opVzz5cGksKFHt7uUJVLSjQ==} + engines: {node: '>=0.10.0'} + dev: true + + /once@1.4.0: + resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} + dependencies: + wrappy: 1.0.2 + dev: true + + /onetime@5.1.2: + resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} + engines: {node: '>=6'} + dependencies: + mimic-fn: 2.1.0 + dev: true + + /onetime@6.0.0: + resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} + engines: {node: '>=12'} + dependencies: + mimic-fn: 4.0.0 + dev: true + + /optimist@0.6.1: + resolution: {integrity: sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==} + dependencies: + minimist: 0.0.10 + wordwrap: 0.0.3 + dev: true + + /optionator@0.9.3: + resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} + engines: {node: '>= 0.8.0'} + dependencies: + '@aashutoshrathi/word-wrap': 1.2.6 + deep-is: 0.1.4 + fast-levenshtein: 2.0.6 + levn: 0.4.1 + prelude-ls: 1.2.1 + type-check: 0.4.0 + dev: true + + /p-defer@1.0.0: + resolution: {integrity: sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==} + engines: {node: '>=4'} + dev: true + + /p-limit@3.1.0: + resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} + engines: {node: '>=10'} + dependencies: + yocto-queue: 0.1.0 + dev: true + + /p-limit@5.0.0: + resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} + engines: {node: '>=18'} + dependencies: + yocto-queue: 1.0.0 + dev: true + + /p-locate@5.0.0: + resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} + engines: {node: '>=10'} + dependencies: + p-limit: 3.1.0 + dev: true + + /p-map@4.0.0: + resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} + engines: {node: '>=10'} + dependencies: + aggregate-error: 3.1.0 + dev: true + + /p-memoize@4.0.1: + resolution: {integrity: sha512-km0sP12uE0dOZ5qP+s7kGVf07QngxyG0gS8sYFvFWhqlgzOsSy+m71aUejf/0akxj5W7gE//2G74qTv6b4iMog==} + engines: {node: '>=10'} + dependencies: + mem: 6.1.1 + mimic-fn: 3.1.0 + dev: true + + /package-json-validator@0.6.3: + resolution: {integrity: sha512-juKiFboV4UKUvWQ+OSxstnyukhuluyuEoFmgZw1Rx21XzmwlgDWLcbl3qzjA3789IRORYhVFs7cmAO0YFGwHCg==} + hasBin: true + dependencies: + optimist: 0.6.1 + dev: true + + /parent-module@1.0.1: + resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} + engines: {node: '>=6'} + dependencies: + callsites: 3.1.0 + dev: true + + /parent-module@2.0.0: + resolution: {integrity: sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==} + engines: {node: '>=8'} + dependencies: + callsites: 3.1.0 + dev: true + + /parse-entities@2.0.0: + resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==} + dependencies: + character-entities: 1.2.4 + character-entities-legacy: 1.1.4 + character-reference-invalid: 1.1.4 + is-alphanumerical: 1.0.4 + is-decimal: 1.0.4 + is-hexadecimal: 1.0.4 + dev: true + + /parse-json@5.2.0: + resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} + engines: {node: '>=8'} + dependencies: + '@babel/code-frame': 7.24.2 + error-ex: 1.3.2 + json-parse-even-better-errors: 2.3.1 + lines-and-columns: 1.2.4 + dev: true + + /parse-ms@4.0.0: + resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} + engines: {node: '>=18'} + dev: true + + /parse-npm-tarball-url@3.0.0: + resolution: {integrity: sha512-InpdgIdNe5xWMEUcrVQUniQKwnggBtJ7+SCwh7zQAZwbbIYZV9XdgJyhtmDSSvykFyQXoe4BINnzKTfCwWLs5g==} + engines: {node: '>=8.15'} + dependencies: + semver: 6.3.1 + dev: true + + /path-exists@4.0.0: + resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} + engines: {node: '>=8'} + dev: true + + /path-is-absolute@1.0.1: + resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} + engines: {node: '>=0.10.0'} + dev: true + + /path-key@3.1.1: + resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} + engines: {node: '>=8'} + + /path-key@4.0.0: + resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} + engines: {node: '>=12'} + dev: true + + /path-parse@1.0.7: + resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + dev: true + + /path-scurry@1.10.1: + resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 10.2.0 + minipass: 7.0.4 + + /path-temp@2.1.0: + resolution: {integrity: sha512-cMMJTAZlion/RWRRC48UbrDymEIt+/YSD/l8NqjneyDw2rDOBQcP5yRkMB4CYGn47KMhZvbblBP7Z79OsMw72w==} + engines: {node: '>=8.15'} + dependencies: + unique-string: 2.0.0 + dev: true + + /path-type@4.0.0: + resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} + engines: {node: '>=8'} + dev: true + + /pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + dev: true + + /pathval@1.1.1: + resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} + dev: true + + /picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + dev: true + + /picomatch@2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + engines: {node: '>=8.6'} + dev: true + + /picomatch@4.0.1: + resolution: {integrity: sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==} + engines: {node: '>=12'} + dev: true + + /pidtree@0.6.0: + resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} + engines: {node: '>=0.10'} + hasBin: true + dev: true + + /pirates@4.0.6: + resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} + engines: {node: '>= 6'} + dev: true + + /pkg-types@1.0.3: + resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} + dependencies: + jsonc-parser: 3.2.1 + mlly: 1.6.1 + pathe: 1.1.2 + dev: true + + /postcss-load-config@4.0.2: + resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==} + engines: {node: '>= 14'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 3.1.1 + yaml: 2.4.1 + dev: true + + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + dev: true + + /prelude-ls@1.2.1: + resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} + engines: {node: '>= 0.8.0'} + dev: true + + /prettier-plugin-curly@0.2.1(prettier@3.2.5): + resolution: {integrity: sha512-BadJTlVy/nX+4sgCc5htrgej4yLVRWIMa1PwN96BqlRru4tGkj1fo2OqZE446fJWlddx9xxTMJByDKIZYc7F3Q==} + engines: {node: '>=18'} + peerDependencies: + prettier: ^2 || ^3 + dependencies: + '@babel/generator': 7.24.1 + '@babel/parser': 7.24.1 + '@babel/traverse': 7.24.1 + prettier: 3.2.5 + transitivePeerDependencies: + - supports-color + dev: true + + /prettier-plugin-packagejson@2.4.12(prettier@3.2.5): + resolution: {integrity: sha512-hifuuOgw5rHHTdouw9VrhT8+Nd7UwxtL1qco8dUfd4XUFQL6ia3xyjSxhPQTsGnSYFraTWy5Omb+MZm/OWDTpQ==} + peerDependencies: + prettier: '>= 1.16.0' + peerDependenciesMeta: + prettier: + optional: true + dependencies: + prettier: 3.2.5 + sort-package-json: 2.8.0 + synckit: 0.9.0 + dev: true + + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + engines: {node: '>=14'} + hasBin: true + dev: true + + /pretty-format@29.7.0: + resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@jest/schemas': 29.6.3 + ansi-styles: 5.2.0 + react-is: 18.2.0 + dev: true + + /pretty-ms@9.0.0: + resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==} + engines: {node: '>=18'} + dependencies: + parse-ms: 4.0.0 + dev: true + + /proc-log@3.0.0: + resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dev: true + + /promise-inflight@1.0.1: + resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} + peerDependencies: + bluebird: '*' + peerDependenciesMeta: + bluebird: + optional: true + dev: true + + /promise-retry@2.0.1: + resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} + engines: {node: '>=10'} + dependencies: + err-code: 2.0.3 + retry: 0.12.0 + dev: true + + /punycode.js@2.3.1: + resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} + engines: {node: '>=6'} + dev: true + + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} + engines: {node: '>=6'} + dev: true + + /queue-microtask@1.2.3: + resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + dev: true + + /randombytes@2.1.0: + resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} + dependencies: + safe-buffer: 5.2.1 + dev: true + + /react-is@18.2.0: + resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + dev: true + + /read-package-json-fast@3.0.2: + resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + json-parse-even-better-errors: 3.0.1 + npm-normalize-package-bin: 3.0.1 + dev: true + + /readable-stream@3.6.2: + resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} + engines: {node: '>= 6'} + dependencies: + inherits: 2.0.4 + string_decoder: 1.3.0 + util-deprecate: 1.0.2 + dev: true + + /readdirp@3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + dependencies: + picomatch: 2.3.1 + dev: true + + /refa@0.12.1: + resolution: {integrity: sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dependencies: + '@eslint-community/regexpp': 4.10.0 + dev: true + + /regexp-ast-analysis@0.7.1: + resolution: {integrity: sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dependencies: + '@eslint-community/regexpp': 4.10.0 + refa: 0.12.1 + dev: true + + /rename-overwrite@5.0.0: + resolution: {integrity: sha512-vSxE5Ww7Jnyotvaxi3Dj0vOMoojH8KMkBfs9xYeW/qNfJiLTcC1fmwTjrbGUq3mQSOCxkG0DbdcvwTUrpvBN4w==} + engines: {node: '>=12.10'} + dependencies: + '@zkochan/rimraf': 2.1.3 + fs-extra: 10.1.0 + dev: true + + /repeat-string@1.6.1: + resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==} + engines: {node: '>=0.10'} + dev: true + + /require-directory@2.1.1: + resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + engines: {node: '>=0.10.0'} + dev: true + + /resolve-from@4.0.0: + resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} + engines: {node: '>=4'} + dev: true + + /resolve-from@5.0.0: + resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} + engines: {node: '>=8'} + dev: true + + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + + /resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + hasBin: true + dependencies: + is-core-module: 2.13.1 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + dev: true + + /restore-cursor@4.0.0: + resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + onetime: 5.1.2 + signal-exit: 3.0.7 + dev: true + + /retry@0.12.0: + resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} + engines: {node: '>= 4'} + dev: true + + /reusify@1.0.4: + resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} + engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + dev: true + + /reverse-arguments@1.0.0: + resolution: {integrity: sha512-/x8uIPdTafBqakK0TmPNJzgkLP+3H+yxpUJhCQHsLBg1rYEVNR2D8BRYNWQhVBjyOd7oo1dZRVzIkwMY2oqfYQ==} + dev: true + + /rfdc@1.3.1: + resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==} + dev: true + + /rimraf@3.0.2: + resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + hasBin: true + dependencies: + glob: 7.2.3 + dev: true + + /rollup@4.13.0: + resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.13.0 + '@rollup/rollup-android-arm64': 4.13.0 + '@rollup/rollup-darwin-arm64': 4.13.0 + '@rollup/rollup-darwin-x64': 4.13.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 + '@rollup/rollup-linux-arm64-gnu': 4.13.0 + '@rollup/rollup-linux-arm64-musl': 4.13.0 + '@rollup/rollup-linux-riscv64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-musl': 4.13.0 + '@rollup/rollup-win32-arm64-msvc': 4.13.0 + '@rollup/rollup-win32-ia32-msvc': 4.13.0 + '@rollup/rollup-win32-x64-msvc': 4.13.0 + fsevents: 2.3.3 + dev: true + + /run-con@1.3.2: + resolution: {integrity: sha512-CcfE+mYiTcKEzg0IqS08+efdnH0oJ3zV0wSUFBNrMHMuxCtXvBCLzCJHatwuXDcu/RlhjTziTo/a1ruQik6/Yg==} + hasBin: true + dependencies: + deep-extend: 0.6.0 + ini: 4.1.2 + minimist: 1.2.8 + strip-json-comments: 3.1.1 + dev: true + + /run-parallel@1.2.0: + resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + dependencies: + queue-microtask: 1.2.3 + dev: true + + /safe-buffer@5.2.1: + resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + dev: true + + /scslre@0.3.0: + resolution: {integrity: sha512-3A6sD0WYP7+QrjbfNA2FN3FsOaGGFoekCVgTyypy53gPxhbkCIjtO6YWgdrfM+n/8sI8JeXZOIxsHjMTNxQ4nQ==} + engines: {node: ^14.0.0 || >=16.0.0} + dependencies: + '@eslint-community/regexpp': 4.10.0 + refa: 0.12.1 + regexp-ast-analysis: 0.7.1 + dev: true + + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + dev: true + + /semver@7.6.0: + resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + dev: true + + /sentences-per-line@0.2.1: + resolution: {integrity: sha512-6hlyKBwqoaZJ5+RBTKNNem2kBGAboh9e9KfFw5KYKA+64xaTYWbv5C6XnOudx8xk1Sg6f/4yalhJtCZFSLWIsQ==} + dependencies: + markdownlint: 0.11.0 + dev: true + + /serialize-javascript@6.0.0: + resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==} + dependencies: + randombytes: 2.1.0 + dev: true + + /shebang-command@2.0.0: + resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} + engines: {node: '>=8'} + dependencies: + shebang-regex: 3.0.0 + + /shebang-regex@3.0.0: + resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} + engines: {node: '>=8'} + + /shell-quote-word@1.0.1: + resolution: {integrity: sha512-lT297f1WLAdq0A4O+AknIFRP6kkiI3s8C913eJ0XqBxJbZPGWUNkRQk2u8zk4bEAjUJ5i+fSLwB6z1HzeT+DEg==} + dev: true + + /siginfo@2.0.0: + resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} + dev: true + + /signal-exit@3.0.7: + resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + dev: true + + /signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + + /slash@3.0.0: + resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} + engines: {node: '>=8'} + dev: true + + /slash@4.0.0: + resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} + engines: {node: '>=12'} + dev: true + + /slice-ansi@5.0.0: + resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + is-fullwidth-code-point: 4.0.0 + dev: true + + /slice-ansi@7.1.0: + resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==} + engines: {node: '>=18'} + dependencies: + ansi-styles: 6.2.1 + is-fullwidth-code-point: 5.0.0 + dev: true + + /smol-toml@1.1.4: + resolution: {integrity: sha512-Y0OT8HezWsTNeEOSVxDnKOW/AyNXHQ4BwJNbAXlLTF5wWsBvrcHhIkE5Rf8kQMLmgf7nDX3PVOlgC6/Aiggu3Q==} + engines: {node: '>= 18', pnpm: '>= 8'} + dev: true + + /sort-object-keys@1.1.3: + resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==} + dev: true + + /sort-package-json@1.57.0: + resolution: {integrity: sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q==} + hasBin: true + dependencies: + detect-indent: 6.1.0 + detect-newline: 3.1.0 + git-hooks-list: 1.0.3 + globby: 10.0.0 + is-plain-obj: 2.1.0 + sort-object-keys: 1.1.3 + dev: true + + /sort-package-json@2.8.0: + resolution: {integrity: sha512-PxeNg93bTJWmDGnu0HADDucoxfFiKkIr73Kv85EBThlI1YQPdc0XovBgg2llD0iABZbu2SlKo8ntGmOP9wOj/g==} + hasBin: true + dependencies: + detect-indent: 7.0.1 + detect-newline: 4.0.1 + get-stdin: 9.0.0 + git-hooks-list: 3.1.0 + globby: 13.2.2 + is-plain-obj: 4.1.0 + sort-object-keys: 1.1.3 + dev: true + + /source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + dev: true + + /source-map@0.8.0-beta.0: + resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} + engines: {node: '>= 8'} + dependencies: + whatwg-url: 7.1.0 + dev: true + + /spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + dependencies: + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.17 + dev: true + + /spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + dev: true + + /spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 + dev: true + + /spdx-expression-parse@4.0.0: + resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==} + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 + dev: true + + /spdx-license-ids@3.0.17: + resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} + dev: true + + /split2@3.2.2: + resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==} + dependencies: + readable-stream: 3.6.2 + dev: true + + /sprintf-js@1.0.3: + resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + dev: true + + /ssri@10.0.5: + resolution: {integrity: sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + minipass: 7.0.4 + dev: true + + /stackback@0.0.2: + resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + dev: true + + /std-env@3.7.0: + resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} + dev: true + + /string-argv@0.3.2: + resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} + engines: {node: '>=0.6.19'} + dev: true + + /string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + + /string-width@7.1.0: + resolution: {integrity: sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==} + engines: {node: '>=18'} + dependencies: + emoji-regex: 10.3.0 + get-east-asian-width: 1.2.0 + strip-ansi: 7.1.0 + dev: true + + /string.fromcodepoint@0.2.1: + resolution: {integrity: sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==} + dev: true + + /string_decoder@1.3.0: + resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} + dependencies: + safe-buffer: 5.2.1 + dev: true + + /strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + dependencies: + ansi-regex: 5.0.1 + + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + + /strip-bom@4.0.0: + resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} + engines: {node: '>=8'} + dev: true + + /strip-final-newline@2.0.0: + resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} + engines: {node: '>=6'} + dev: true + + /strip-final-newline@3.0.0: + resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} + engines: {node: '>=12'} + dev: true + + /strip-json-comments@3.1.1: + resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} + engines: {node: '>=8'} + dev: true + + /strip-json-comments@5.0.1: + resolution: {integrity: sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==} + engines: {node: '>=14.16'} + dev: true + + /strip-literal@2.0.0: + resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} + dependencies: + js-tokens: 8.0.3 + dev: true + + /sucrase@3.35.0: + resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + dependencies: + '@jridgewell/gen-mapping': 0.3.5 + commander: 4.1.1 + glob: 10.3.10 + lines-and-columns: 1.2.4 + mz: 2.7.0 + pirates: 4.0.6 + ts-interface-checker: 0.1.13 + dev: true + + /summary@2.1.0: + resolution: {integrity: sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==} + dev: true + + /supports-color@5.5.0: + resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} + engines: {node: '>=4'} + dependencies: + has-flag: 3.0.0 + dev: true + + /supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + dependencies: + has-flag: 4.0.0 + dev: true + + /supports-color@8.1.1: + resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} + engines: {node: '>=10'} + dependencies: + has-flag: 4.0.0 + dev: true + + /supports-preserve-symlinks-flag@1.0.0: + resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} + engines: {node: '>= 0.4'} + dev: true + + /synckit@0.6.2: + resolution: {integrity: sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==} + engines: {node: '>=12.20'} + dependencies: + tslib: 2.6.2 + dev: true + + /synckit@0.9.0: + resolution: {integrity: sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/core': 0.1.1 + tslib: 2.6.2 + dev: true + + /test-exclude@6.0.0: + resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} + engines: {node: '>=8'} + dependencies: + '@istanbuljs/schema': 0.1.3 + glob: 7.2.3 + minimatch: 3.1.2 + dev: true + + /text-table@0.2.0: + resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + dev: true + + /thenify-all@1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + dependencies: + thenify: 3.3.1 + dev: true + + /thenify@3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + dependencies: + any-promise: 1.3.0 + dev: true + + /through2@4.0.2: + resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==} + dependencies: + readable-stream: 3.6.2 + dev: true + + /tinybench@2.6.0: + resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} + dev: true + + /tinypool@0.8.2: + resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} + engines: {node: '>=14.0.0'} + dev: true + + /tinyspy@2.2.1: + resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==} + engines: {node: '>=14.0.0'} + dev: true + + /to-fast-properties@2.0.0: + resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} + engines: {node: '>=4'} + dev: true + + /to-no-case@1.0.2: + resolution: {integrity: sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==} + dev: true + + /to-pascal-case@1.0.0: + resolution: {integrity: sha512-QGMWHqM6xPrcQW57S23c5/3BbYb0Tbe9p+ur98ckRnGDwD4wbbtDiYI38CfmMKNB5Iv0REjs5SNDntTwvDxzZA==} + dependencies: + to-space-case: 1.0.0 + dev: true + + /to-regex-range@5.0.1: + resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} + engines: {node: '>=8.0'} + dependencies: + is-number: 7.0.0 + dev: true + + /to-space-case@1.0.0: + resolution: {integrity: sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==} + dependencies: + to-no-case: 1.0.2 + dev: true + + /tr46@1.0.1: + resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + dependencies: + punycode: 2.3.1 + dev: true + + /tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + dev: true + + /ts-api-utils@1.3.0(typescript@5.4.3): + resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} + engines: {node: '>=16'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.4.3 + + /ts-interface-checker@0.1.13: + resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + dev: true + + /tslib@1.14.1: + resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} + dev: true + + /tslib@2.6.2: + resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + dev: true + + /tsup@8.0.2(typescript@5.4.3): + resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + '@microsoft/api-extractor': ^7.36.0 + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.5.0' + peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + dependencies: + bundle-require: 4.0.2(esbuild@0.19.12) + cac: 6.7.14 + chokidar: 3.6.0 + debug: 4.3.4(supports-color@8.1.1) + esbuild: 0.19.12 + execa: 5.1.1 + globby: 11.1.0 + joycon: 3.1.1 + postcss-load-config: 4.0.2 + resolve-from: 5.0.0 + rollup: 4.13.0 + source-map: 0.8.0-beta.0 + sucrase: 3.35.0 + tree-kill: 1.2.2 + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + + /tsutils@3.21.0(typescript@5.4.3): + resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} + engines: {node: '>= 6'} + peerDependencies: + typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + dependencies: + tslib: 1.14.1 + typescript: 5.4.3 + dev: true + + /type-check@0.4.0: + resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + dev: true + + /type-detect@4.0.8: + resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} + engines: {node: '>=4'} + dev: true + + /type-fest@0.20.2: + resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} + engines: {node: '>=10'} + dev: true + + /type-fest@0.6.0: + resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} + engines: {node: '>=8'} + dev: true + + /type-fest@1.4.0: + resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==} + engines: {node: '>=10'} + dev: true + + /type-fest@3.13.1: + resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==} + engines: {node: '>=14.16'} + dev: true + + /typedarray-to-buffer@3.1.5: + resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} + dependencies: + is-typedarray: 1.0.0 + dev: true + + /typescript@5.4.3: + resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} + engines: {node: '>=14.17'} + hasBin: true + + /uc.micro@1.0.6: + resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} + dev: true + + /uc.micro@2.1.0: + resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} + dev: true + + /ufo@1.5.3: + resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} + dev: true + + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + dev: true + + /unescape-js@1.1.4: + resolution: {integrity: sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==} + dependencies: + string.fromcodepoint: 0.2.1 + dev: true + + /unique-string@2.0.0: + resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} + engines: {node: '>=8'} + dependencies: + crypto-random-string: 2.0.0 + dev: true + + /unique-string@3.0.0: + resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==} + engines: {node: '>=12'} + dependencies: + crypto-random-string: 4.0.0 + dev: true + + /unist-util-stringify-position@2.0.3: + resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==} + dependencies: + '@types/unist': 2.0.10 + dev: true + + /universalify@2.0.1: + resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} + engines: {node: '>= 10.0.0'} + dev: true + + /uri-js@4.4.1: + resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + dependencies: + punycode: 2.3.1 + dev: true + + /util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + dev: true + + /v8-to-istanbul@9.2.0: + resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==} + engines: {node: '>=10.12.0'} + dependencies: + '@jridgewell/trace-mapping': 0.3.25 + '@types/istanbul-lib-coverage': 2.0.6 + convert-source-map: 2.0.0 + dev: true + + /validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + dependencies: + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 + dev: true + + /validate-npm-package-name@4.0.0: + resolution: {integrity: sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + dependencies: + builtins: 5.0.1 + dev: true + + /validate-npm-package-name@5.0.0: + resolution: {integrity: sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + builtins: 5.0.1 + dev: true + + /version-selector-type@3.0.0: + resolution: {integrity: sha512-PSvMIZS7C1MuVNBXl/CDG2pZq8EXy/NW2dHIdm3bVP5N0PC8utDK8ttXLXj44Gn3J0lQE3U7Mpm1estAOd+eiA==} + engines: {node: '>=10.13'} + dependencies: + semver: 7.6.0 + dev: true + + /vite-node@1.4.0(@types/node@20.11.30): + resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4(supports-color@8.1.1) + pathe: 1.1.2 + picocolors: 1.0.0 + vite: 5.2.4(@types/node@20.11.30) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vite@5.2.4(@types/node@20.11.30): + resolution: {integrity: sha512-vjFghvHWidBTinu5TCymJk/lRHlR5ljqB83yugr0HA1xspUPdOZHqbqDLnZ8f9/jINrtFHTCYYyIUi+o+Q5iyg==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.11.30 + esbuild: 0.20.2 + postcss: 8.4.38 + rollup: 4.13.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /vitest@1.4.0(@types/node@20.11.30): + resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 1.4.0 + '@vitest/ui': 1.4.0 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@types/node': 20.11.30 + '@vitest/expect': 1.4.0 + '@vitest/runner': 1.4.0 + '@vitest/snapshot': 1.4.0 + '@vitest/spy': 1.4.0 + '@vitest/utils': 1.4.0 + acorn-walk: 8.3.2 + chai: 4.4.1 + debug: 4.3.4(supports-color@8.1.1) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.8 + pathe: 1.1.2 + picocolors: 1.0.0 + std-env: 3.7.0 + strip-literal: 2.0.0 + tinybench: 2.6.0 + tinypool: 0.8.2 + vite: 5.2.4(@types/node@20.11.30) + vite-node: 1.4.0(@types/node@20.11.30) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vlq@0.2.3: + resolution: {integrity: sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==} + dev: true + + /vscode-languageserver-textdocument@1.0.11: + resolution: {integrity: sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==} + dev: true + + /vscode-uri@3.0.8: + resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} + dev: true + + /wcwidth@1.0.1: + resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + requiresBuild: true + dependencies: + defaults: 1.0.4 + dev: true + optional: true + + /webidl-conversions@4.0.2: + resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + dev: true + + /whatwg-url@7.1.0: + resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + dependencies: + lodash.sortby: 4.7.0 + tr46: 1.0.1 + webidl-conversions: 4.0.2 + dev: true + + /which@2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + dependencies: + isexe: 2.0.0 + + /which@4.0.0: + resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} + engines: {node: ^16.13.0 || >=18.0.0} + hasBin: true + dependencies: + isexe: 3.1.1 + dev: true + + /why-is-node-running@2.2.2: + resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + engines: {node: '>=8'} + hasBin: true + dependencies: + siginfo: 2.0.0 + stackback: 0.0.2 + dev: true + + /wordwrap@0.0.3: + resolution: {integrity: sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==} + engines: {node: '>=0.4.0'} + dev: true + + /workerpool@6.2.1: + resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==} + dev: true + + /wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + + /wrap-ansi@9.0.0: + resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==} + engines: {node: '>=18'} + dependencies: + ansi-styles: 6.2.1 + string-width: 7.1.0 + strip-ansi: 7.1.0 + dev: true + + /wrappy@1.0.2: + resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + dev: true + + /write-file-atomic@3.0.3: + resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} + dependencies: + imurmurhash: 0.1.4 + is-typedarray: 1.0.0 + signal-exit: 3.0.7 + typedarray-to-buffer: 3.1.5 + dev: true + + /xdg-basedir@5.1.0: + resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==} + engines: {node: '>=12'} + dev: true + + /y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + dev: true + + /yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true + + /yaml-eslint-parser@1.2.2: + resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==} + engines: {node: ^14.17.0 || >=16.0.0} + dependencies: + eslint-visitor-keys: 3.4.3 + lodash: 4.17.21 + yaml: 2.4.1 + dev: true + + /yaml@2.3.4: + resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==} + engines: {node: '>= 14'} + dev: true + + /yaml@2.4.1: + resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==} + engines: {node: '>= 14'} + hasBin: true + dev: true + + /yargs-parser@20.2.4: + resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==} + engines: {node: '>=10'} + dev: true + + /yargs-unparser@2.0.0: + resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} + engines: {node: '>=10'} + dependencies: + camelcase: 6.3.0 + decamelize: 4.0.0 + flat: 5.0.2 + is-plain-obj: 2.1.0 + dev: true + + /yargs@16.2.0: + resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} + engines: {node: '>=10'} + dependencies: + cliui: 7.0.4 + escalade: 3.1.2 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 20.2.4 + dev: true + + /yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} + engines: {node: '>=10'} + dev: true + + /yocto-queue@1.0.0: + resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} + engines: {node: '>=12.20'} + dev: true + + /zod-validation-error@3.0.3(zod@3.22.4): + resolution: {integrity: sha512-cETTrcMq3Ze58vhdR0zD37uJm/694I6mAxcf/ei5bl89cC++fBNxrC2z8lkFze/8hVMPwrbtrwXHR2LB50fpHw==} + engines: {node: '>=18.0.0'} + peerDependencies: + zod: ^3.18.0 + dependencies: + zod: 3.22.4 + dev: true + + /zod@3.22.4: + resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} + dev: true diff --git a/renovate.json b/renovate.json index d2c6df781..1cb7a9124 100644 --- a/renovate.json +++ b/renovate.json @@ -1,4 +1,4 @@ { - "automerge": true, - "extends": ["config:base"] + "automerge": true, + "extends": ["config:base"] } diff --git a/src/cleanups/builtin/suppressTypeErrors/README.md b/src/cleanups/builtin/suppressTypeErrors/README.md index 72923b133..d42c24cb6 100644 --- a/src/cleanups/builtin/suppressTypeErrors/README.md +++ b/src/cleanups/builtin/suppressTypeErrors/README.md @@ -4,15 +4,15 @@ Whether to add a `// @ts-expect-error` comment directive before each remaining t ## Use Cases -* Your existing code has type errors that are too complex or context-dependent for TypeStat to clean up. +- Your existing code has type errors that are too complex or context-dependent for TypeStat to clean up. ## Configuration ```json { - "cleanups": { - "suppressTypeErrors": true - } + "cleanups": { + "suppressTypeErrors": true + } } ``` diff --git a/src/cleanups/builtin/suppressTypeErrors/index.ts b/src/cleanups/builtin/suppressTypeErrors/index.ts index 2580215a3..928c11c78 100644 --- a/src/cleanups/builtin/suppressTypeErrors/index.ts +++ b/src/cleanups/builtin/suppressTypeErrors/index.ts @@ -1,44 +1,46 @@ -import * as ts from "typescript"; +import ts from "typescript"; import { - DiagnosticWithStart, - getLineForDiagnostic, - isDiagnosticWithStart, - stringifyDiagnosticMessageText, -} from "../../../shared/diagnostics"; -import { FileMutator } from "../../../shared/fileMutator"; + DiagnosticWithStart, + getLineForDiagnostic, + isDiagnosticWithStart, + stringifyDiagnosticMessageText, +} from "../../../shared/diagnostics.js"; +import { FileMutator } from "../../../shared/fileMutator.js"; export const suppressRemainingTypeIssues: FileMutator = (request) => { - if (!request.options.cleanups.suppressTypeErrors) { - return undefined; - } + if (!request.options.cleanups.suppressTypeErrors) { + return undefined; + } - const allDiagnostics = request.services.program.getSemanticDiagnostics(request.sourceFile).filter(isDiagnosticWithStart); - if (!allDiagnostics.length) { - return undefined; - } + const allDiagnostics = request.services.program + .getSemanticDiagnostics(request.sourceFile) + .filter(isDiagnosticWithStart); + if (!allDiagnostics.length) { + return undefined; + } - const diagnosticsPerLine = new Map(); + const diagnosticsPerLine = new Map(); - for (const diagnostic of allDiagnostics) { - const line = getLineForDiagnostic(diagnostic, request.sourceFile); - const existing = diagnosticsPerLine.get(line); + for (const diagnostic of allDiagnostics) { + const line = getLineForDiagnostic(diagnostic, request.sourceFile); + const existing = diagnosticsPerLine.get(line); - if (existing) { - existing.push(diagnostic); - } else { - diagnosticsPerLine.set(line, [diagnostic]); - } - } + if (existing) { + existing.push(diagnostic); + } else { + diagnosticsPerLine.set(line, [diagnostic]); + } + } - return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { - const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); - return { - insertion: `// @ts-expect-error -- TODO: ${messages}\n`, - range: { - begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), - }, - type: "text-insert", - }; - }); + return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { + const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); + return { + insertion: `// @ts-expect-error -- TODO: ${messages}\n`, + range: { + begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), + }, + type: "text-insert", + }; + }); }; diff --git a/src/cli/runCli.test.ts b/src/cli/runCli.test.ts index 150aa0713..32ed5bc2e 100644 --- a/src/cli/runCli.test.ts +++ b/src/cli/runCli.test.ts @@ -1,110 +1,152 @@ -import { ResultStatus } from ".."; -import { version } from "../../package.json"; +import { describe, expect, it, vi } from "vitest"; -import { runCli } from "./runCli"; +import { version } from "../../package.json"; +import { ResultStatus } from "../index.js"; +import { runCli } from "./runCli.js"; const createTestArgs = (...argv: string[]) => ({ - argv: ["node.exe", "typestat", ...argv], - initializationRunner: jest.fn().mockResolvedValueOnce({ - status: ResultStatus.ConfigurationError, - }), - output: { - log: jest.fn(), - stderr: jest.fn(), - stdout: jest.fn(), - }, - mainRunner: jest.fn(), + argv: ["node.exe", "typestat", ...argv], + initializationRunner: vi.fn().mockResolvedValueOnce({ + status: ResultStatus.ConfigurationError, + }), + mainRunner: vi.fn(), + output: { + log: vi.fn(), + stderr: vi.fn(), + stdout: vi.fn(), + }, }); describe("runCli", () => { - it("runs initializationRunner when no args are provided", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs(); - - // Act - await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(initializationRunner).toHaveBeenCalledTimes(1); - expect(mainRunner).not.toHaveBeenCalled(); - }); - - it("logs the current version when --version is provided", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs("--version"); - - // Act - const resultStatus = await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(output.stdout).toHaveBeenLastCalledWith(`${version}`); - expect(resultStatus).toEqual(ResultStatus.Succeeded); - }); - - it("logs a string when the main runner rejects with one", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs("--config", "typestat.json"); - const message = "Error message"; - - mainRunner.mockRejectedValue(message); - - // Act - const resultStatus = await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(output.stderr).toHaveBeenCalledWith(expect.stringMatching(message)); - expect(resultStatus).toEqual(ResultStatus.Failed); - }); - - it("logs an error with a stack when the main runner rejects with one", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs("--config", "typestat.json"); - const message = "Error message"; - const error = new Error(message); - - mainRunner.mockRejectedValue(error); - - // Act - const resultStatus = await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(output.stderr).toHaveBeenCalledWith(expect.stringMatching(message)); - expect(output.stderr).toHaveBeenLastCalledWith(expect.stringMatching(" at")); - expect(resultStatus).toEqual(ResultStatus.Failed); - }); - - it("logs help and the error when a configuration error is reported", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs("--config", "typestat.json"); - const message = "Error message"; - - mainRunner.mockResolvedValue({ - error: message, - status: ResultStatus.ConfigurationError, - }); - - // Act - const resultStatus = await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(output.stdout).toHaveBeenLastCalledWith(expect.stringMatching("typestat \\[options\\]")); - expect(output.stderr).toHaveBeenLastCalledWith(expect.stringMatching(message)); - expect(resultStatus).toEqual(ResultStatus.ConfigurationError); - }); - - it("logs a happy message when it finishes succesfully", async () => { - // Arrange - const { argv, initializationRunner, output, mainRunner } = createTestArgs("--config", "typestat.json"); - - mainRunner.mockResolvedValue({ - status: ResultStatus.Succeeded, - }); - - // Act - const resultStatus = await runCli(argv, { initializationRunner, output, mainRunner }); - - // Assert - expect(output.stdout).toHaveBeenLastCalledWith(expect.stringMatching("All done!")); - expect(resultStatus).toEqual(ResultStatus.Succeeded); - }); + it("runs initializationRunner when no args are provided", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = createTestArgs(); + + // Act + await runCli(argv, { initializationRunner, mainRunner, output }); + + // Assert + expect(initializationRunner).toHaveBeenCalledTimes(1); + expect(mainRunner).not.toHaveBeenCalled(); + }); + + it("logs the current version when --version is provided", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = + createTestArgs("--version"); + + // Act + const resultStatus = await runCli(argv, { + initializationRunner, + mainRunner, + output, + }); + + // Assert + expect(output.stdout).toHaveBeenLastCalledWith(version); + expect(resultStatus).toEqual(ResultStatus.Succeeded); + }); + + it("logs a string when the main runner rejects with one", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = createTestArgs( + "--config", + "typestat.json", + ); + const message = "Error message"; + + mainRunner.mockRejectedValue(message); + + // Act + const resultStatus = await runCli(argv, { + initializationRunner, + mainRunner, + output, + }); + + // Assert + expect(output.stderr).toHaveBeenCalledWith(expect.stringMatching(message)); + expect(resultStatus).toEqual(ResultStatus.Failed); + }); + + it("logs an error with a stack when the main runner rejects with one", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = createTestArgs( + "--config", + "typestat.json", + ); + const message = "Error message"; + const error = new Error(message); + + mainRunner.mockRejectedValue(error); + + // Act + const resultStatus = await runCli(argv, { + initializationRunner, + mainRunner, + output, + }); + + // Assert + expect(output.stderr).toHaveBeenCalledWith(expect.stringMatching(message)); + expect(output.stderr).toHaveBeenLastCalledWith( + expect.stringMatching(" at"), + ); + expect(resultStatus).toEqual(ResultStatus.Failed); + }); + + it("logs help and the error when a configuration error is reported", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = createTestArgs( + "--config", + "typestat.json", + ); + const message = "Error message"; + + mainRunner.mockResolvedValue({ + error: message, + status: ResultStatus.ConfigurationError, + }); + + // Act + const resultStatus = await runCli(argv, { + initializationRunner, + mainRunner, + output, + }); + + // Assert + expect(output.stdout).toHaveBeenLastCalledWith( + expect.stringMatching("typestat \\[options\\]"), + ); + expect(output.stderr).toHaveBeenLastCalledWith( + expect.stringMatching(message), + ); + expect(resultStatus).toEqual(ResultStatus.ConfigurationError); + }); + + it("logs a happy message when it finishes successfully", async () => { + // Arrange + const { argv, initializationRunner, mainRunner, output } = createTestArgs( + "--config", + "typestat.json", + ); + + mainRunner.mockResolvedValue({ + status: ResultStatus.Succeeded, + }); + + // Act + const resultStatus = await runCli(argv, { + initializationRunner, + mainRunner, + output, + }); + + // Assert + expect(output.stdout).toHaveBeenLastCalledWith( + expect.stringMatching("All done!"), + ); + expect(resultStatus).toEqual(ResultStatus.Succeeded); + }); }); diff --git a/src/cli/runCli.ts b/src/cli/runCli.ts index 0e893f24c..e598d757c 100644 --- a/src/cli/runCli.ts +++ b/src/cli/runCli.ts @@ -1,95 +1,107 @@ import chalk from "chalk"; import { Command } from "commander"; -import * as fs from "mz/fs"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; import { EOL } from "os"; -import * as path from "path"; -import { ResultStatus, typeStat, TypeStatArgv, TypeStatResult } from "../index"; -import { initialization } from "../initialization"; -import { createProcessOutput } from "../output/createProcessOutput"; -import { ProcessOutput } from "../output/types"; +import { + ResultStatus, + TypeStatArgv, + TypeStatResult, + typeStat, +} from "../index.js"; +import { initialization } from "../initialization/index.js"; +import { createProcessOutput } from "../output/createProcessOutput.js"; +import { ProcessOutput } from "../output/types.js"; export interface CliRuntime { - initializationRunner: typeof initialization; - output: ProcessOutput; - mainRunner: typeof typeStat; + initializationRunner: typeof initialization; + mainRunner: typeof typeStat; + output: ProcessOutput; } /** * Parses raw string arguments and, if they're valid, calls to a main method. - * * @param rawArgv Raw string arguments and any system dependency overrides. - * @param mainRunner Method to run with parsed arguments: generally `typeStat`. + * @param runtime Method to run with parsed arguments: generally `typeStat`. * @returns Promise for the result of running TypeStat. */ -export const runCli = async (rawArgv: readonly string[], runtime?: CliRuntime): Promise => { - const command = new Command() - .storeOptionsAsProperties(true) - .option("-c --config [config]", "path to a TypeStat config file") - .option("-l --logfile [logfile]", "path to a logfile to print detailed logs in") - .option("-V --version", "output the package version"); - - const rawOptions = command.parse(rawArgv as string[]) as TypeStatArgv; - runtime ??= { - initializationRunner: initialization, - output: createProcessOutput(rawOptions.logfile), - mainRunner: typeStat, - }; - - if (rawArgv.length === 2) { - const initialized = await runtime.initializationRunner(runtime.output); - if (initialized.status !== ResultStatus.Succeeded || !initialized.skipped) { - return initialized.status; - } - - rawOptions.config = "typestat.json"; - } - - if ({}.hasOwnProperty.call(rawOptions, "version")) { - runtime.output.stdout(await getPackageVersion()); - return ResultStatus.Succeeded; - } - - let result: TypeStatResult; - - try { - result = await runtime.mainRunner(rawOptions, runtime.output); - } catch (error) { - result = { - error: error instanceof Error ? error : new Error(error as string), - status: ResultStatus.Failed, - }; - } - - switch (result.status) { - case ResultStatus.ConfigurationError: - runtime.output.stdout(command.helpInformation()); - logError(runtime, result.error); - break; - - case ResultStatus.Failed: - logError(runtime, result.error); - break; - - case ResultStatus.Succeeded: - runtime.output.stdout(chalk.greenBright(`${EOL}All done! โœจ`)); - break; - } - - return result.status; +export const runCli = async ( + rawArgv: readonly string[], + runtime?: CliRuntime, +): Promise => { + const command = new Command() + .storeOptionsAsProperties(true) + .option("-c --config [config]", "path to a TypeStat config file") + .option( + "-l --logfile [logfile]", + "path to a logfile to print detailed logs in", + ) + .option("-V --version", "output the package version"); + + const rawOptions = command.parse(rawArgv as string[]) as TypeStatArgv; + runtime ??= { + initializationRunner: initialization, + mainRunner: typeStat, + output: createProcessOutput(rawOptions.logfile), + }; + + if (rawArgv.length === 2) { + const initialized = await runtime.initializationRunner(runtime.output); + if (initialized.status !== ResultStatus.Succeeded || !initialized.skipped) { + return initialized.status; + } + + rawOptions.config = "typestat.json"; + } + + if ({}.hasOwnProperty.call(rawOptions, "version")) { + runtime.output.stdout(await getPackageVersion()); + return ResultStatus.Succeeded; + } + + let result: TypeStatResult; + + try { + result = await runtime.mainRunner(rawOptions, runtime.output); + } catch (error) { + result = { + error: error instanceof Error ? error : new Error(error as string), + status: ResultStatus.Failed, + }; + } + + switch (result.status) { + case ResultStatus.ConfigurationError: + runtime.output.stdout(command.helpInformation()); + logError(runtime, result.error); + break; + + case ResultStatus.Failed: + logError(runtime, result.error); + break; + + case ResultStatus.Succeeded: + runtime.output.stdout(chalk.greenBright(`${EOL}All done! โœจ`)); + break; + } + + return result.status; }; const getPackageVersion = async (): Promise => { - const packagePath = path.join(__dirname, "../../package.json"); - const rawText = (await fs.readFile(packagePath)).toString(); + const packagePath = path.join(import.meta.dirname, "../../package.json"); + const rawText = (await fs.readFile(packagePath)).toString(); - return (JSON.parse(rawText) as { version: string }).version; + return (JSON.parse(rawText) as { version: string }).version; }; const logError = (runtime: CliRuntime, error: Error | string) => { - runtime.output.stderr(chalk.yellow(error)); + runtime.output.stderr(chalk.yellow(error)); - if (error instanceof Error && error.stack) { - runtime.output.stderr(chalk.gray(error.stack.slice(error.stack.indexOf("\n") + 1))); - } + if (error instanceof Error && error.stack) { + runtime.output.stderr( + chalk.gray(error.stack.slice(error.stack.indexOf("\n") + 1)), + ); + } }; diff --git a/src/collectFileNames.ts b/src/collectFileNames.ts index 556f22eb1..b58812106 100644 --- a/src/collectFileNames.ts +++ b/src/collectFileNames.ts @@ -1,44 +1,56 @@ import { glob } from "glob"; -import * as path from "path"; +import * as path from "node:path"; -import { TypeStatArgv } from "./index"; +import { TypeStatArgv } from "./index.js"; export const collectFileNames = async ( - argv: TypeStatArgv, - cwd: string, - include: ReadonlyArray | undefined, -): Promise | string | undefined> => { - const globsAndNames = await collectFileNamesFromGlobs(argv, cwd, include); - if (!globsAndNames) { - return undefined; - } - - const [fileGlobs, fileNames] = globsAndNames; - const implicitNodeModulesInclude = implicitNodeModulesIncluded(fileGlobs, fileNames); - - if (implicitNodeModulesInclude) { - return `At least one path including node_modules was included implicitly: '${implicitNodeModulesInclude}'. Either adjust TypeStat's included files to not include node_modules (recommended) or explicitly include node_modules/ (not recommended).`; - } - - return fileNames; + argv: TypeStatArgv, + cwd: string, + include: readonly string[] | undefined, +): Promise => { + const globsAndNames = await collectFileNamesFromGlobs(argv, cwd, include); + if (!globsAndNames) { + return undefined; + } + + const [fileGlobs, fileNames] = globsAndNames; + const implicitNodeModulesInclude = implicitNodeModulesIncluded( + fileGlobs, + fileNames, + ); + + if (implicitNodeModulesInclude) { + return `At least one path including node_modules was included implicitly: '${implicitNodeModulesInclude}'. Either adjust TypeStat's included files to not include node_modules (recommended) or explicitly include node_modules/ (not recommended).`; + } + + return fileNames; }; const collectFileNamesFromGlobs = async ( - argv: TypeStatArgv, - cwd: string, - include: ReadonlyArray | undefined, -): Promise<[ReadonlyArray, ReadonlyArray] | undefined> => { - if (argv.args !== undefined && argv.args.length !== 0) { - return [argv.args, await glob(argv.args)]; - } - - if (include === undefined) { - return undefined; - } - - return [include, await glob(include.map((subInclude) => path.join(cwd, subInclude)))]; + argv: TypeStatArgv, + cwd: string, + include: readonly string[] | undefined, +): Promise<[readonly string[], readonly string[]] | undefined> => { + if (argv.args.length) { + return [argv.args, await glob(argv.args)]; + } + + if (include === undefined) { + return undefined; + } + + return [ + include, + await glob(include.map((subInclude) => path.join(cwd, subInclude))), + ]; }; -const implicitNodeModulesIncluded = (fileGlobs: ReadonlyArray, fileNames: ReadonlyArray | undefined) => { - return !fileGlobs.some((glob) => glob.includes("node_modules")) && fileNames?.find((fileName) => fileName.includes("node_modules")); +const implicitNodeModulesIncluded = ( + fileGlobs: readonly string[], + fileNames: readonly string[] | undefined, +) => { + return ( + !fileGlobs.some((glob) => glob.includes("node_modules")) && + fileNames?.find((fileName) => fileName.includes("node_modules")) + ); }; diff --git a/src/index.ts b/src/index.ts index 3050558be..12ee31279 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,123 +2,156 @@ import { runMutations } from "automutate"; import chalk from "chalk"; import { EOL } from "os"; -import { loadPendingOptions } from "./options/loadPendingOptions"; -import { pluralize } from "./output/pluralize"; -import { ProcessOutput } from "./output/types"; -import { PendingTypeStatOptions } from "./options/types"; -import { createTypeStatProvider } from "./runtime/createTypeStatProvider"; -import { collectFileNames } from "./collectFileNames"; +import { collectFileNames } from "./collectFileNames.js"; +import { loadPendingOptions } from "./options/loadPendingOptions.js"; +import { PendingTypeStatOptions } from "./options/types.js"; +import { pluralize } from "./output/pluralize.js"; +import { ProcessOutput } from "./output/types.js"; +import { createTypeStatProvider } from "./runtime/createTypeStatProvider.js"; /** * Root arguments to pass to TypeStat. */ export interface TypeStatArgv { - args: string[]; - config?: string; - logfile?: string; + args: string[]; + config?: string; + logfile?: string; } export enum ResultStatus { - Succeeded = 0, - Failed = 1, - ConfigurationError = 2, + ConfigurationError = 2, + Failed = 1, + Succeeded = 0, } -export type TypeStatResult = ConfigurationErrorResult | FailedResult | SucceededResult; +export type TypeStatResult = + | ConfigurationErrorResult + | FailedResult + | SucceededResult; export interface ConfigurationErrorResult { - readonly error: Error | string; - readonly status: ResultStatus.ConfigurationError; + readonly error: Error | string; + readonly status: ResultStatus.ConfigurationError; } export interface FailedResult { - readonly error: Error | string; - readonly status: ResultStatus.Failed; + readonly error: Error | string; + readonly status: ResultStatus.Failed; } export interface SucceededResult { - readonly status: ResultStatus.Succeeded; + readonly status: ResultStatus.Succeeded; } -export const typeStat = async (argv: TypeStatArgv, output: ProcessOutput): Promise => { - const allPendingOptions = await tryLoadingPendingOptions(argv, output); - if (allPendingOptions instanceof Error || typeof allPendingOptions === "string") { - return { - error: allPendingOptions, - status: ResultStatus.ConfigurationError, - }; - } +export const typeStat = async ( + argv: TypeStatArgv, + output: ProcessOutput, +): Promise => { + const allPendingOptions = await tryLoadingPendingOptions(argv, output); + if ( + allPendingOptions instanceof Error || + typeof allPendingOptions === "string" + ) { + return { + error: allPendingOptions, + status: ResultStatus.ConfigurationError, + }; + } - output.stdout(chalk.greenBright("๐Ÿš€ Welcome to TypeStat!")); - output.stdout(chalk.yellowBright("โš ๏ธ TypeStat is still very early stage and experimental. โš ๏ธ")); - output.stdout(chalk.yellowBright("While it will improve your code, it will likely add syntax and type errors.")); - output.stdout(chalk.yellowBright("Use TypeStat as a starting point before you manually fix and verify any changes.")); + output.stdout(chalk.greenBright("๐Ÿš€ Welcome to TypeStat!")); + output.stdout( + chalk.yellowBright( + "โš ๏ธ TypeStat is still very early stage and experimental. โš ๏ธ", + ), + ); + output.stdout( + chalk.yellowBright( + "While it will improve your code, it will likely add syntax and type errors.", + ), + ); + output.stdout( + chalk.yellowBright( + "Use TypeStat as a starting point before you manually fix and verify any changes.", + ), + ); - output.stdout( - [ - chalk.green(`TypeStat will run through the `), - chalk.greenBright(allPendingOptions.length), - chalk.green(` options ${pluralize(allPendingOptions.length, "object")} specified in `), - chalk.greenBright(argv.config), - chalk.green(` to modify your source code.`), - ].join(""), - ); - output.stdout(chalk.greenBright(`This may take a while...${EOL}`)); + output.stdout( + [ + chalk.green(`TypeStat will run through the `), + chalk.greenBright(allPendingOptions.length), + chalk.green( + ` options ${pluralize(allPendingOptions.length, "object")} specified in `, + ), + chalk.greenBright(argv.config), + chalk.green(` to modify your source code.`), + ].join(""), + ); + output.stdout(chalk.greenBright(`This may take a while...${EOL}`)); - for (let i = 0; i < allPendingOptions.length; i += 1) { - // Collect all files to be run on this option iteration from the include glob(s) - const fileNames = await collectFileNames(argv, process.cwd(), allPendingOptions[i].include); - if (typeof fileNames !== "object") { - return { - error: new Error( - `Could not run options object ${i + 1}: ${fileNames ?? `No files included by the 'include' setting were found.`}`, - ), - status: ResultStatus.Failed, - }; - } + for (let i = 0; i < allPendingOptions.length; i += 1) { + // Collect all files to be run on this option iteration from the include glob(s) + const fileNames = await collectFileNames( + argv, + process.cwd(), + allPendingOptions[i].include, + ); + if (typeof fileNames !== "object") { + return { + error: new Error( + `Could not run options object ${i + 1}: ${fileNames ?? `No files included by the 'include' setting were found.`}`, + ), + status: ResultStatus.Failed, + }; + } - output.stdout( - [ - chalk.green(`${EOL}Starting options object `), - chalk.greenBright(i + 1), - chalk.green(" of "), - chalk.greenBright(allPendingOptions.length), - chalk.green(`.${EOL}`), - ].join(""), - ); + output.stdout( + [ + chalk.green(`${EOL}Starting options object `), + chalk.greenBright(i + 1), + chalk.green(" of "), + chalk.greenBright(allPendingOptions.length), + chalk.green(`.${EOL}`), + ].join(""), + ); - // Run the mutation providers on those starting options and files - try { - await runMutations({ - mutationsProvider: createTypeStatProvider({ ...allPendingOptions[i], fileNames }), - }); - } catch (error) { - return { - error: error as Error, - status: ResultStatus.Failed, - }; - } finally { - output.stdout( - [ - chalk.green(`Finished options object `), - chalk.greenBright(i + 1), - chalk.green(" of "), - chalk.greenBright(allPendingOptions.length), - chalk.green(`.${EOL}`), - ].join(""), - ); - } - } + // Run the mutation providers on those starting options and files + try { + await runMutations({ + mutationsProvider: createTypeStatProvider({ + ...allPendingOptions[i], + fileNames, + }), + }); + } catch (error) { + return { + error: error as Error, + status: ResultStatus.Failed, + }; + } finally { + output.stdout( + [ + chalk.green(`Finished options object `), + chalk.greenBright(i + 1), + chalk.green(" of "), + chalk.greenBright(allPendingOptions.length), + chalk.green(`.${EOL}`), + ].join(""), + ); + } + } - return { - status: ResultStatus.Succeeded, - }; + return { + status: ResultStatus.Succeeded, + }; }; -const tryLoadingPendingOptions = async (argv: TypeStatArgv, output: ProcessOutput): Promise => { - try { - return await loadPendingOptions(argv, output); - } catch (error) { - return error instanceof Error ? error : new Error(error as string); - } +const tryLoadingPendingOptions = async ( + argv: TypeStatArgv, + output: ProcessOutput, +): Promise => { + try { + return await loadPendingOptions(argv, output); + } catch (error) { + return error instanceof Error ? error : new Error(error as string); + } }; diff --git a/src/initialization/index.ts b/src/initialization/index.ts index 5217fb772..a95d12909 100644 --- a/src/initialization/index.ts +++ b/src/initialization/index.ts @@ -1,72 +1,106 @@ import chalk from "chalk"; import { EOL } from "os"; -import { ResultStatus } from ".."; -import { ProcessOutput } from "../output/types"; -import { getQuickErrorSummary } from "../shared/errors"; - -import { initializeJavaScript } from "./initializeJavaScript"; -import { initializeProject } from "./initializeProject"; -import { InitializationPurpose, initializePurpose } from "./initializePurpose"; -import { initializeTypeScript } from "./initializeTypeScript"; +import { ResultStatus } from "../index.js"; +import { ProcessOutput } from "../output/types.js"; +import { getQuickErrorSummary } from "../shared/errors.js"; +import { initializeJavaScript } from "./initializeJavaScript/index.js"; +import { initializeProject } from "./initializeProject/index.js"; +import { + InitializationPurpose, + initializePurpose, +} from "./initializePurpose/index.js"; +import { initializeTypeScript } from "./initializeTypeScript/index.js"; const fileName = "typestat.json"; -export type InitializationResults = FailedInitialization | RanInitializationResults; +export type InitializationResults = + | FailedInitialization + | RanInitializationResults; export interface FailedInitialization { - status: ResultStatus.ConfigurationError; + status: ResultStatus.ConfigurationError; } export interface RanInitializationResults { - status: ResultStatus.Failed | ResultStatus.Succeeded; - skipped: boolean; + skipped: boolean; + status: ResultStatus.Failed | ResultStatus.Succeeded; } -export const initialization = async (output: ProcessOutput): Promise => { - output.stdout([chalk.greenBright("๐Ÿ‘‹"), chalk.green(" Welcome to TypeStat! "), chalk.greenBright("๐Ÿ‘‹"), chalk.reset("")].join("")); - - output.stdout([chalk.reset(`This will create a new `), chalk.yellowBright(fileName), chalk.reset(` for you.`)].join("")); - - output.stdout(`If you don't know how to answer, that's ok - just select the default answer.`); - output.stdout(chalk.reset("")); - - let skipped: boolean; - - try { - skipped = await runPrompts(); - } catch (error) { - output.stderr(getQuickErrorSummary(error)); - return { - status: ResultStatus.ConfigurationError, - }; - } - - if (!skipped) { - output.stdout(chalk.reset(`${EOL}Awesome! You're now ready to:`)); - output.stdout(chalk.greenBright(`npx typestat --config ${fileName}`)); - output.stdout(chalk.reset(`${EOL}Once you run that, TypeStat will start auto-fixing your typings.`)); - output.stdout( - [chalk.yellow(`Please report any bugs on https://github.com/JoshuaKGoldberg/TypeStat! `), chalk.yellowBright("๐Ÿ’–")].join(""), - ); - } - - output.stdout(chalk.reset("")); - - return { - skipped, - status: ResultStatus.Succeeded, - }; +export const initialization = async ( + output: ProcessOutput, +): Promise => { + output.stdout( + [ + chalk.greenBright("๐Ÿ‘‹"), + chalk.green(" Welcome to TypeStat! "), + chalk.greenBright("๐Ÿ‘‹"), + chalk.reset(""), + ].join(""), + ); + + output.stdout( + [ + chalk.reset(`This will create a new `), + chalk.yellowBright(fileName), + chalk.reset(` for you.`), + ].join(""), + ); + + output.stdout( + `If you don't know how to answer, that's ok - just select the default answer.`, + ); + output.stdout(chalk.reset("")); + + let skipped: boolean; + + try { + skipped = await runPrompts(); + } catch (error) { + output.stderr(getQuickErrorSummary(error)); + return { + status: ResultStatus.ConfigurationError, + }; + } + + if (!skipped) { + output.stdout(chalk.reset(`${EOL}Awesome! You're now ready to:`)); + output.stdout(chalk.greenBright(`npx typestat --config ${fileName}`)); + output.stdout( + chalk.reset( + `${EOL}Once you run that, TypeStat will start auto-fixing your typings.`, + ), + ); + output.stdout( + [ + chalk.yellow( + `Please report any bugs on https://github.com/JoshuaKGoldberg/TypeStat! `, + ), + chalk.yellowBright("๐Ÿ’–"), + ].join(""), + ); + } + + output.stdout(chalk.reset("")); + + return { + skipped, + status: ResultStatus.Succeeded, + }; }; const runPrompts = async () => { - const purpose = await initializePurpose(); - if (purpose === InitializationPurpose.Skipped) { - return true; - } - - const project = await initializeProject(); - await (purpose === InitializationPurpose.ConvertJavaScript ? initializeJavaScript : initializeTypeScript)({ fileName, project }); - - return false; + const purpose = await initializePurpose(); + if (purpose === InitializationPurpose.Skipped) { + return true; + } + + const project = await initializeProject(); + await ( + purpose === InitializationPurpose.ConvertJavaScript + ? initializeJavaScript + : initializeTypeScript + )({ fileName, project }); + + return false; }; diff --git a/src/initialization/initializeJavaScript/cleanups.ts b/src/initialization/initializeJavaScript/cleanups.ts index 1d136a719..d4461911a 100644 --- a/src/initialization/initializeJavaScript/cleanups.ts +++ b/src/initialization/initializeJavaScript/cleanups.ts @@ -1,20 +1,21 @@ import { prompt } from "enquirer"; export enum InitializationCleanups { - No = "No", - Yes = "Yes", + No = "No", + Yes = "Yes", } export const initializeCleanups = async () => { - const { cleanups } = await prompt<{ cleanups: InitializationCleanups }>([ - { - choices: [InitializationCleanups.No, InitializationCleanups.Yes], - initial: 1, - message: "Would you like to suppress remaining type errors with // @ts-expect-error comments?", - name: "cleanups", - type: "select", - }, - ]); + const { cleanups } = await prompt<{ cleanups: InitializationCleanups }>([ + { + choices: [InitializationCleanups.No, InitializationCleanups.Yes], + initial: 1, + message: + "Would you like to suppress remaining type errors with // @ts-expect-error comments?", + name: "cleanups", + type: "select", + }, + ]); - return cleanups; + return cleanups; }; diff --git a/src/initialization/initializeJavaScript/createJavaScriptConfig.test.ts b/src/initialization/initializeJavaScript/createJavaScriptConfig.test.ts index 75daeeab6..97f22b5f1 100644 --- a/src/initialization/initializeJavaScript/createJavaScriptConfig.test.ts +++ b/src/initialization/initializeJavaScript/createJavaScriptConfig.test.ts @@ -1,186 +1,227 @@ -import { InitializationImports } from "./imports"; -import { InitializationRenames } from "./renames"; -import { createJavaScriptConfig } from "./createJavaScriptConfig"; -import { InitializationCleanups } from "./cleanups"; +import { describe, expect, test } from "vitest"; -describe(createJavaScriptConfig, () => { - test.each([ - { - expected: { - files: { renameExtensions: "ts" }, - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - project: "tsconfig.json", - }, - name: "Basic", - settings: { - cleanups: InitializationCleanups.No, - imports: InitializationImports.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.TS, - }, - }, - { - expected: { - files: { renameExtensions: "ts" }, - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - cleanups: { suppressTypeErrors: true }, - project: "tsconfig.json", - }, - name: "Basic with Suppressions", - settings: { - cleanups: InitializationCleanups.Yes, - imports: InitializationImports.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.TS, - }, - }, - { - expected: [ - { - files: { renameExtensions: "ts" }, - fixes: { importExtensions: true }, - include: ["src/**/*.{js,jsx}"], - project: "tsconfig.json", - }, - { - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - include: ["src/**/*.ts"], - project: "tsconfig.json", - }, - ], - name: "TS Renames (multiple sourceFiles extensions)", - settings: { - imports: InitializationImports.Yes, - cleanups: InitializationCleanups.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.TS, - sourceFiles: "src/**/*.{js,jsx}", - }, - }, - { - expected: [ - { - files: { renameExtensions: "tsx" }, - fixes: { importExtensions: true }, - include: ["src/**/*.{js,jsx}"], - project: "tsconfig.json", - }, - { - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - include: ["src/**/*.tsx"], - project: "tsconfig.json", - }, - ], - name: "TSX Renames (multiple sourceFiles extensions)", - settings: { - imports: InitializationImports.Yes, - cleanups: InitializationCleanups.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.TSX, - sourceFiles: "src/**/*.{js,jsx}", - }, - }, - { - expected: [ - { files: { renameExtensions: true }, fixes: { importExtensions: true }, project: "tsconfig.json" }, - { fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, project: "tsconfig.json" }, - ], - name: "Auto Renames (no sourceFiles)", - settings: { - cleanups: InitializationCleanups.No, - imports: InitializationImports.Yes, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.Auto, - }, - }, - { - expected: [ - { - files: { renameExtensions: true }, - fixes: { importExtensions: true }, - include: ["src/**/*.js"], - project: "tsconfig.json", - }, - { - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - include: ["src/**/*.{ts,tsx}"], - project: "tsconfig.json", - }, - ], - name: "Auto Renames (single sourceFiles extension)", - settings: { - imports: InitializationImports.Yes, - cleanups: InitializationCleanups.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.Auto, - sourceFiles: "src/**/*.js", - }, - }, - { - expected: [ - { - files: { renameExtensions: true }, - fixes: { importExtensions: true }, - include: ["src/**/*.{js,jsx}"], - project: "tsconfig.json", - }, - { - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - include: ["src/**/*.{ts,tsx}"], - project: "tsconfig.json", - }, - ], - name: "Auto Renames (multiple sourceFiles extensions)", - settings: { - imports: InitializationImports.Yes, - cleanups: InitializationCleanups.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.Auto, - sourceFiles: "src/**/*.{js,jsx}", - }, - }, - { - expected: [ - { - files: { renameExtensions: true }, - fixes: { importExtensions: true }, - include: ["src/**/*.js(x)"], - project: "tsconfig.json", - }, - { - fixes: { incompleteTypes: true, missingProperties: true, noImplicitAny: true }, - include: ["src/**/*.ts(x)"], - project: "tsconfig.json", - }, - ], - name: "Auto Renames (parenthesized sourceFiles extensions)", - settings: { - imports: InitializationImports.Yes, - cleanups: InitializationCleanups.No, - project: { - filePath: "tsconfig.json", - }, - renames: InitializationRenames.Auto, - sourceFiles: "src/**/*.js(x)", - }, - }, - ])("$name", ({ expected, settings }) => { - const actual = createJavaScriptConfig(settings); +import { InitializationCleanups } from "./cleanups.js"; +import { createJavaScriptConfig } from "./createJavaScriptConfig.js"; +import { InitializationImports } from "./imports.js"; +import { InitializationRenames } from "./renames.js"; - expect(actual).toEqual(expected); - }); +describe("createJavaScriptConfig", () => { + test.each([ + { + expected: { + files: { renameExtensions: "ts" }, + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + project: "tsconfig.json", + }, + name: "Basic", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.No, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.TS, + }, + }, + { + expected: { + cleanups: { suppressTypeErrors: true }, + files: { renameExtensions: "ts" }, + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + project: "tsconfig.json", + }, + name: "Basic with Suppressions", + settings: { + cleanups: InitializationCleanups.Yes, + imports: InitializationImports.No, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.TS, + }, + }, + { + expected: [ + { + files: { renameExtensions: "ts" }, + fixes: { importExtensions: true }, + include: ["src/**/*.{js,jsx}"], + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + include: ["src/**/*.ts"], + project: "tsconfig.json", + }, + ], + name: "TS Renames (multiple sourceFiles extensions)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.TS, + sourceFiles: "src/**/*.{js,jsx}", + }, + }, + { + expected: [ + { + files: { renameExtensions: "tsx" }, + fixes: { importExtensions: true }, + include: ["src/**/*.{js,jsx}"], + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + include: ["src/**/*.tsx"], + project: "tsconfig.json", + }, + ], + name: "TSX Renames (multiple sourceFiles extensions)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.TSX, + sourceFiles: "src/**/*.{js,jsx}", + }, + }, + { + expected: [ + { + files: { renameExtensions: true }, + fixes: { importExtensions: true }, + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + project: "tsconfig.json", + }, + ], + name: "Auto Renames (no sourceFiles)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.Auto, + }, + }, + { + expected: [ + { + files: { renameExtensions: true }, + fixes: { importExtensions: true }, + include: ["src/**/*.js"], + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + include: ["src/**/*.{ts,tsx}"], + project: "tsconfig.json", + }, + ], + name: "Auto Renames (single sourceFiles extension)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.Auto, + sourceFiles: "src/**/*.js", + }, + }, + { + expected: [ + { + files: { renameExtensions: true }, + fixes: { importExtensions: true }, + include: ["src/**/*.{js,jsx}"], + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + include: ["src/**/*.{ts,tsx}"], + project: "tsconfig.json", + }, + ], + name: "Auto Renames (multiple sourceFiles extensions)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.Auto, + sourceFiles: "src/**/*.{js,jsx}", + }, + }, + { + expected: [ + { + files: { renameExtensions: true }, + fixes: { importExtensions: true }, + include: ["src/**/*.js(x)"], + project: "tsconfig.json", + }, + { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + include: ["src/**/*.ts(x)"], + project: "tsconfig.json", + }, + ], + name: "Auto Renames (parenthesized sourceFiles extensions)", + settings: { + cleanups: InitializationCleanups.No, + imports: InitializationImports.Yes, + project: { + filePath: "tsconfig.json", + }, + renames: InitializationRenames.Auto, + sourceFiles: "src/**/*.js(x)", + }, + }, + ])("$name", ({ expected, settings }) => { + const actual = createJavaScriptConfig(settings); + + expect(actual).toEqual(expected); + }); }); diff --git a/src/initialization/initializeJavaScript/createJavaScriptConfig.ts b/src/initialization/initializeJavaScript/createJavaScriptConfig.ts index 3daa3876a..024e0a8ae 100644 --- a/src/initialization/initializeJavaScript/createJavaScriptConfig.ts +++ b/src/initialization/initializeJavaScript/createJavaScriptConfig.ts @@ -1,91 +1,103 @@ -import { ProjectDescription } from "../initializeProject/shared"; -import { InitializationImports } from "./imports"; -import { InitializationRenames } from "./renames"; -import { InitializationCleanups } from "./cleanups"; +import { ProjectDescription } from "../initializeProject/shared.js"; +import { InitializationCleanups } from "./cleanups.js"; +import { InitializationImports } from "./imports.js"; +import { InitializationRenames } from "./renames.js"; export interface JavaScriptConfigSettings { - cleanups: InitializationCleanups; - imports: InitializationImports; - project: ProjectDescription; - renames: InitializationRenames; - sourceFiles?: string; + cleanups: InitializationCleanups; + imports: InitializationImports; + project: ProjectDescription; + renames: InitializationRenames; + sourceFiles?: string; } -export const createJavaScriptConfig = ({ imports, project, sourceFiles, cleanups, renames }: JavaScriptConfigSettings) => { - const fileConversion = { - files: { - renameExtensions: printRenames(renames), - }, - }; - const coreConversion = { - fixes: { - incompleteTypes: true, - missingProperties: true, - noImplicitAny: true, - }, - ...(cleanups === InitializationCleanups.Yes ? { cleanups: { suppressTypeErrors: true } } : {}), - }; - const shared = (include: string[] | undefined) => ({ - ...(include && { include }), - project: project.filePath, - }); +export const createJavaScriptConfig = ({ + cleanups, + imports, + project, + renames, + sourceFiles, +}: JavaScriptConfigSettings) => { + const fileConversion = { + files: { + renameExtensions: printRenames(renames), + }, + }; + const coreConversion = { + fixes: { + incompleteTypes: true, + missingProperties: true, + noImplicitAny: true, + }, + ...(cleanups === InitializationCleanups.Yes + ? { cleanups: { suppressTypeErrors: true } } + : {}), + }; + const shared = (include: string[] | undefined) => ({ + ...(include && { include }), + project: project.filePath, + }); - const allConversions = - imports === InitializationImports.Yes - ? [ - { - ...fileConversion, - fixes: { - importExtensions: true, - }, - ...shared(sourceFiles ? [sourceFiles] : undefined), - }, - { - ...coreConversion, - ...shared( - sourceFiles - ? renames === InitializationRenames.Auto - ? renameSourceFilesExtensionsAuto(sourceFiles) - : renames === InitializationRenames.TS - ? renameSourceFilesExtensions(sourceFiles, "ts") - : renameSourceFilesExtensions(sourceFiles, "tsx") - : undefined, - ), - }, - ] - : { - ...fileConversion, - ...coreConversion, - ...shared(sourceFiles ? [sourceFiles] : undefined), - }; + const allConversions = + imports === InitializationImports.Yes + ? [ + { + ...fileConversion, + fixes: { + importExtensions: true, + }, + ...shared(sourceFiles ? [sourceFiles] : undefined), + }, + { + ...coreConversion, + ...shared( + sourceFiles + ? renames === InitializationRenames.Auto + ? renameSourceFilesExtensionsAuto(sourceFiles) + : renames === InitializationRenames.TS + ? renameSourceFilesExtensions(sourceFiles, "ts") + : renameSourceFilesExtensions(sourceFiles, "tsx") + : undefined, + ), + }, + ] + : { + ...fileConversion, + ...coreConversion, + ...shared(sourceFiles ? [sourceFiles] : undefined), + }; - return allConversions; + return allConversions; }; const printRenames = (renames: InitializationRenames) => { - switch (renames) { - case InitializationRenames.Auto: - return true; + switch (renames) { + case InitializationRenames.Auto: + return true; - case InitializationRenames.TS: - return "ts"; + case InitializationRenames.TS: + return "ts"; - case InitializationRenames.TSX: - return "tsx"; - } + case InitializationRenames.TSX: + return "tsx"; + } }; function renameSourceFilesExtensionsAuto(sourceFiles: string) { - for (const [original, replacement] of [ - [/\{js,jsx\}/, "{ts,tsx}"], - [/\.js$/, ".{ts,tsx}"], - ] as const) { - sourceFiles = sourceFiles.replace(original, replacement); - } + for (const [original, replacement] of [ + [/\{js,jsx\}/, "{ts,tsx}"], + [/\.js$/, ".{ts,tsx}"], + ] as const) { + sourceFiles = sourceFiles.replace(original, replacement); + } - return renameSourceFilesExtensions(sourceFiles, "ts"); + return renameSourceFilesExtensions(sourceFiles, "ts"); } function renameSourceFilesExtensions(sourceFiles: string, extension: string) { - return [sourceFiles.replace(/(\.|{)js/, `$1${extension}`).replace(new RegExp(`{${extension},jsx?}`), extension)]; + return [ + sourceFiles + .replace(/(\.|\{)js/, `$1${extension}`) + .replace(new RegExp(`{${extension},jsx?}`), extension), + ]; } diff --git a/src/initialization/initializeJavaScript/imports.ts b/src/initialization/initializeJavaScript/imports.ts index f1d422660..9979f1c7a 100644 --- a/src/initialization/initializeJavaScript/imports.ts +++ b/src/initialization/initializeJavaScript/imports.ts @@ -1,20 +1,21 @@ import { prompt } from "enquirer"; export enum InitializationImports { - No = "No", - Yes = "Yes", + No = "No", + Yes = "Yes", } export const initializeImports = async () => { - const { imports } = await prompt<{ imports: InitializationImports }>([ - { - choices: [InitializationImports.No, InitializationImports.Yes], - initial: 1, - message: "Would you like imports without extensions to have those extensions added in?", - name: "imports", - type: "select", - }, - ]); + const { imports } = await prompt<{ imports: InitializationImports }>([ + { + choices: [InitializationImports.No, InitializationImports.Yes], + initial: 1, + message: + "Would you like imports without extensions to have those extensions added in?", + name: "imports", + type: "select", + }, + ]); - return imports; + return imports; }; diff --git a/src/initialization/initializeJavaScript/index.ts b/src/initialization/initializeJavaScript/index.ts index 00e9e439c..a4ebd9388 100644 --- a/src/initialization/initializeJavaScript/index.ts +++ b/src/initialization/initializeJavaScript/index.ts @@ -1,24 +1,36 @@ -import { writeFile } from "mz/fs"; +import * as fs from "node:fs/promises"; -import { ProjectDescription } from "../initializeProject/shared"; -import { initializeSources } from "../sources"; -import { initializeImports } from "./imports"; -import { initializeRenames } from "./renames"; -import { createJavaScriptConfig } from "./createJavaScriptConfig"; -import { initializeCleanups } from "./cleanups"; +import { ProjectDescription } from "../initializeProject/shared.js"; +import { initializeSources } from "../sources/index.js"; +import { initializeCleanups } from "./cleanups.js"; +import { createJavaScriptConfig } from "./createJavaScriptConfig.js"; +import { initializeImports } from "./imports.js"; +import { initializeRenames } from "./renames.js"; export interface InitializeJavaScriptSettings { - fileName: string; - project: ProjectDescription; + fileName: string; + project: ProjectDescription; } -export const initializeJavaScript = async ({ fileName, project }: InitializeJavaScriptSettings) => { - const sourceFiles = await initializeSources({ fromJavaScript: true, project }); - const renames = await initializeRenames(); - const imports = await initializeImports(); - const cleanups = await initializeCleanups(); +export const initializeJavaScript = async ({ + fileName, + project, +}: InitializeJavaScriptSettings) => { + const sourceFiles = await initializeSources({ + fromJavaScript: true, + project, + }); + const renames = await initializeRenames(); + const imports = await initializeImports(); + const cleanups = await initializeCleanups(); - const settings = createJavaScriptConfig({ imports, project, sourceFiles, cleanups, renames }); + const settings = createJavaScriptConfig({ + cleanups, + imports, + project, + renames, + sourceFiles, + }); - await writeFile(fileName, JSON.stringify(settings, undefined, 4)); + await fs.writeFile(fileName, JSON.stringify(settings, undefined, 4)); }; diff --git a/src/initialization/initializeJavaScript/renames.ts b/src/initialization/initializeJavaScript/renames.ts index bf9628a90..fc0109c57 100644 --- a/src/initialization/initializeJavaScript/renames.ts +++ b/src/initialization/initializeJavaScript/renames.ts @@ -1,21 +1,25 @@ import { prompt } from "enquirer"; export enum InitializationRenames { - Auto = "Rename files containing JSX to .tsx and others to .ts", - TS = "Rename all files to .ts", - TSX = "Rename all files to .tsx", + Auto = "Rename files containing JSX to .tsx and others to .ts", + TS = "Rename all files to .ts", + TSX = "Rename all files to .tsx", } export const initializeRenames = async () => { - const { renames } = await prompt<{ renames: InitializationRenames }>([ - { - choices: [InitializationRenames.Auto, InitializationRenames.TS, InitializationRenames.TSX], - initial: 0, - message: "How would you like .js files to be renamed?", - name: "renames", - type: "select", - }, - ]); + const { renames } = await prompt<{ renames: InitializationRenames }>([ + { + choices: [ + InitializationRenames.Auto, + InitializationRenames.TS, + InitializationRenames.TSX, + ], + initial: 0, + message: "How would you like .js files to be renamed?", + name: "renames", + type: "select", + }, + ]); - return renames; + return renames; }; diff --git a/src/initialization/initializeProject/index.ts b/src/initialization/initializeProject/index.ts index a1f8b6bb1..ee323c3c2 100644 --- a/src/initialization/initializeProject/index.ts +++ b/src/initialization/initializeProject/index.ts @@ -2,55 +2,67 @@ import { prompt } from "enquirer"; import * as fs from "fs"; import { glob } from "glob"; -import { uniquify } from "../../shared/arrays"; -import { initializeNewProject } from "./initializeNewProject"; -import { ProjectDescription, TSConfigLocationSuggestion, TSConfigLocation } from "./shared"; +import { uniquify } from "../../shared/arrays.js"; +import { initializeNewProject } from "./initializeNewProject.js"; +import { + ProjectDescription, + TSConfigLocation, + TSConfigLocationSuggestion, +} from "./shared.js"; export const initializeProject = async (): Promise => { - const project = await initializeBuiltInProject(); + const project = await initializeBuiltInProject(); - return project === TSConfigLocationSuggestion.Custom - ? initializeCustomProject() - : project === TSConfigLocationSuggestion.DoesNotExist - ? initializeNewProject() - : { filePath: project }; + return project === TSConfigLocationSuggestion.Custom + ? initializeCustomProject() + : project === TSConfigLocationSuggestion.DoesNotExist + ? initializeNewProject() + : { filePath: project }; }; const defaultSettings = { - message: "Where is your tsconfig.json?", - name: "project", + message: "Where is your tsconfig.json?", + name: "project", }; const initializeBuiltInProject = async () => { - const choices = [ - ...uniquify(TSConfigLocation.Root, TSConfigLocation.UnderSrc, ...(await glob(["./tsconfig*json", "./*/tsconfig*json"]))), - TSConfigLocationSuggestion.Custom, - TSConfigLocationSuggestion.DoesNotExist, - ]; - - const { project } = await prompt<{ project: TSConfigLocation | TSConfigLocationSuggestion }>([ - { - ...defaultSettings, - choices, - initial: Math.max( - 0, - [TSConfigLocation.Root, TSConfigLocation.UnderSrc].findIndex((choice) => fs.existsSync(choice)), - ), - type: "select", - }, - ]); - - return project; + const choices = [ + ...uniquify( + TSConfigLocation.Root, + TSConfigLocation.UnderSrc, + ...(await glob(["./tsconfig*json", "./*/tsconfig*json"])), + ), + TSConfigLocationSuggestion.Custom, + TSConfigLocationSuggestion.DoesNotExist, + ]; + + const { project } = await prompt<{ + project: TSConfigLocation | TSConfigLocationSuggestion; + }>([ + { + ...defaultSettings, + choices, + initial: Math.max( + 0, + [TSConfigLocation.Root, TSConfigLocation.UnderSrc].findIndex((choice) => + fs.existsSync(choice), + ), + ), + type: "select", + }, + ]); + + return project; }; const initializeCustomProject = async (): Promise => { - const { project } = await prompt<{ project: string }>([ - { - ...defaultSettings, - initial: "./tsconfig.json", - type: "text", - }, - ]); - - return { filePath: project }; + const { project } = await prompt<{ project: string }>([ + { + ...defaultSettings, + initial: "./tsconfig.json", + type: "text", + }, + ]); + + return { filePath: project }; }; diff --git a/src/initialization/initializeProject/initializeNewProject.ts b/src/initialization/initializeProject/initializeNewProject.ts index 632b63ccd..add3447a5 100644 --- a/src/initialization/initializeProject/initializeNewProject.ts +++ b/src/initialization/initializeProject/initializeNewProject.ts @@ -1,78 +1,80 @@ -import { fs } from "mz"; import { prompt } from "enquirer"; -import { ProjectDescription } from "./shared"; +import * as fs from "node:fs/promises"; + +import { ProjectDescription } from "./shared.js"; const filePath = "./tsconfig.json"; export const initializeNewProject = async (): Promise => { - const { emit } = await prompt<{ emit: string }>([ - { - choices: ["yes", "no"], - message: "Should TypeScript output .js files from .ts sources?", - name: "emit", - type: "select", - }, - ]); - const { inBrowser } = await prompt<{ inBrowser: string }>([ - { - choices: ["yes", "no"], - message: "Does your code run in browser?", - name: "inBrowser", - type: "select", - }, - ]); - const jsx = - inBrowser && - ( - await prompt<{ jsx: string }>([ - { - choices: ["yes", "no"], - message: "Does your project use JSX?", - name: "jsx", - type: "select", - }, - ]) - ).jsx; - const { target } = await prompt<{ target: string }>([ - { - choices: ["es2020", "es2021", "es2022", "esnext"], - message: "What minimum runtime does your code run on?", - name: "target", - type: "select", - }, - ]); - const { strict } = await prompt<{ strict: string }>([ - { - choices: ["yes", "no"], - message: "Would you like to enable TypeScript's strict compiler options? (recommended)", - name: "strict", - type: "select", - }, - ]); + const { emit } = await prompt<{ emit: string }>([ + { + choices: ["yes", "no"], + message: "Should TypeScript output .js files from .ts sources?", + name: "emit", + type: "select", + }, + ]); + const { inBrowser } = await prompt<{ inBrowser: string }>([ + { + choices: ["yes", "no"], + message: "Does your code run in browser?", + name: "inBrowser", + type: "select", + }, + ]); + const jsx = + inBrowser && + ( + await prompt<{ jsx: string }>([ + { + choices: ["yes", "no"], + message: "Does your project use JSX?", + name: "jsx", + type: "select", + }, + ]) + ).jsx; + const { target } = await prompt<{ target: string }>([ + { + choices: ["es2020", "es2021", "es2022", "esnext"], + message: "What minimum runtime does your code run on?", + name: "target", + type: "select", + }, + ]); + const { strict } = await prompt<{ strict: string }>([ + { + choices: ["yes", "no"], + message: + "Would you like to enable TypeScript's strict compiler options? (recommended)", + name: "strict", + type: "select", + }, + ]); - await fs.writeFile( - filePath, - JSON.stringify( - { - compilerOptions: { - declaration: true, - declarationMap: true, - ...(emit === "no" && { noEmit: true }), - esModuleInterop: true, - ...(inBrowser === "no" && { lib: [target] }), - ...(jsx === "yes" && { jsx: "react" }), - sourceMap: true, - moduleResolution: "node", - module: "nodenext", - skipLibCheck: true, - ...(strict === "yes" ? { strict: true } : {}), - target, - }, - }, - null, - 4, - ), - ); + await fs.writeFile( + filePath, + JSON.stringify( + { + compilerOptions: { + declaration: true, + declarationMap: true, + ...(emit === "no" && { noEmit: true }), + esModuleInterop: true, + ...(inBrowser === "no" && { lib: [target] }), + ...(jsx === "yes" && { jsx: "react" }), + module: "nodenext", + moduleResolution: "node", + skipLibCheck: true, + sourceMap: true, + ...(strict === "yes" ? { strict: true } : {}), + target, + }, + }, + null, + 4, + ), + ); - return { created: true, filePath }; + return { created: true, filePath }; }; diff --git a/src/initialization/initializeProject/shared.ts b/src/initialization/initializeProject/shared.ts index 56f1d23c7..7b6392e85 100644 --- a/src/initialization/initializeProject/shared.ts +++ b/src/initialization/initializeProject/shared.ts @@ -1,14 +1,14 @@ export enum TSConfigLocationSuggestion { - Custom = "custom", - DoesNotExist = "I don't have one yet", + Custom = "custom", + DoesNotExist = "I don't have one yet", } export enum TSConfigLocation { - Root = "./tsconfig.json", - UnderSrc = "./src/tsconfig.json", + Root = "./tsconfig.json", + UnderSrc = "./src/tsconfig.json", } export interface ProjectDescription { - created?: boolean; - filePath: string; + created?: boolean; + filePath: string; } diff --git a/src/initialization/initializePurpose/index.ts b/src/initialization/initializePurpose/index.ts index b481ff0f5..77c273c1a 100644 --- a/src/initialization/initializePurpose/index.ts +++ b/src/initialization/initializePurpose/index.ts @@ -2,26 +2,29 @@ import { prompt } from "enquirer"; import * as fs from "fs"; export enum InitializationPurpose { - ConvertJavaScript = "Convert my JavaScript files to TypeScript", - Skipped = "Run TypeStat with the typestat.json file that already exists", - ImproveTypeScript = "Improve typings in my TypeScript files", + ConvertJavaScript = "Convert my JavaScript files to TypeScript", + ImproveTypeScript = "Improve typings in my TypeScript files", + Skipped = "Run TypeStat with the typestat.json file that already exists", } export const initializePurpose = async () => { - const choices = [InitializationPurpose.ConvertJavaScript, InitializationPurpose.ImproveTypeScript]; + const choices = [ + InitializationPurpose.ConvertJavaScript, + InitializationPurpose.ImproveTypeScript, + ]; - if (fs.existsSync("typestat.json")) { - choices.unshift(InitializationPurpose.Skipped); - } + if (fs.existsSync("typestat.json")) { + choices.unshift(InitializationPurpose.Skipped); + } - const { purpose } = await prompt<{ purpose: InitializationPurpose }>([ - { - choices, - message: "What are you trying to accomplish?", - name: "purpose", - type: "select", - }, - ]); + const { purpose } = await prompt<{ purpose: InitializationPurpose }>([ + { + choices, + message: "What are you trying to accomplish?", + name: "purpose", + type: "select", + }, + ]); - return purpose; + return purpose; }; diff --git a/src/initialization/initializeTypeScript/improvements.ts b/src/initialization/initializeTypeScript/improvements.ts index 128d2e9aa..444861226 100644 --- a/src/initialization/initializeTypeScript/improvements.ts +++ b/src/initialization/initializeTypeScript/improvements.ts @@ -1,31 +1,33 @@ import { prompt } from "enquirer"; export enum InitializationImprovement { - MissingProperties = "Add missing property declarations to classes", - NoImplicitAny = "Enable the --noImplicitAny compiler flag", - NoImplicitThis = "Enable the --noImplicitThis compiler flag", - NoInferableTypes = "Remove type annotations that don't change the meaning of code", - StrictNullChecks = "Enable the --strictNullChecks compiler flag", + MissingProperties = "Add missing property declarations to classes", + NoImplicitAny = "Enable the --noImplicitAny compiler flag", + NoImplicitThis = "Enable the --noImplicitThis compiler flag", + NoInferableTypes = "Remove type annotations that don't change the meaning of code", + StrictNullChecks = "Enable the --strictNullChecks compiler flag", } export const initializeImprovements = async () => { - const choices = [ - InitializationImprovement.MissingProperties, - InitializationImprovement.NoImplicitAny, - InitializationImprovement.NoImplicitThis, - InitializationImprovement.NoInferableTypes, - InitializationImprovement.StrictNullChecks, - ]; + const choices = [ + InitializationImprovement.MissingProperties, + InitializationImprovement.NoImplicitAny, + InitializationImprovement.NoImplicitThis, + InitializationImprovement.NoInferableTypes, + InitializationImprovement.StrictNullChecks, + ]; - const { improvements } = await prompt<{ improvements: InitializationImprovement[] }>([ - { - choices, - initial: 0, - message: "Which improvements would you like to make?", - name: "improvements", - type: "multiselect", - }, - ]); + const { improvements } = await prompt<{ + improvements: InitializationImprovement[]; + }>([ + { + choices, + initial: 0, + message: "Which improvements would you like to make?", + name: "improvements", + type: "multiselect", + }, + ]); - return improvements; + return improvements; }; diff --git a/src/initialization/initializeTypeScript/index.ts b/src/initialization/initializeTypeScript/index.ts index bfe9009c4..c5710adf7 100644 --- a/src/initialization/initializeTypeScript/index.ts +++ b/src/initialization/initializeTypeScript/index.ts @@ -1,25 +1,44 @@ -import { initializeSources } from "../sources"; - -import { ProjectDescription } from "../initializeProject/shared"; -import { InitializationImprovement, initializeImprovements } from "./improvements"; -import { initializeTests } from "./initializeTests"; -import { writeMultiTypeScriptConfig } from "./writeMultiTypeScriptConfig"; -import { writeSingleTypeScriptConfig } from "./writeSingleTypeScriptConfig"; +import { ProjectDescription } from "../initializeProject/shared.js"; +import { initializeSources } from "../sources/index.js"; +import { + InitializationImprovement, + initializeImprovements, +} from "./improvements.js"; +import { initializeTests } from "./initializeTests.js"; +import { writeMultiTypeScriptConfig } from "./writeMultiTypeScriptConfig.js"; +import { writeSingleTypeScriptConfig } from "./writeSingleTypeScriptConfig.js"; export interface InitializeTypeScriptSettings { - fileName: string; - project: ProjectDescription; + fileName: string; + project: ProjectDescription; } -export const initializeTypeScript = async ({ fileName, project }: InitializeTypeScriptSettings) => { - const improvements = new Set(await initializeImprovements()); - const sourceFiles = await initializeSources({ fromJavaScript: false, project }); +export const initializeTypeScript = async ({ + fileName, + project, +}: InitializeTypeScriptSettings) => { + const improvements = new Set(await initializeImprovements()); + const sourceFiles = await initializeSources({ + fromJavaScript: false, + project, + }); - if (!improvements.has(InitializationImprovement.StrictNullChecks)) { - await writeSingleTypeScriptConfig({ fileName, improvements, project, sourceFiles }); - return; - } + if (!improvements.has(InitializationImprovement.StrictNullChecks)) { + await writeSingleTypeScriptConfig({ + fileName, + improvements, + project, + sourceFiles, + }); + return; + } - const testFiles = await initializeTests(); - await writeMultiTypeScriptConfig({ fileName, improvements, project, sourceFiles, testFiles }); + const testFiles = await initializeTests(); + await writeMultiTypeScriptConfig({ + fileName, + improvements, + project, + sourceFiles, + testFiles, + }); }; diff --git a/src/initialization/initializeTypeScript/initializeTests.ts b/src/initialization/initializeTypeScript/initializeTests.ts index f4a9afecb..3ddb75b15 100644 --- a/src/initialization/initializeTypeScript/initializeTests.ts +++ b/src/initialization/initializeTypeScript/initializeTests.ts @@ -4,44 +4,47 @@ const other = "other"; const none = "(none)"; export const initializeTests = async () => { - const builtIn = await initializeBuiltInTests(); - if (builtIn === none) return; + const builtIn = await initializeBuiltInTests(); - return builtIn === other ? getCustomTests() : builtIn; + if (builtIn === none) { + return; + } + + return builtIn === other ? getCustomTests() : builtIn; }; const initializeBuiltInTests = async () => { - const choices = [ - "lib/**/__tests__/*.test.{ts,tsx}", - "lib/**/*.test.{ts,tsx}", - "src/**/__tests__/*.test.{ts,tsx}", - "src/**/*.test.{ts,tsx}", - "test/**/*.{ts,tsx}", - none, - ]; - - const { testFiles } = await prompt<{ testFiles: string }>([ - { - choices, - initial: choices.length - 1, - message: "Which glob matches your test files?", - name: "testFiles", - type: "select", - }, - ]); - - return testFiles; + const choices = [ + "lib/**/__tests__/*.test.{ts,tsx}", + "lib/**/*.test.{ts,tsx}", + "src/**/__tests__/*.test.{ts,tsx}", + "src/**/*.test.{ts,tsx}", + "test/**/*.{ts,tsx}", + none, + ]; + + const { testFiles } = await prompt<{ testFiles: string }>([ + { + choices, + initial: choices.length - 1, + message: "Which glob matches your test files?", + name: "testFiles", + type: "select", + }, + ]); + + return testFiles; }; const getCustomTests = async () => { - const { testFiles } = await prompt<{ testFiles: string }>([ - { - initial: "test/**/*.{ts,tsx}", - message: "Where are your test files?", - name: "testFiles", - type: "text", - }, - ]); - - return testFiles; + const { testFiles } = await prompt<{ testFiles: string }>([ + { + initial: "test/**/*.{ts,tsx}", + message: "Where are your test files?", + name: "testFiles", + type: "text", + }, + ]); + + return testFiles; }; diff --git a/src/initialization/initializeTypeScript/writeMultiTypeScriptConfig.ts b/src/initialization/initializeTypeScript/writeMultiTypeScriptConfig.ts index bc5779415..9350cb3a0 100644 --- a/src/initialization/initializeTypeScript/writeMultiTypeScriptConfig.ts +++ b/src/initialization/initializeTypeScript/writeMultiTypeScriptConfig.ts @@ -1,61 +1,71 @@ -import { fs } from "mz"; -import { ProjectDescription } from "../initializeProject/shared"; +import * as fs from "node:fs/promises"; -import { InitializationImprovement } from "./improvements"; +import { ProjectDescription } from "../initializeProject/shared.js"; +import { InitializationImprovement } from "./improvements.js"; export interface MultiTypeScriptConfigSettings { - fileName: string; - improvements: ReadonlySet; - project: ProjectDescription; - sourceFiles?: string; - testFiles?: string; + fileName: string; + improvements: ReadonlySet; + project: ProjectDescription; + sourceFiles?: string; + testFiles?: string; } export const writeMultiTypeScriptConfig = async ({ - fileName, - improvements, - project, - sourceFiles, - testFiles, + fileName, + improvements, + project, + sourceFiles, + testFiles, }: MultiTypeScriptConfigSettings) => { - await fs.writeFile( - fileName, - JSON.stringify( - [ - { - fixes: { - ...printImprovements(improvements), - strictNonNullAssertions: true, - }, - ...(testFiles && { include: [testFiles] }), - projectPath: project.filePath, - types: { - strictNullChecks: true, - }, - }, - { - ...(testFiles && { exclude: [testFiles] }), - fixes: printImprovements(improvements), - ...(sourceFiles && { include: [sourceFiles] }), - projectPath: project.filePath, - }, - { - fixes: printImprovements(improvements), - ...(testFiles ? { include: [testFiles, sourceFiles] } : { include: [sourceFiles] }), - projectPath: project.filePath, - }, - ], - undefined, - 4, - ), - ); + await fs.writeFile( + fileName, + JSON.stringify( + [ + { + fixes: { + ...printImprovements(improvements), + strictNonNullAssertions: true, + }, + ...(testFiles && { include: [testFiles] }), + projectPath: project.filePath, + types: { + strictNullChecks: true, + }, + }, + { + ...(testFiles && { exclude: [testFiles] }), + fixes: printImprovements(improvements), + ...(sourceFiles && { include: [sourceFiles] }), + projectPath: project.filePath, + }, + { + fixes: printImprovements(improvements), + ...(testFiles + ? { include: [testFiles, sourceFiles] } + : { include: [sourceFiles] }), + projectPath: project.filePath, + }, + ], + undefined, + 4, + ), + ); }; -const printImprovements = (improvements: ReadonlySet) => { - return { - incompleteTypes: true, - ...(improvements.has(InitializationImprovement.NoImplicitAny) && { noImplicitAny: true }), - ...(improvements.has(InitializationImprovement.NoInferableTypes) && { inferableTypes: true }), - ...(improvements.has(InitializationImprovement.NoImplicitThis) && { noImplicitThis: true }), - }; +const printImprovements = ( + improvements: ReadonlySet, +) => { + return { + incompleteTypes: true, + ...(improvements.has(InitializationImprovement.NoImplicitAny) && { + noImplicitAny: true, + }), + ...(improvements.has(InitializationImprovement.NoInferableTypes) && { + inferableTypes: true, + }), + ...(improvements.has(InitializationImprovement.NoImplicitThis) && { + noImplicitThis: true, + }), + }; }; diff --git a/src/initialization/initializeTypeScript/writeSingleTypeScriptConfig.ts b/src/initialization/initializeTypeScript/writeSingleTypeScriptConfig.ts index 8c011022e..c4a0febb1 100644 --- a/src/initialization/initializeTypeScript/writeSingleTypeScriptConfig.ts +++ b/src/initialization/initializeTypeScript/writeSingleTypeScriptConfig.ts @@ -1,34 +1,45 @@ -import { fs } from "mz"; +import * as fs from "node:fs/promises"; -import { ProjectDescription } from "../initializeProject/shared"; -import { InitializationImprovement } from "./improvements"; +import { ProjectDescription } from "../initializeProject/shared.js"; +import { InitializationImprovement } from "./improvements.js"; export interface SingleTypeScriptConfigSettings { - fileName: string; - project: ProjectDescription; - improvements: ReadonlySet; - sourceFiles?: string; + fileName: string; + improvements: ReadonlySet; + project: ProjectDescription; + sourceFiles?: string; } -export const writeSingleTypeScriptConfig = async ({ fileName, project, sourceFiles, improvements }: SingleTypeScriptConfigSettings) => { - await fs.writeFile( - fileName, - JSON.stringify( - { - fixes: printImprovements(improvements), - ...(sourceFiles && { include: [sourceFiles] }), - projectPath: project.filePath, - }, - undefined, - 4, - ), - ); +export const writeSingleTypeScriptConfig = async ({ + fileName, + improvements, + project, + sourceFiles, +}: SingleTypeScriptConfigSettings) => { + await fs.writeFile( + fileName, + JSON.stringify( + { + fixes: printImprovements(improvements), + ...(sourceFiles && { include: [sourceFiles] }), + projectPath: project.filePath, + }, + undefined, + 4, + ), + ); }; -const printImprovements = (improvements: ReadonlySet) => { - return { - incompleteTypes: true, - ...(improvements.has(InitializationImprovement.NoImplicitAny) && { noImplicitAny: true }), - ...(improvements.has(InitializationImprovement.NoImplicitThis) && { noImplicitThis: true }), - }; +const printImprovements = ( + improvements: ReadonlySet, +) => { + return { + incompleteTypes: true, + ...(improvements.has(InitializationImprovement.NoImplicitAny) && { + noImplicitAny: true, + }), + ...(improvements.has(InitializationImprovement.NoImplicitThis) && { + noImplicitThis: true, + }), + }; }; diff --git a/src/initialization/sources/index.ts b/src/initialization/sources/index.ts index 157deae8d..21cc22b31 100644 --- a/src/initialization/sources/index.ts +++ b/src/initialization/sources/index.ts @@ -1,79 +1,91 @@ import { prompt } from "enquirer"; -import { fs } from "mz"; +import * as fs from "node:fs/promises"; -import { ProjectDescription } from "../initializeProject/shared"; +import { ProjectDescription } from "../initializeProject/shared.js"; export interface InitializeSourcesSettings { - fromJavaScript: boolean; - project: ProjectDescription; + fromJavaScript: boolean; + project: ProjectDescription; } const everything = "everything"; const other = "other"; -export const initializeSources = async (settings: InitializeSourcesSettings) => { - const completion = settings.fromJavaScript ? "/**/*.{js,jsx}" : "/**/*.{ts,tsx}"; - const builtIn = await initializeBuiltInSources(completion, settings.project); +export const initializeSources = async ( + settings: InitializeSourcesSettings, +) => { + const completion = settings.fromJavaScript + ? "/**/*.{js,jsx}" + : "/**/*.{ts,tsx}"; + const builtIn = await initializeBuiltInSources(completion); - if (builtIn === other) { - return await getCustomSources(completion); - } + if (builtIn === other) { + return await getCustomSources(completion); + } - if (builtIn === everything) { - return undefined; - } + if (builtIn === everything) { + return undefined; + } - if (settings.project.created) { - await fs.writeFile( - settings.project.filePath, - JSON.stringify( - { - ...JSON.parse((await fs.readFile(settings.project.filePath)).toString()), - include: [builtIn.replace(/\*\.\{(j|t)s\,(j|t)sx\}/, "").replace(/\/\*\*\/$/, "")], - }, - null, - 4, - ), - ); - } + if (settings.project.created) { + await fs.writeFile( + settings.project.filePath, + JSON.stringify( + { + ...JSON.parse( + (await fs.readFile(settings.project.filePath)).toString(), + ), + include: [ + builtIn + .replace(/\*\.\{(?:j|t)s,(?:j|t)sx\}/, "") + .replace(/\/\*\*\/$/, ""), + ], + }, + null, + 4, + ), + ); + } - return builtIn; + return builtIn; }; -const initializeBuiltInSources = async (completion: string, project: ProjectDescription) => { - // https://github.com/enquirer/enquirer/issues/202 - const choices: string[] = [ - { - message: "everything in my tsconfig.json", - name: everything, - } as any, - `lib${completion}`, - `src${completion}`, - other, - ]; +const initializeBuiltInSources = async (completion: string) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + const choices: string[] = [ + { + message: "everything in my tsconfig.json", + name: everything, + // https://github.com/enquirer/enquirer/issues/202 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + } as any, + `lib${completion}`, + `src${completion}`, + other, + ]; - const { sourceFiles } = await prompt<{ sourceFiles: string }>([ - { - choices, - initial: choices.length - 1, - message: "Which glob matches files you'd like to convert?", - name: "sourceFiles", - type: "select", - }, - ]); + const { sourceFiles } = await prompt<{ sourceFiles: string }>([ + { + choices, + initial: choices.length - 1, + message: "Which glob matches files you'd like to convert?", + name: "sourceFiles", + type: "select", + }, + ]); - return sourceFiles; + return sourceFiles; }; const getCustomSources = async (completion: string) => { - const { sourceFiles } = await prompt<{ sourceFiles: string }>([ - { - initial: `src${completion}`, - message: "Which files would you like to convert?", - name: "sourceFiles", - type: "text", - }, - ]); + const { sourceFiles } = await prompt<{ sourceFiles: string }>([ + { + initial: `src${completion}`, + message: "Which files would you like to convert?", + name: "sourceFiles", + type: "text", + }, + ]); - return sourceFiles; + return sourceFiles; }; diff --git a/src/mutations/aliasing/aliases.ts b/src/mutations/aliasing/aliases.ts index 4f4efc773..b80dbd9de 100644 --- a/src/mutations/aliasing/aliases.ts +++ b/src/mutations/aliasing/aliases.ts @@ -1,34 +1,38 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; /** * Type flags and aliases to check when --strictNullChecks is not enabled. */ const nonStrictTypeFlagAliases = new Map([ - [ts.TypeFlags.Boolean, "boolean"], - [ts.TypeFlags.BooleanLiteral, "boolean"], - [ts.TypeFlags.Number, "number"], - [ts.TypeFlags.NumberLiteral, "number"], - [ts.TypeFlags.String, "string"], - [ts.TypeFlags.StringLiteral, "string"], + [ts.TypeFlags.Boolean, "boolean"], + [ts.TypeFlags.BooleanLiteral, "boolean"], + [ts.TypeFlags.Number, "number"], + [ts.TypeFlags.NumberLiteral, "number"], + [ts.TypeFlags.String, "string"], + [ts.TypeFlags.StringLiteral, "string"], ]); /** * Type flags and aliases to check when --strictNullChecks is enabled. */ const strictTypeFlagsWithAliases = new Map([ - ...nonStrictTypeFlagAliases, - [ts.TypeFlags.Null, "null"], - [ts.TypeFlags.Undefined, "undefined"], + ...nonStrictTypeFlagAliases, + [ts.TypeFlags.Null, "null"], + [ts.TypeFlags.Undefined, "undefined"], ]); /** * @returns Built-in type flags and aliases per overall request strictNullChecks setting. */ -export const getApplicableTypeAliases = (request: FileMutationsRequest, alwaysAllowStrictNullCheckAliases = false) => - alwaysAllowStrictNullCheckAliases || - request.options.types.strictNullChecks || - request.services.program.getCompilerOptions().strictNullChecks - ? strictTypeFlagsWithAliases - : nonStrictTypeFlagAliases; +export const getApplicableTypeAliases = ( + request: FileMutationsRequest, + alwaysAllowStrictNullCheckAliases = false, +) => + alwaysAllowStrictNullCheckAliases || + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + request.options.types.strictNullChecks || + request.services.program.getCompilerOptions().strictNullChecks + ? strictTypeFlagsWithAliases + : nonStrictTypeFlagAliases; diff --git a/src/mutations/aliasing/joinIntoType.ts b/src/mutations/aliasing/joinIntoType.ts index 28ae9597a..d9ac0f361 100644 --- a/src/mutations/aliasing/joinIntoType.ts +++ b/src/mutations/aliasing/joinIntoType.ts @@ -1,18 +1,22 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { isNotUndefined, uniquify } from "../../shared/arrays"; -import { getApplicableTypeAliases } from "./aliases"; +import { isNotUndefined, uniquify } from "../../shared/arrays.js"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { getApplicableTypeAliases } from "./aliases.js"; -export const joinIntoType = (flags: ReadonlySet, types: ReadonlySet, request: FileMutationsRequest) => { - const alias = getApplicableTypeAliases(request); +export const joinIntoType = ( + flags: ReadonlySet, + types: ReadonlySet, + request: FileMutationsRequest, +) => { + const alias = getApplicableTypeAliases(request); - return uniquify( - ...Array.from(types) - .map((type) => request.services.printers.type(type)) - .map((type) => (type.includes("=>") ? `(${type})` : type)), - ...Array.from(flags) - .map((flag) => alias.get(flag)) - .filter(isNotUndefined), - ).join(" | "); + return uniquify( + ...Array.from(types) + .map((type) => request.services.printers.type(type)) + .map((type) => (type.includes("=>") ? `(${type})` : type)), + ...Array.from(flags) + .map((flag) => alias.get(flag)) + .filter(isNotUndefined), + ).join(" | "); }; diff --git a/src/mutations/arrays.ts b/src/mutations/arrays.ts index 80feb4367..bf56807e4 100644 --- a/src/mutations/arrays.ts +++ b/src/mutations/arrays.ts @@ -1,5 +1,5 @@ export const constructArrayShorthand = (genericTypeNames: string[]) => { - const body = genericTypeNames.join(" | "); + const body = genericTypeNames.join(" | "); - return body.includes(" ") ? `(${body})[]` : `${body}[]`; + return body.includes(" ") ? `(${body})[]` : `${body}[]`; }; diff --git a/src/mutations/assignments.ts b/src/mutations/assignments.ts index 5f975c3d9..df30db585 100644 --- a/src/mutations/assignments.ts +++ b/src/mutations/assignments.ts @@ -1,56 +1,64 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../shared/fileMutator"; -import { getTypeAtLocationIfNotError } from "../shared/types"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../shared/types.js"; export interface AssignedTypeValue { - /** - * Name of an added child property, if not an entirely new value literal. - */ - name?: string; - - /** - * Type being added as a property or set as a complete type. - * - * @remarks It is strongly preferable to provide this as a Type, so it can be deduplicated later on. - */ - type: ts.Type | string; + /** + * Name of an added child property, if not an entirely new value literal. + */ + name?: string | undefined; + + /** + * Type being added as a property or set as a complete type. + * It is strongly preferable to provide this as a Type, so it can be deduplicated later on. + */ + type: string | ts.Type; } /** * For each new member of a type, a string or type representation of what it is known to be assigned. */ -export type AssignedTypesByName = Map; +export type AssignedTypesByName = Map; /** * Joins a set of assigned type values into a single mapping by name. */ -export const joinAssignedTypesByName = (request: FileMutationsRequest, assignedTypeValues: readonly AssignedTypeValue[]) => { - const assignedTypesByName = new Map(); - - for (const { name, type } of assignedTypeValues) { - // If the type comes with its own name, it's for a single property - if (name !== undefined) { - assignedTypesByName.set(name, type); - continue; - } - - // Types without names are spread to convey multiple properties - if (typeof type !== "string") { - for (const property of type.getProperties()) { - const declarations = property.getDeclarations(); - const relevantDeclaration = declarations === undefined ? property.valueDeclaration : declarations[0]; - if (relevantDeclaration === undefined) { - continue; - } - - const propertyType = getTypeAtLocationIfNotError(request, relevantDeclaration); - if (propertyType !== undefined) { - assignedTypesByName.set(property.name, propertyType); - } - } - } - } - - return assignedTypesByName; +export const joinAssignedTypesByName = ( + request: FileMutationsRequest, + assignedTypeValues: readonly AssignedTypeValue[], +) => { + const assignedTypesByName = new Map(); + + for (const { name, type } of assignedTypeValues) { + // If the type comes with its own name, it's for a single property + if (name !== undefined) { + assignedTypesByName.set(name, type); + continue; + } + + // Types without names are spread to convey multiple properties + if (typeof type !== "string") { + for (const property of type.getProperties()) { + const declarations = property.getDeclarations(); + const relevantDeclaration = + declarations === undefined + ? property.valueDeclaration + : declarations[0]; + if (relevantDeclaration === undefined) { + continue; + } + + const propertyType = getTypeAtLocationIfNotError( + request, + relevantDeclaration, + ); + if (propertyType !== undefined) { + assignedTypesByName.set(property.name, propertyType); + } + } + } + } + + return assignedTypesByName; }; diff --git a/src/mutations/codeFixes/addMissingProperty.ts b/src/mutations/codeFixes/addMissingProperty.ts index a11fabf5e..fe20509de 100644 --- a/src/mutations/codeFixes/addMissingProperty.ts +++ b/src/mutations/codeFixes/addMissingProperty.ts @@ -1,48 +1,53 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; - -import { createCodeFixCreationMutation } from "./creation"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { createCodeFixCreationMutation } from "./creation.js"; /** * Error code for the TypeScript language service to add a missing property. */ const fixMissingPropertyErrorCode = 2339; -export const getMissingPropertyMutations = (request: FileMutationsRequest, node: ts.PropertyAccessExpression): Mutation | undefined => { - // Skip nodes that aren't setting a member of a `this` node - if (!nodeIsSettingThisMember(node)) { - return undefined; - } - - const codeFixes = getMissingPropertyCodeFixes(node, request); - if (codeFixes.length === 0) { - return undefined; - } - - return createCodeFixCreationMutation(request, codeFixes); +export const getMissingPropertyMutations = ( + request: FileMutationsRequest, + node: ts.PropertyAccessExpression, +): Mutation | undefined => { + // Skip nodes that aren't setting a member of a `this` node + if (!nodeIsSettingThisMember(node)) { + return undefined; + } + + const codeFixes = getMissingPropertyCodeFixes(node, request); + if (codeFixes.length === 0) { + return undefined; + } + + return createCodeFixCreationMutation(codeFixes); }; /** * @returns Whether a property access is setting a 'this' member. */ const nodeIsSettingThisMember = (node: ts.PropertyAccessExpression): boolean => - ts.isBinaryExpression(node.parent) && - node.parent.operatorToken.kind === ts.SyntaxKind.EqualsToken && - node.expression.kind === ts.SyntaxKind.ThisKeyword; + ts.isBinaryExpression(node.parent) && + node.parent.operatorToken.kind === ts.SyntaxKind.EqualsToken && + node.expression.kind === ts.SyntaxKind.ThisKeyword; /** * Uses a requesting language service to get missing property code fixes for a type of node. */ -const getMissingPropertyCodeFixes = (node: ts.PropertyAccessExpression, request: FileMutationsRequest) => - request.services.languageService.getCodeFixesAtPosition( - request.sourceFile.fileName, - node.name.getStart(request.sourceFile), - node.end, - [fixMissingPropertyErrorCode], - { - insertSpaceBeforeAndAfterBinaryOperators: true, - }, - {}, - ); +const getMissingPropertyCodeFixes = ( + node: ts.PropertyAccessExpression, + request: FileMutationsRequest, +) => + request.services.languageService.getCodeFixesAtPosition( + request.sourceFile.fileName, + node.name.getStart(request.sourceFile), + node.end, + [fixMissingPropertyErrorCode], + { + insertSpaceBeforeAndAfterBinaryOperators: true, + }, + {}, + ); diff --git a/src/mutations/codeFixes/creation.ts b/src/mutations/codeFixes/creation.ts index 9eadbde12..ce1e07d68 100644 --- a/src/mutations/codeFixes/creation.ts +++ b/src/mutations/codeFixes/creation.ts @@ -1,55 +1,65 @@ -import { combineMutations, MultipleMutations, TextInsertMutation } from "automutate"; -import * as ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; +import { + MultipleMutations, + TextInsertMutation, + combineMutations, +} from "automutate"; +import ts from "typescript"; export interface CodeFixCreationPreferences { - ignoreKnownBlankTypes?: boolean; + ignoreKnownBlankTypes?: boolean; } -const knownBlankTypes = new Set([": {}", ": any", ": never", ": null", ": Object", ": unknown"]); +const knownBlankTypes = new Set([ + ": {}", + ": any", + ": never", + ": null", + ": Object", + ": unknown", +]); /** * Attempts to convert a language service code fix into a usable mutation. - * * @param codeFixes Code fixes from a language service. * @returns Equivalent mutation, if possible. */ export const createCodeFixCreationMutation = ( - request: FileMutationsRequest, - codeFixes: ReadonlyArray, - preferences: CodeFixCreationPreferences = {}, + codeFixes: readonly ts.CodeFixAction[], + preferences: CodeFixCreationPreferences = {}, ): MultipleMutations | undefined => { - if (codeFixes.length === 0) { - return undefined; - } + if (codeFixes.length === 0) { + return undefined; + } - const { changes } = codeFixes[0]; - if (changes.length === 0) { - return undefined; - } + const { changes } = codeFixes[0]; + if (changes.length === 0) { + return undefined; + } - let { textChanges } = changes[0]; + let { textChanges } = changes[0]; - if (preferences.ignoreKnownBlankTypes) { - textChanges = textChanges.filter((textChange) => !knownBlankTypes.has(textChange.newText)); - } + if (preferences.ignoreKnownBlankTypes) { + textChanges = textChanges.filter( + (textChange) => !knownBlankTypes.has(textChange.newText), + ); + } - const simplifiedTextChanges = simplifyTextChanges(textChanges); - if (simplifiedTextChanges === undefined) { - return undefined; - } + const simplifiedTextChanges = simplifyTextChanges(textChanges); + if (simplifiedTextChanges === undefined) { + return undefined; + } - return combineMutations( - ...simplifiedTextChanges.map( - (textChange): TextInsertMutation => ({ - insertion: textChange.newText, - range: { - begin: textChange.span.start, - }, - type: "text-insert", - }), - ), - ); + return combineMutations( + ...simplifiedTextChanges.map( + (textChange): TextInsertMutation => ({ + insertion: textChange.newText, + range: { + begin: textChange.span.start, + }, + type: "text-insert", + }), + ), + ); }; /** @@ -58,31 +68,33 @@ export const createCodeFixCreationMutation = ( * @see https://github.com/JoshuaKGoldberg/TypeStat/issues/256 */ const simplifyTextChanges = (textChanges: readonly ts.TextChange[]) => { - if (textChanges.length === 0 || isOnlyParenthesis(textChanges)) { - return undefined; - } + if (textChanges.length === 0 || isOnlyParenthesis(textChanges)) { + return undefined; + } - return textChanges.slice(1).reduce( - (previousValues, textChange) => { - const previousValue = previousValues[previousValues.length - 1]; + return textChanges.slice(1).reduce( + (previousValues, textChange) => { + const previousValue = previousValues[previousValues.length - 1]; - // If the span starts aren't the same, there's nothing we can simplify - if (previousValue.span.start !== textChange.span.start) { - return [...previousValues, textChange]; - } + // If the span starts aren't the same, there's nothing we can simplify + if (previousValue.span.start !== textChange.span.start) { + return [...previousValues, textChange]; + } - // Since two text changes in a row have the same start, rejoice! - // We can combine them into a single value and lessen the array size - previousValues[previousValues.length - 1] = { - ...previousValue, - newText: `${previousValue.newText}${textChange.newText}`, - }; + // Since two text changes in a row have the same start, rejoice! + // We can combine them into a single value and lessen the array size + previousValues[previousValues.length - 1] = { + ...previousValue, + newText: `${previousValue.newText}${textChange.newText}`, + }; - return previousValues; - }, - [textChanges[0]], - ); + return previousValues; + }, + [textChanges[0]], + ); }; const isOnlyParenthesis = (textChanges: readonly ts.TextChange[]) => - textChanges.length === 2 && textChanges[0].newText === "(" && textChanges[1].newText === ")"; + textChanges.length === 2 && + textChanges[0].newText === "(" && + textChanges[1].newText === ")"; diff --git a/src/mutations/codeFixes/getCodeFixIfMatchedByDiagnostic.ts b/src/mutations/codeFixes/getCodeFixIfMatchedByDiagnostic.ts index 8814d5328..b5852aab5 100644 --- a/src/mutations/codeFixes/getCodeFixIfMatchedByDiagnostic.ts +++ b/src/mutations/codeFixes/getCodeFixIfMatchedByDiagnostic.ts @@ -1,37 +1,43 @@ -import * as ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; +import ts from "typescript"; + +import { FileMutationsRequest } from "../../shared/fileMutator.js"; /** * Uses a requesting language service to get code fixes for a type of node. - * * @param request Source file, metadata, and settings to collect mutations in the file. * @param node Requesting node to retrieve fixes on. - * @param errorCode Diagnostic code to retrieve matched fixes for. - * @remarks + * @param errorCodes Diagnostic code to retrieve matched fixes for. * TypeScript's `getCodeFixesAtPosition` API doesn't check whether the diagnostic actually is being * emitted for the node. So we must. */ -export const getCodeFixIfMatchedByDiagnostic = (request: FileMutationsRequest, node: ts.Node, errorCodes: number[]) => { - const semanticDiagnostics = request.services.languageService.getSemanticDiagnostics(request.sourceFile.fileName); - if ( - !semanticDiagnostics.some( - (diagnostic) => - errorCodes.includes(diagnostic.code) && - diagnostic.start && - diagnostic.length && - diagnostic.start >= node.pos && - diagnostic.start + diagnostic.length <= node.end, - ) - ) { - return undefined; - } +export const getCodeFixIfMatchedByDiagnostic = ( + request: FileMutationsRequest, + node: ts.Node, + errorCodes: number[], +) => { + const semanticDiagnostics = + request.services.languageService.getSemanticDiagnostics( + request.sourceFile.fileName, + ); + if ( + !semanticDiagnostics.some( + (diagnostic) => + errorCodes.includes(diagnostic.code) && + diagnostic.start && + diagnostic.length && + diagnostic.start >= node.pos && + diagnostic.start + diagnostic.length <= node.end, + ) + ) { + return undefined; + } - return request.services.languageService.getCodeFixesAtPosition( - request.sourceFile.fileName, - node.getStart(request.sourceFile), - node.end, - errorCodes, - { insertSpaceBeforeAndAfterBinaryOperators: true }, - {}, - ); + return request.services.languageService.getCodeFixesAtPosition( + request.sourceFile.fileName, + node.getStart(request.sourceFile), + node.end, + errorCodes, + { insertSpaceBeforeAndAfterBinaryOperators: true }, + {}, + ); }; diff --git a/src/mutations/codeFixes/noImplicitAny.ts b/src/mutations/codeFixes/noImplicitAny.ts index 129fe82c4..6847561de 100644 --- a/src/mutations/codeFixes/noImplicitAny.ts +++ b/src/mutations/codeFixes/noImplicitAny.ts @@ -1,57 +1,69 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { getTypeAtLocationIfNotError } from "../../shared/types"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../shared/types.js"; +import { createCodeFixCreationMutation } from "./creation.js"; +import { getCodeFixIfMatchedByDiagnostic } from "./getCodeFixIfMatchedByDiagnostic.js"; -import { createCodeFixCreationMutation } from "./creation"; -import { getCodeFixIfMatchedByDiagnostic } from "./getCodeFixIfMatchedByDiagnostic"; +export type NoImplicitAnyNode = + | ts.ParameterDeclaration + | ts.PropertyDeclaration + | ts.VariableDeclaration; -export type NoImplicitAnyNode = ts.ParameterDeclaration | ts.PropertyDeclaration | ts.VariableDeclaration; - -export type NoImplictAnyNodeToBeFixed = NoImplicitAnyNode & { - initializer: undefined; - type: undefined; +export type NoImplicitAnyNodeToBeFixed = NoImplicitAnyNode & { + initializer: undefined; + type: undefined; }; /** * Error codes for the TypeScript language service to get --noImplicitAny code fixes. */ enum NoImplicitAnyErrorCode { - Parameter = 7006, - PropertyOrVariable = 7005, + Parameter = 7006, + PropertyOrVariable = 7005, } -export const canNodeBeFixedForNoImplicitAny = (node: NoImplicitAnyNode): node is NoImplictAnyNodeToBeFixed => - node.type === undefined && - node.initializer === undefined && - // TypeScript still provides --noImplicitAny fixes for variables that can't receive them - // @see https://github.com/JoshuaKGoldberg/TypeStat/issues/77 - !ts.isCatchClause(node.parent) && - // TypeScript provides all parameters' --noImplicitAny fixes when asked for any parameter, so only request on the first - (!ts.isParameter(node) || node === node.parent.parameters[0]); - -export const getNoImplicitAnyMutations = (node: NoImplictAnyNodeToBeFixed, request: FileMutationsRequest): Mutation | undefined => { - // If the node is a parameter, make sure it doesn't already have an inferable type - // (TypeScript will still suggest a codefix to make a redundant inferred type) - if (ts.isParameter(node)) { - const nodeType = getTypeAtLocationIfNotError(request, node); - if (nodeType === undefined || !tsutils.isTypeFlagSet(nodeType, ts.TypeFlags.Any)) { - return undefined; - } - } - - // Retrieve code fix suggestions for --noImplicitAny from the requesting language service - const codeFixes = getCodeFixIfMatchedByDiagnostic(request, node, [ - ts.isParameter(node) ? NoImplicitAnyErrorCode.Parameter : NoImplicitAnyErrorCode.PropertyOrVariable, - ]); - if (!codeFixes?.length) { - return undefined; - } - - // Convert those code fix suggestions to our own mutations format - return createCodeFixCreationMutation(request, codeFixes, { - ignoreKnownBlankTypes: true, - }); +export const canNodeBeFixedForNoImplicitAny = ( + node: NoImplicitAnyNode, +): node is NoImplicitAnyNodeToBeFixed => + node.type === undefined && + node.initializer === undefined && + // TypeScript still provides --noImplicitAny fixes for variables that can't receive them + // @see https://github.com/JoshuaKGoldberg/TypeStat/issues/77 + !ts.isCatchClause(node.parent) && + // TypeScript provides all parameters' --noImplicitAny fixes when asked for any parameter, so only request on the first + (!ts.isParameter(node) || node === node.parent.parameters[0]); + +export const getNoImplicitAnyMutations = ( + node: NoImplicitAnyNodeToBeFixed, + request: FileMutationsRequest, +): Mutation | undefined => { + // If the node is a parameter, make sure it doesn't already have an inferable type + // (TypeScript will still suggest a codefix to make a redundant inferred type) + if (ts.isParameter(node)) { + const nodeType = getTypeAtLocationIfNotError(request, node); + if ( + nodeType === undefined || + !tsutils.isTypeFlagSet(nodeType, ts.TypeFlags.Any) + ) { + return undefined; + } + } + + // Retrieve code fix suggestions for --noImplicitAny from the requesting language service + const codeFixes = getCodeFixIfMatchedByDiagnostic(request, node, [ + ts.isParameter(node) + ? NoImplicitAnyErrorCode.Parameter + : NoImplicitAnyErrorCode.PropertyOrVariable, + ]); + if (!codeFixes?.length) { + return undefined; + } + + // Convert those code fix suggestions to our own mutations format + return createCodeFixCreationMutation(codeFixes, { + ignoreKnownBlankTypes: true, + }); }; diff --git a/src/mutations/codeFixes/noImplicitThis.ts b/src/mutations/codeFixes/noImplicitThis.ts index c0d6042af..803d071df 100644 --- a/src/mutations/codeFixes/noImplicitThis.ts +++ b/src/mutations/codeFixes/noImplicitThis.ts @@ -1,19 +1,27 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; - -import { createCodeFixCreationMutation } from "./creation"; -import { getCodeFixIfMatchedByDiagnostic } from "./getCodeFixIfMatchedByDiagnostic"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { createCodeFixCreationMutation } from "./creation.js"; +import { getCodeFixIfMatchedByDiagnostic } from "./getCodeFixIfMatchedByDiagnostic.js"; /** * Error code for the TypeScript language service to get --noImplicitThis code fixes. */ const noImplicitThisErrorCodes = [2683]; -export const getNoImplicitThisMutations = (node: ts.ThisExpression, request: FileMutationsRequest): Mutation | undefined => { - // Create a mutation for the code fixes if anything is available - const codeFixes = getCodeFixIfMatchedByDiagnostic(request, node, noImplicitThisErrorCodes); +export const getNoImplicitThisMutations = ( + node: ts.ThisExpression, + request: FileMutationsRequest, +): Mutation | undefined => { + // Create a mutation for the code fixes if anything is available + const codeFixes = getCodeFixIfMatchedByDiagnostic( + request, + node, + noImplicitThisErrorCodes, + ); - return !codeFixes?.length ? undefined : createCodeFixCreationMutation(request, codeFixes); + return !codeFixes?.length + ? undefined + : createCodeFixCreationMutation(codeFixes); }; diff --git a/src/mutations/collecting.ts b/src/mutations/collecting.ts index 372369f63..49e5d584c 100644 --- a/src/mutations/collecting.ts +++ b/src/mutations/collecting.ts @@ -1,154 +1,175 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../shared/fileMutator"; -import { isKnownGlobalBaseType } from "../shared/nodeTypes"; -import { setSubtract } from "../shared/sets"; - -import { getApplicableTypeAliases } from "./aliasing/aliases"; -import { findMissingFlags, isTypeFlagSetRecursively } from "./collecting/flags"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { isKnownGlobalBaseType } from "../shared/nodeTypes.js"; +import { setSubtract } from "../shared/sets.js"; +import { getApplicableTypeAliases } from "./aliasing/aliases.js"; +import { + findMissingFlags, + isTypeFlagSetRecursively, +} from "./collecting/flags.js"; /** * Collects assigned and missing flags and types, recursively accounting for type unions. - * * @param request Metadata and settings to collect mutations in a file. * @param declaredType Original type declared on a node. * @param allAssignedTypes All types immediately or later assigned to the node. */ export const collectUsageFlagsAndSymbols = ( - request: FileMutationsRequest, - declaredType: ts.Type, - allAssignedTypes: readonly ts.Type[], + request: FileMutationsRequest, + declaredType: ts.Type, + allAssignedTypes: readonly ts.Type[], ) => { - // Collect which flags are later assigned to the type - const [assignedFlags, assignedTypes] = collectFlagsAndTypesFromTypes(request, allAssignedTypes); - - // If the declared type is the general 'any', then we assume all are missing - // Similarly, if it's a plain Function or Object, we'll want to replace its contents - if (declaredType.flags & ts.TypeFlags.Any || isKnownGlobalBaseType(declaredType)) { - return { - assignedFlags, - assignedTypes, - missingFlags: assignedFlags, - missingTypes: assignedTypes, - }; - } - - // Otherwise, collect which flags and types are declared (as a type annotation)... - const [declaredFlags, declaredTypes] = collectFlagsAndTypesFromTypes(request, [declaredType]); - - // Subtract the above to find any flags or types assigned but not declared - return { - assignedFlags, - assignedTypes, - missingFlags: findMissingFlags(declaredType, assignedFlags, declaredFlags), - missingTypes: findMissingTypes(request, assignedTypes, declaredTypes), - }; + // Collect which flags are later assigned to the type + const [assignedFlags, assignedTypes] = collectFlagsAndTypesFromTypes( + request, + allAssignedTypes, + ); + + // If the declared type is the general 'any', then we assume all are missing + // Similarly, if it's a plain Function or Object, we'll want to replace its contents + if ( + declaredType.flags & ts.TypeFlags.Any || + isKnownGlobalBaseType(declaredType) + ) { + return { + assignedFlags, + assignedTypes, + missingFlags: assignedFlags, + missingTypes: assignedTypes, + }; + } + + // Otherwise, collect which flags and types are declared (as a type annotation)... + const [declaredFlags, declaredTypes] = collectFlagsAndTypesFromTypes( + request, + [declaredType], + ); + + // Subtract the above to find any flags or types assigned but not declared + return { + assignedFlags, + assignedTypes, + missingFlags: findMissingFlags(declaredType, assignedFlags, declaredFlags), + missingTypes: findMissingTypes(request, assignedTypes, declaredTypes), + }; }; /** * Separates raw type node(s) into their contained flags and types. - * - * @param options Source file, metadata, and settings to collect mutations in the file. + * @param request Metadata and settings to collect mutations in a file. * @param allTypes Any number of raw type nodes. * @param allowStrictNullCheckAliases Whether to allow `null` and `undefined` aliases regardless of compiler strictness. * @returns Flags and types found within the raw type nodes. */ export const collectFlagsAndTypesFromTypes = ( - request: FileMutationsRequest, - allTypes: readonly ts.Type[], - allowStrictNullCheckAliases?: boolean, + request: FileMutationsRequest, + allTypes: readonly ts.Type[], + allowStrictNullCheckAliases?: boolean, ): [Set, Set] => { - const foundFlags = new Set(); - const foundTypes = new Set(); - const applicableTypeAliases = getApplicableTypeAliases(request, allowStrictNullCheckAliases); - - // Scan each type for undeclared type additions - for (const type of allTypes) { - // For any simple type flag we later will care about for aliasing, add it if it's in the type - for (const [typeFlag] of applicableTypeAliases) { - if (isTypeFlagSetRecursively(type, typeFlag)) { - foundFlags.add(typeFlag); - } - } - - // If the type is a rich type (has a symbol), add it in directly - if (type.getSymbol() !== undefined) { - foundTypes.add(type); - continue; - } - - // If the type is a union, add any flags or types found within it - if (tsutils.isUnionType(type)) { - const subTypes = recursivelyCollectSubTypes(type); - const [subFlags, deepSubTypes] = collectFlagsAndTypesFromTypes(request, subTypes); - - for (const subFlag of subFlags) { - foundFlags.add(subFlag); - } - - for (const deepSubType of deepSubTypes) { - foundTypes.add(deepSubType); - } - } - } - - return [foundFlags, foundTypes]; + const foundFlags = new Set(); + const foundTypes = new Set(); + const applicableTypeAliases = getApplicableTypeAliases( + request, + allowStrictNullCheckAliases, + ); + + // Scan each type for undeclared type additions + for (const type of allTypes) { + // For any simple type flag we later will care about for aliasing, add it if it's in the type + for (const [typeFlag] of applicableTypeAliases) { + if (isTypeFlagSetRecursively(type, typeFlag)) { + foundFlags.add(typeFlag); + } + } + + // If the type is a rich type (has a symbol), add it in directly + if (type.getSymbol() !== undefined) { + foundTypes.add(type); + continue; + } + + // If the type is a union, add any flags or types found within it + if (tsutils.isUnionType(type)) { + const subTypes = recursivelyCollectSubTypes(type); + const [subFlags, deepSubTypes] = collectFlagsAndTypesFromTypes( + request, + subTypes, + ); + + for (const subFlag of subFlags) { + foundFlags.add(subFlag); + } + + for (const deepSubType of deepSubTypes) { + foundTypes.add(deepSubType); + } + } + } + + return [foundFlags, foundTypes]; }; export const recursivelyCollectSubTypes = (type: ts.UnionType): ts.Type[] => { - const subTypes: ts.Type[] = []; + const subTypes: ts.Type[] = []; - for (const subType of type.types) { - if (tsutils.isUnionType(subType)) { - subTypes.push(...recursivelyCollectSubTypes(subType)); - } else { - subTypes.push(subType); - } - } + for (const subType of type.types) { + if (tsutils.isUnionType(subType)) { + subTypes.push(...recursivelyCollectSubTypes(subType)); + } else { + subTypes.push(subType); + } + } - return subTypes; + return subTypes; }; const findMissingTypes = ( - request: FileMutationsRequest, - assignedTypes: ReadonlySet, - declaredTypes: ReadonlySet, + request: FileMutationsRequest, + assignedTypes: ReadonlySet, + declaredTypes: ReadonlySet, ): ReadonlySet => { - // If anything is of type `any`, then bail out immediately: we have no idea what's missing - for (const type of [...assignedTypes, ...declaredTypes]) { - if (isTypeFlagSetRecursively(type, ts.TypeFlags.Any)) { - return new Set(); - } - } - - const declaredTypesContainFunction = Array.from(declaredTypes).some(typeContainsFunction); - const remainingMissingTypes = new Set(assignedTypes); - - const isAssignedTypeMissingFromDeclared = (assignedType: ts.Type) => { - // We ignore assigned function types when the declared type(s) include function(s). - // These non-assigned function types are more likely what users would consider bugs. - // For example, covariant functions might not be assignable, but should be fixed manually. - if (declaredTypesContainFunction && typeContainsFunction(assignedType)) { - return false; - } - - for (const potentialParentType of declaredTypes) { - if (request.services.program.getTypeChecker().isTypeAssignableTo(assignedType, potentialParentType)) { - return false; - } - } - - return true; - }; - - for (const assignedType of assignedTypes) { - if (!isAssignedTypeMissingFromDeclared(assignedType)) { - remainingMissingTypes.delete(assignedType); - } - } - - return setSubtract(remainingMissingTypes, declaredTypes); + // If anything is of type `any`, then bail out immediately: we have no idea what's missing + for (const type of [...assignedTypes, ...declaredTypes]) { + if (isTypeFlagSetRecursively(type, ts.TypeFlags.Any)) { + return new Set(); + } + } + + const declaredTypesContainFunction = + Array.from(declaredTypes).some(typeContainsFunction); + const remainingMissingTypes = new Set(assignedTypes); + + const isAssignedTypeMissingFromDeclared = (assignedType: ts.Type) => { + // We ignore assigned function types when the declared type(s) include function(s). + // These non-assigned function types are more likely what users would consider bugs. + // For example, covariant functions might not be assignable, but should be fixed manually. + if (declaredTypesContainFunction && typeContainsFunction(assignedType)) { + return false; + } + + for (const potentialParentType of declaredTypes) { + if ( + request.services.program + .getTypeChecker() + .isTypeAssignableTo(assignedType, potentialParentType) + ) { + return false; + } + } + + return true; + }; + + for (const assignedType of assignedTypes) { + if (!isAssignedTypeMissingFromDeclared(assignedType)) { + remainingMissingTypes.delete(assignedType); + } + } + + return setSubtract(remainingMissingTypes, declaredTypes); }; -const typeContainsFunction = (type: ts.Type) => type.getCallSignatures().length !== 0; +const typeContainsFunction = (type: ts.Type) => + type.getCallSignatures().length !== 0; diff --git a/src/mutations/collecting/flags.ts b/src/mutations/collecting/flags.ts index 506f5a5db..6b233bc4f 100644 --- a/src/mutations/collecting/flags.ts +++ b/src/mutations/collecting/flags.ts @@ -1,62 +1,67 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { setSubtract } from "../../shared/sets"; +import { setSubtract } from "../../shared/sets.js"; const knownTypeFlagEquivalents = new Map([ - [ts.TypeFlags.BigInt, ts.TypeFlags.BigIntLiteral], - [ts.TypeFlags.BigIntLiteral, ts.TypeFlags.BigInt], - [ts.TypeFlags.Number, ts.TypeFlags.NumberLiteral], - [ts.TypeFlags.NumberLiteral, ts.TypeFlags.Number], - [ts.TypeFlags.String, ts.TypeFlags.StringLiteral], - [ts.TypeFlags.StringLiteral, ts.TypeFlags.String], - [ts.TypeFlags.Undefined, ts.TypeFlags.Void], - [ts.TypeFlags.Void, ts.TypeFlags.Undefined], + [ts.TypeFlags.BigInt, ts.TypeFlags.BigIntLiteral], + [ts.TypeFlags.BigIntLiteral, ts.TypeFlags.BigInt], + [ts.TypeFlags.Number, ts.TypeFlags.NumberLiteral], + [ts.TypeFlags.NumberLiteral, ts.TypeFlags.Number], + [ts.TypeFlags.String, ts.TypeFlags.StringLiteral], + [ts.TypeFlags.StringLiteral, ts.TypeFlags.String], + [ts.TypeFlags.Undefined, ts.TypeFlags.Void], + [ts.TypeFlags.Void, ts.TypeFlags.Undefined], ]); export const findMissingFlags = ( - declaredType: ts.Type, - assignedFlags: ReadonlySet, - declaredFlags: ReadonlySet, + declaredType: ts.Type, + assignedFlags: ReadonlySet, + declaredFlags: ReadonlySet, ): Set => { - // If the type is declared to allow `any`, it can't be missing anything - if (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Any)) { - return new Set(); - } - - // Otherwise, it's all the flags assigned to it that weren't already declared - const missingFlags = setSubtract(assignedFlags, declaredFlags); - - // Remove any flags that are just equivalents of the existing ones - // For example, initial presense of `void` makes `undefined` unnecessary, and vice versa - for (const [original, equivalent] of knownTypeFlagEquivalents) { - if (missingFlags.has(equivalent) && isTypeFlagSetRecursively(declaredType, original)) { - missingFlags.delete(equivalent); - } - } - - return missingFlags; + // If the type is declared to allow `any`, it can't be missing anything + if (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Any)) { + return new Set(); + } + + // Otherwise, it's all the flags assigned to it that weren't already declared + const missingFlags = setSubtract(assignedFlags, declaredFlags); + + // Remove any flags that are just equivalents of the existing ones + // For example, initial presence of `void` makes `undefined` unnecessary, and vice versa + for (const [original, equivalent] of knownTypeFlagEquivalents) { + if ( + missingFlags.has(equivalent) && + isTypeFlagSetRecursively(declaredType, original) + ) { + missingFlags.delete(equivalent); + } + } + + return missingFlags; }; /** * Checks if a type contains a type flag, accounting for deep nested type unions. - * * @param parentType Parent type to check for the type flag. * @param typeFlag Type flag to check within the parent type. * @returns Whether the parent type contains the type flag. */ -export const isTypeFlagSetRecursively = (parentType: ts.Type, typeFlag: ts.TypeFlags): boolean => { - if (tsutils.isTypeFlagSet(parentType, typeFlag)) { - return true; - } - - if (tsutils.isUnionOrIntersectionType(parentType)) { - for (const childType of parentType.types) { - if (isTypeFlagSetRecursively(childType, typeFlag)) { - return true; - } - } - } - - return false; +export const isTypeFlagSetRecursively = ( + parentType: ts.Type, + typeFlag: ts.TypeFlags, +): boolean => { + if (tsutils.isTypeFlagSet(parentType, typeFlag)) { + return true; + } + + if (tsutils.isUnionOrIntersectionType(parentType)) { + for (const childType of parentType.types) { + if (isTypeFlagSetRecursively(childType, typeFlag)) { + return true; + } + } + } + + return false; }; diff --git a/src/mutations/creations/creationMutations.ts b/src/mutations/creations/creationMutations.ts index 01356fca4..e7505207c 100644 --- a/src/mutations/creations/creationMutations.ts +++ b/src/mutations/creations/creationMutations.ts @@ -1,18 +1,22 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { printNewLine } from "../../shared/printing/newlines"; -import { printNamedTypeSummaries } from "../../shared/printing/nodePrinting"; -import { TypeSummariesByName } from "../expansions/summarization"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { printNewLine } from "../../shared/printing/newlines.js"; +import { printNamedTypeSummaries } from "../../shared/printing/nodePrinting.js"; +import { TypeSummariesByName } from "../expansions/summarization.js"; export const createDeclarationForTypeSummaries = ( - request: FileMutationsRequest, - enclosingDeclaration: ts.Node | undefined, - name: string, - typeSummaries: TypeSummariesByName, + request: FileMutationsRequest, + enclosingDeclaration: ts.Node | undefined, + name: string, + typeSummaries: TypeSummariesByName, ) => { - const printedSummaries = printNamedTypeSummaries(request, enclosingDeclaration, typeSummaries); - const newLine = printNewLine(request.options.compilerOptions); + const printedSummaries = printNamedTypeSummaries( + request, + enclosingDeclaration, + typeSummaries, + ); + const newLine = printNewLine(request.options.compilerOptions); - return [`type ${name} = {`, newLine, printedSummaries, `};`].join(""); + return [`type ${name} = {`, newLine, printedSummaries, `};`].join(""); }; diff --git a/src/mutations/creators.ts b/src/mutations/creators.ts index 3e1362360..7fdc7a412 100644 --- a/src/mutations/creators.ts +++ b/src/mutations/creators.ts @@ -1,16 +1,18 @@ import { TextInsertMutation, TextSwapMutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../shared/fileMutator"; -import { isKnownGlobalBaseType, NodeWithAddableType, NodeWithCreatableType } from "../shared/nodeTypes"; - -import { joinIntoType } from "./aliasing/joinIntoType"; -import { collectUsageFlagsAndSymbols } from "./collecting"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { + NodeWithAddableType, + NodeWithCreatableType, + isKnownGlobalBaseType, +} from "../shared/nodeTypes.js"; +import { joinIntoType } from "./aliasing/joinIntoType.js"; +import { collectUsageFlagsAndSymbols } from "./collecting.js"; /** * Creates a mutation to add types to an existing type, if any are new. - * * @param request Source file, metadata, and settings to collect mutations in the file. * @param node Original node with a type declaration to add to. * @param declaredType Declared type from the node. @@ -18,52 +20,61 @@ import { collectUsageFlagsAndSymbols } from "./collecting"; * @returns Mutation to add any new assigned types, if any are missing from the declared type. */ export const createTypeAdditionMutation = ( - request: FileMutationsRequest, - node: NodeWithAddableType, - declaredType: ts.Type, - allAssignedTypes: readonly ts.Type[], + request: FileMutationsRequest, + node: NodeWithAddableType, + declaredType: ts.Type, + allAssignedTypes: readonly ts.Type[], ): TextInsertMutation | TextSwapMutation | undefined => { - // Declared 'any' types inherently can't be incomplete - if (tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { - return undefined; - } + // Declared 'any' types inherently can't be incomplete + if (tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { + return undefined; + } - // Find any missing flags and symbols (a.k.a. types) - const { missingFlags, missingTypes } = collectUsageFlagsAndSymbols(request, declaredType, allAssignedTypes); + // Find any missing flags and symbols (a.k.a. types) + const { missingFlags, missingTypes } = collectUsageFlagsAndSymbols( + request, + declaredType, + allAssignedTypes, + ); - // If nothing is missing, rejoice! The type was already fine. - if (missingFlags.size === 0 && missingTypes.size === 0) { - return undefined; - } + // If nothing is missing, rejoice! The type was already fine. + if (missingFlags.size === 0 && missingTypes.size === 0) { + return undefined; + } - // Join the missing types into a type string to declare - const newTypeAlias = joinIntoType(missingFlags, missingTypes, request); + // Join the missing types into a type string to declare + const newTypeAlias = joinIntoType(missingFlags, missingTypes, request); - // If the original type was a bottom type or just something like Function or Object, replace it entirely - if (tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Never | ts.TypeFlags.Unknown) || isKnownGlobalBaseType(declaredType)) { - return { - insertion: ` ${newTypeAlias}`, - range: { - begin: node.type.pos, - end: node.type.end, - }, - type: "text-swap", - }; - } + // If the original type was a bottom type or just something like Function or Object, replace it entirely + if ( + tsutils.isTypeFlagSet( + declaredType, + ts.TypeFlags.Never | ts.TypeFlags.Unknown, + ) || + isKnownGlobalBaseType(declaredType) + ) { + return { + insertion: ` ${newTypeAlias}`, + range: { + begin: node.type.pos, + end: node.type.end, + }, + type: "text-swap", + }; + } - // Create a mutation insertion that adds the missing types in - return { - insertion: ` | ${newTypeAlias}`, - range: { - begin: node.type.end, - }, - type: "text-insert", - }; + // Create a mutation insertion that adds the missing types in + return { + insertion: ` | ${newTypeAlias}`, + range: { + begin: node.type.end, + }, + type: "text-insert", + }; }; /** * Creates a mutation to add types to a node without a type, if any are new. - * * @param request Metadata and settings to collect mutations in a file. * @param node Node to add the type annotation. * @param declaredType Declared type from the node. @@ -71,32 +82,29 @@ export const createTypeAdditionMutation = ( * @returns Mutation to add any new assigned types, if any are missing from the declared type. */ export const createTypeCreationMutation = ( - request: FileMutationsRequest, - node: NodeWithCreatableType, - declaredType: ts.Type, - allAssignedTypes: readonly ts.Type[], + request: FileMutationsRequest, + node: NodeWithCreatableType, + declaredType: ts.Type, + allAssignedTypes: readonly ts.Type[], ): TextInsertMutation | undefined => { - // Find the already assigned flags and symbols, as well as any missing ones - const { assignedFlags, assignedTypes, missingFlags, missingTypes } = collectUsageFlagsAndSymbols( - request, - declaredType, - allAssignedTypes, - ); + // Find the already assigned flags and symbols, as well as any missing ones + const { assignedFlags, assignedTypes, missingFlags, missingTypes } = + collectUsageFlagsAndSymbols(request, declaredType, allAssignedTypes); - // If nothing is missing, rejoice! The type was already fine. - if (missingFlags.size === 0 && missingTypes.size === 0) { - return undefined; - } + // If nothing is missing, rejoice! The type was already fine. + if (missingFlags.size === 0 && missingTypes.size === 0) { + return undefined; + } - // Join the missing types into a type string to declare - const newTypeAlias = joinIntoType(assignedFlags, assignedTypes, request); + // Join the missing types into a type string to declare + const newTypeAlias = joinIntoType(assignedFlags, assignedTypes, request); - // Create a mutation insertion that adds the assigned types in - return { - insertion: `: ${newTypeAlias}`, - range: { - begin: node.name.end, - }, - type: "text-insert", - }; + // Create a mutation insertion that adds the assigned types in + return { + insertion: `: ${newTypeAlias}`, + range: { + begin: node.name.end, + }, + type: "text-insert", + }; }; diff --git a/src/mutations/expansions/addIncompleteTypesToType.ts b/src/mutations/expansions/addIncompleteTypesToType.ts index 41d5bd6f6..55f050e2a 100644 --- a/src/mutations/expansions/addIncompleteTypesToType.ts +++ b/src/mutations/expansions/addIncompleteTypesToType.ts @@ -1,104 +1,115 @@ -import { combineMutations, MultipleMutations, Mutation, TextInsertMutation, TextSwapMutation } from "automutate"; -import * as ts from "typescript"; +import { + MultipleMutations, + Mutation, + TextInsertMutation, + TextSwapMutation, + combineMutations, +} from "automutate"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { isKnownGlobalBaseType, isNeverAndOrUnknownType, PropertySignatureWithType } from "../../shared/nodeTypes"; - -import { TypeSummary } from "./summarization"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { + PropertySignatureWithType, + isKnownGlobalBaseType, + isNeverAndOrUnknownType, +} from "../../shared/nodeTypes.js"; +import { TypeSummary } from "./summarization.js"; export type TypeSummariesPerNodeByName = Map; export interface TypeSummaryWithNode { - summary: TypeSummary; - originalProperty: PropertySignatureWithType; - originalPropertyType: ts.Type; + originalProperty: PropertySignatureWithType; + originalPropertyType: ts.Type; + summary: TypeSummary; } /** * Appends new types as union type nodes to existing, apparently incomplete types. */ export const addIncompleteTypesToType = ( - request: FileMutationsRequest, - incompleteTypes: TypeSummariesPerNodeByName, + request: FileMutationsRequest, + incompleteTypes: TypeSummariesPerNodeByName, ): Mutation | undefined => { - const mutations: Mutation[] = []; + const mutations: Mutation[] = []; - for (const summaryWithNode of incompleteTypes.values()) { - const mutation = fillInIncompleteType(request, summaryWithNode); + for (const summaryWithNode of incompleteTypes.values()) { + const mutation = fillInIncompleteType(request, summaryWithNode); - if (mutation !== undefined) { - mutations.push(mutation); - } - } + if (mutation !== undefined) { + mutations.push(mutation); + } + } - return mutations.length === 0 ? undefined : combineMutations(...mutations); + return mutations.length === 0 ? undefined : combineMutations(...mutations); }; const fillInIncompleteType = ( - request: FileMutationsRequest, - summaryWithNode: TypeSummaryWithNode, + request: FileMutationsRequest, + summaryWithNode: TypeSummaryWithNode, ): MultipleMutations | TextInsertMutation | TextSwapMutation | undefined => { - // Create a new type name to add on that joins the types to be added - let createdTypeName = request.services.printers.type( - summaryWithNode.summary.types, - summaryWithNode.originalProperty.type ?? summaryWithNode.originalProperty, - ); + // Create a new type name to add on that joins the types to be added + let createdTypeName = request.services.printers.type( + summaryWithNode.summary.types, + summaryWithNode.originalProperty.type, + ); - // For some reason, the enclosingNode option of printing isn't always applying... - if (createdTypeName.includes("=>")) { - createdTypeName = `(${createdTypeName})`; - } + // For some reason, the enclosingNode option of printing isn't always applying... + if (createdTypeName.includes("=>")) { + createdTypeName = `(${createdTypeName})`; + } - // Similar to createTypeAdditionMutation, if the node is a basic base type, we can just replace it - if ( - summaryWithNode.originalProperty.type !== undefined && - (isKnownGlobalBaseType(summaryWithNode.originalPropertyType) || isNeverAndOrUnknownType(summaryWithNode.originalPropertyType)) - ) { - return { - insertion: `: ${createdTypeName}`, - range: { - begin: summaryWithNode.originalProperty.name.end, - end: summaryWithNode.originalProperty.type.end, - }, - type: "text-swap", - }; - } + // Similar to createTypeAdditionMutation, if the node is a basic base type, we can just replace it + if ( + isKnownGlobalBaseType(summaryWithNode.originalPropertyType) || + isNeverAndOrUnknownType(summaryWithNode.originalPropertyType) + ) { + return { + insertion: `: ${createdTypeName}`, + range: { + begin: summaryWithNode.originalProperty.name.end, + end: summaryWithNode.originalProperty.type.end, + }, + type: "text-swap", + }; + } - // If the original node type is a function type, wrap it in parenthesis - const originalPropertyTypePrinted = request.services.printers.type(summaryWithNode.originalPropertyType); - if (originalPropertyTypePrinted.includes("=>")) { - const parenthesisInsertions: TextInsertMutation[] = [ - { - insertion: "(", - range: { - begin: summaryWithNode.originalProperty.type.pos, - }, - type: "text-insert", - }, - { - insertion: `) | ${createdTypeName}`, - range: { - begin: summaryWithNode.originalProperty.type.end, - }, - type: "text-insert", - }, - ]; - return { - mutations: parenthesisInsertions, - range: { - begin: summaryWithNode.originalProperty.type.pos, - end: summaryWithNode.originalProperty.type.end, - }, - type: "multiple", - }; - } + // If the original node type is a function type, wrap it in parenthesis + const originalPropertyTypePrinted = request.services.printers.type( + summaryWithNode.originalPropertyType, + ); + if (originalPropertyTypePrinted.includes("=>")) { + const parenthesisInsertions: TextInsertMutation[] = [ + { + insertion: "(", + range: { + begin: summaryWithNode.originalProperty.type.pos, + }, + type: "text-insert", + }, + { + insertion: `) | ${createdTypeName}`, + range: { + begin: summaryWithNode.originalProperty.type.end, + }, + type: "text-insert", + }, + ]; + return { + mutations: parenthesisInsertions, + range: { + begin: summaryWithNode.originalProperty.type.pos, + end: summaryWithNode.originalProperty.type.end, + }, + type: "multiple", + }; + } - // Otherwise we can stick with only the insertion of the new type as a union - return { - insertion: ` | ${createdTypeName}`, - range: { - begin: summaryWithNode.originalProperty.type.end, - }, - type: "text-insert", - }; + // Otherwise we can stick with only the insertion of the new type as a union + return { + insertion: ` | ${createdTypeName}`, + range: { + begin: summaryWithNode.originalProperty.type.end, + }, + type: "text-insert", + }; }; diff --git a/src/mutations/expansions/addMissingTypesToType.ts b/src/mutations/expansions/addMissingTypesToType.ts index 1a8ee39b8..3bbcfc96c 100644 --- a/src/mutations/expansions/addMissingTypesToType.ts +++ b/src/mutations/expansions/addMissingTypesToType.ts @@ -1,44 +1,46 @@ import { TextInsertMutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { printNamedTypeSummary } from "../../shared/printing/nodePrinting"; - -import { TypeSummariesByName } from "./summarization"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { printNamedTypeSummary } from "../../shared/printing/nodePrinting.js"; +import { TypeSummariesByName } from "./summarization.js"; /** * Adds new named type properties to a declaration that is missing them. */ export const addMissingTypesToType = ( - request: FileMutationsRequest, - node: ts.InterfaceDeclaration | ts.TypeLiteralNode, - missingTypes: TypeSummariesByName, + request: FileMutationsRequest, + node: ts.InterfaceDeclaration | ts.TypeLiteralNode, + missingTypes: TypeSummariesByName, ): TextInsertMutation | undefined => { - let insertion = ""; - - for (const [name, summary] of missingTypes) { - insertion += printNamedTypeSummary(request, node, name, summary); - } - - if (!insertion) { - return undefined; - } - - return { - insertion, - range: { - begin: getEndInsertionPoint(node), - }, - type: "text-insert", - }; + let insertion = ""; + + for (const [name, summary] of missingTypes) { + insertion += printNamedTypeSummary(request, node, name, summary); + } + + if (!insertion) { + return undefined; + } + + return { + insertion, + range: { + begin: getEndInsertionPoint(node), + }, + type: "text-insert", + }; }; -const getEndInsertionPoint = ({ end, members }: ts.InterfaceDeclaration | ts.TypeLiteralNode) => { - if (members.length === 0) { - return end - 1; - } +const getEndInsertionPoint = ({ + end, + members, +}: ts.InterfaceDeclaration | ts.TypeLiteralNode) => { + if (members.length === 0) { + return end - 1; + } - const lastMember = members[members.length - 1]; + const lastMember = members[members.length - 1]; - return Math.min(lastMember.end + 1, end); + return Math.min(lastMember.end + 1, end); }; diff --git a/src/mutations/expansions/eliminations.ts b/src/mutations/expansions/eliminations.ts index 8ea67ab68..c676d4202 100644 --- a/src/mutations/expansions/eliminations.ts +++ b/src/mutations/expansions/eliminations.ts @@ -1,66 +1,99 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { isKnownGlobalBaseType, isNeverAndOrUnknownType } from "../../shared/nodeTypes"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { + isKnownGlobalBaseType, + isNeverAndOrUnknownType, +} from "../../shared/nodeTypes.js"; -const onlyTypes = (candidateTypes: ReadonlyArray): candidateTypes is ReadonlyArray => - !candidateTypes.some((candidateType) => typeof candidateType === "string"); +const onlyTypes = ( + candidateTypes: readonly (string | ts.Type)[], +): candidateTypes is readonly ts.Type[] => + !candidateTypes.some((candidateType) => typeof candidateType === "string"); /** * @returns Whether any of the extra types don't yet exist on an original type. - * @remarks If any of the candidate types are strings, this unfortunately has to assume true. + * If any of the candidate types are strings, this unfortunately has to assume true. */ export const originalTypeHasIncompleteType = ( - request: FileMutationsRequest, - originalType: ts.Type, - candidateTypes: ReadonlyArray, + request: FileMutationsRequest, + originalType: ts.Type, + candidateTypes: readonly (string | ts.Type)[], ) => { - if (!onlyTypes(candidateTypes)) { - return true; - } + if (!onlyTypes(candidateTypes)) { + return true; + } - // If the original type is something like Function and at least one candidate type isn't, - // consider the Function to be reporting not enough info (like a base type) - if (isKnownGlobalBaseType(originalType) && !candidateTypes.every(isKnownGlobalBaseType)) { - return true; - } + // If the original type is something like Function and at least one candidate type isn't, + // consider the Function to be reporting not enough info (like a base type) + if ( + isKnownGlobalBaseType(originalType) && + !candidateTypes.every(isKnownGlobalBaseType) + ) { + return true; + } - // If the original type is unknown or never, we can always assume it's missing info - if (isNeverAndOrUnknownType(originalType)) { - return true; - } + // If the original type is unknown or never, we can always assume it's missing info + if (isNeverAndOrUnknownType(originalType)) { + return true; + } - return candidateTypes.some((assignedType) => !candidateTypeIsAssignableToOriginal(request, assignedType, originalType)); + return candidateTypes.some( + (assignedType) => + !candidateTypeIsAssignableToOriginal(request, assignedType, originalType), + ); }; -const candidateTypeIsAssignableToOriginal = (request: FileMutationsRequest, candidateType: ts.Type, originalType: ts.Type) => { - const typeChecker = request.services.program.getTypeChecker(); +const candidateTypeIsAssignableToOriginal = ( + request: FileMutationsRequest, + candidateType: ts.Type, + originalType: ts.Type, +) => { + const typeChecker = request.services.program.getTypeChecker(); - // The type checker things that functions with similar base return types are the same - // e.g. () => boolean is marked as assignable to () => void - // We know that's false, so if the two are functions - const missingFunctionReturn = functionReturnIsIncomplete(request, candidateType, originalType); - if (missingFunctionReturn !== undefined) { - return !missingFunctionReturn; - } + // The type checker things that functions with similar base return types are the same + // e.g. () => boolean is marked as assignable to () => void + // We know that's false, so if the two are functions + const missingFunctionReturn = functionReturnIsIncomplete( + request, + candidateType, + originalType, + ); + if (missingFunctionReturn !== undefined) { + return !missingFunctionReturn; + } - // Otherwise we can directly use isTypeAssignableTo checking - return typeChecker.isTypeAssignableTo(candidateType, originalType); + // Otherwise we can directly use isTypeAssignableTo checking + return typeChecker.isTypeAssignableTo(candidateType, originalType); }; -const functionReturnIsIncomplete = (request: FileMutationsRequest, candidateType: ts.Type, originalType: ts.Type) => { - const typeChecker = request.services.program.getTypeChecker(); +const functionReturnIsIncomplete = ( + request: FileMutationsRequest, + candidateType: ts.Type, + originalType: ts.Type, +) => { + const typeChecker = request.services.program.getTypeChecker(); - // Skip this logic if neither of the types are actually functions that return void - if (!anySignatureReturnsVoid(candidateType) && !anySignatureReturnsVoid(originalType)) { - return undefined; - } + // Skip this logic if neither of the types are actually functions that return void + if ( + !anySignatureReturnsVoid(candidateType) && + !anySignatureReturnsVoid(originalType) + ) { + return undefined; + } - // Regardless of the original compiler options, factor in covariance checks to be super duper sure - return !typeChecker.isTypeAssignableTo(candidateType, originalType) || !typeChecker.isTypeAssignableTo(originalType, candidateType); + // Regardless of the original compiler options, factor in covariance checks to be super duper sure + return ( + !typeChecker.isTypeAssignableTo(candidateType, originalType) || + !typeChecker.isTypeAssignableTo(originalType, candidateType) + ); }; function anySignatureReturnsVoid(type: ts.Type) { - return type.getCallSignatures().some((callSignature) => tsutils.isTypeFlagSet(callSignature.getReturnType(), ts.TypeFlags.Void)); + return type + .getCallSignatures() + .some((callSignature) => + tsutils.isTypeFlagSet(callSignature.getReturnType(), ts.TypeFlags.Void), + ); } diff --git a/src/mutations/expansions/expansionMutations.ts b/src/mutations/expansions/expansionMutations.ts index fa4a1a364..33bc49e31 100644 --- a/src/mutations/expansions/expansionMutations.ts +++ b/src/mutations/expansions/expansionMutations.ts @@ -1,72 +1,108 @@ -import { combineMutations, Mutation } from "automutate"; -import * as ts from "typescript"; +import { Mutation, combineMutations } from "automutate"; +import ts from "typescript"; -import { AssignedTypesByName } from "../assignments"; -import { InterfaceOrTypeLiteral } from "../../mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { isNotUndefined } from "../../shared/arrays"; -import { getStaticNameOfProperty } from "../../shared/names"; - -import { addIncompleteTypesToType, TypeSummariesPerNodeByName } from "./addIncompleteTypesToType"; -import { addMissingTypesToType } from "./addMissingTypesToType"; -import { originalTypeHasIncompleteType } from "./eliminations"; -import { summarizeAllAssignedTypes, TypeSummariesByName } from "./summarization"; -import { isNodeWithType, PropertySignatureWithType } from "../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../shared/types"; +import { InterfaceOrTypeLiteral } from "../../mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences.js"; +import { isNotUndefined } from "../../shared/arrays.js"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { getStaticNameOfProperty } from "../../shared/names.js"; +import { + PropertySignatureWithType, + isNodeWithType, +} from "../../shared/nodeTypes.js"; +import { getTypeAtLocationIfNotError } from "../../shared/types.js"; +import { AssignedTypesByName } from "../assignments.js"; +import { + TypeSummariesPerNodeByName, + addIncompleteTypesToType, +} from "./addIncompleteTypesToType.js"; +import { addMissingTypesToType } from "./addMissingTypesToType.js"; +import { originalTypeHasIncompleteType } from "./eliminations.js"; +import { + TypeSummariesByName, + summarizeAllAssignedTypes, +} from "./summarization.js"; /** * Given an interface or type declaration and a set of later-assigned types, * expands the original declaration to now also include the types. */ export const createTypeExpansionMutation = ( - request: FileMutationsRequest, - node: InterfaceOrTypeLiteral, - allAssignedTypes: AssignedTypesByName[], + request: FileMutationsRequest, + node: InterfaceOrTypeLiteral, + allAssignedTypes: AssignedTypesByName[], ): Mutation | undefined => { - const originalPropertiesByName = groupPropertyDeclarationsByName(node); - const summarizedAssignedTypes = summarizeAllAssignedTypes(request, allAssignedTypes); - const incompleteTypes: TypeSummariesPerNodeByName = new Map(); - const missingTypes: TypeSummariesByName = new Map(); + const originalPropertiesByName = groupPropertyDeclarationsByName(node); + const summarizedAssignedTypes = summarizeAllAssignedTypes( + request, + allAssignedTypes, + ); + const incompleteTypes: TypeSummariesPerNodeByName = new Map(); + const missingTypes: TypeSummariesByName = new Map(); - for (const [name, summary] of summarizedAssignedTypes) { - // If the original type doesn't have the name at all, we'll need to add it in - const originalProperty = originalPropertiesByName.get(name); - if (originalProperty === undefined) { - missingTypes.set(name, summary); - continue; - } + for (const [name, summary] of summarizedAssignedTypes) { + // If the original type doesn't have the name at all, we'll need to add it in + const originalProperty = originalPropertiesByName.get(name); + if (originalProperty === undefined) { + missingTypes.set(name, summary); + continue; + } - // If the type matches an existing property in name but not in type, we'll add the new type in there - const originalPropertyType = getTypeAtLocationIfNotError(request, originalProperty); - if (originalPropertyType !== undefined && originalTypeHasIncompleteType(request, originalPropertyType, summary.types)) { - incompleteTypes.set(name, { originalProperty, originalPropertyType, summary }); - } - } + // If the type matches an existing property in name but not in type, we'll add the new type in there + const originalPropertyType = getTypeAtLocationIfNotError( + request, + originalProperty, + ); + if ( + originalPropertyType !== undefined && + originalTypeHasIncompleteType( + request, + originalPropertyType, + summary.types, + ) + ) { + incompleteTypes.set(name, { + originalProperty, + originalPropertyType, + summary, + }); + } + } - const incompleteTypesMutations = addIncompleteTypesToType(request, incompleteTypes); - const missingTypesMutations = addMissingTypesToType(request, node, missingTypes); - const mutations = [incompleteTypesMutations, missingTypesMutations].filter(isNotUndefined); + const incompleteTypesMutations = addIncompleteTypesToType( + request, + incompleteTypes, + ); + const missingTypesMutations = addMissingTypesToType( + request, + node, + missingTypes, + ); + const mutations = [incompleteTypesMutations, missingTypesMutations].filter( + isNotUndefined, + ); - return mutations.length === 0 ? undefined : combineMutations(...mutations); + return mutations.length === 0 ? undefined : combineMutations(...mutations); }; -const groupPropertyDeclarationsByName = (node: ts.InterfaceDeclaration | ts.TypeLiteralNode) => { - const propertiesByName: Map = new Map(); +const groupPropertyDeclarationsByName = ( + node: ts.InterfaceDeclaration | ts.TypeLiteralNode, +) => { + const propertiesByName = new Map(); - for (const member of node.members) { - // Ignore non-existent or implicitly typed members - if (!ts.isPropertySignature(member) || !isNodeWithType(member)) { - continue; - } + for (const member of node.members) { + // Ignore non-existent or implicitly typed members + if (!ts.isPropertySignature(member) || !isNodeWithType(member)) { + continue; + } - // Ignore any property with a name that's not immediately convertable to a string - const name = getStaticNameOfProperty(member.name); - if (name === undefined) { - continue; - } + // Ignore any property with a name that's not immediately convertible to a string + const name = getStaticNameOfProperty(member.name); + if (name === undefined) { + continue; + } - propertiesByName.set(name, member); - } + propertiesByName.set(name, member); + } - return propertiesByName; + return propertiesByName; }; diff --git a/src/mutations/expansions/summarization.ts b/src/mutations/expansions/summarization.ts index 17c5b3671..8b531c67d 100644 --- a/src/mutations/expansions/summarization.ts +++ b/src/mutations/expansions/summarization.ts @@ -1,71 +1,79 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; -import { AssignedTypesByName } from "../assignments"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; +import { AssignedTypesByName } from "../assignments.js"; export type TypeSummariesByName = Map; export interface TypeSummary { - alwaysProvided?: boolean; - types: (ts.Type | string)[]; + alwaysProvided?: boolean; + types: (string | ts.Type)[]; } /** * Groups a list of assignments into, for each property name, the possible types under it and whether it's always provided. */ -export const summarizeAllAssignedTypes = (request: FileMutationsRequest, allAssignedTypes: AssignedTypesByName[]): TypeSummariesByName => { - const typeSummariesByName: TypeSummariesByName = new Map(); +export const summarizeAllAssignedTypes = ( + request: FileMutationsRequest, + allAssignedTypes: AssignedTypesByName[], +): TypeSummariesByName => { + const typeSummariesByName: TypeSummariesByName = new Map(); - // First, collect all assigned types from each usage into the list of types by name - for (const assignedTypes of allAssignedTypes) { - for (const [name, type] of assignedTypes) { - // If this is the first time seeing the type, start a new entry for it - const existingTypeSummary = typeSummariesByName.get(name); - if (existingTypeSummary === undefined) { - typeSummariesByName.set(name, { types: [type] }); - continue; - } + // First, collect all assigned types from each usage into the list of types by name + for (const assignedTypes of allAssignedTypes) { + for (const [name, type] of assignedTypes) { + // If this is the first time seeing the type, start a new entry for it + const existingTypeSummary = typeSummariesByName.get(name); + if (existingTypeSummary === undefined) { + typeSummariesByName.set(name, { types: [type] }); + continue; + } - // Merge the existing types and the new type into the summary if possible - mergeTypes(request, existingTypeSummary.types, type); - } - } + // Merge the existing types and the new type into the summary if possible + mergeTypes(request, existingTypeSummary.types, type); + } + } - // For each of summarized type, mark it as `alwaysProvided` if every set of assigned types includes it - for (const [name, typeSummary] of typeSummariesByName) { - if (allAssignedTypes.every((assignedTypes) => assignedTypes.has(name))) { - typeSummary.alwaysProvided = true; - } - } + // For each of summarized type, mark it as `alwaysProvided` if every set of assigned types includes it + for (const [name, typeSummary] of typeSummariesByName) { + if (allAssignedTypes.every((assignedTypes) => assignedTypes.has(name))) { + typeSummary.alwaysProvided = true; + } + } - return typeSummariesByName; + return typeSummariesByName; }; -const mergeTypes = (request: FileMutationsRequest, existingTypes: (ts.Type | string)[], potentialNewType: ts.Type | string) => { - const typeChecker = request.services.program.getTypeChecker(); +const mergeTypes = ( + request: FileMutationsRequest, + existingTypes: (string | ts.Type)[], + potentialNewType: string | ts.Type, +) => { + const typeChecker = request.services.program.getTypeChecker(); - for (let i = 0; i < existingTypes.length; i += 1) { - const existingType = existingTypes[i]; - if (typeof existingType === "string") { - if (typeof potentialNewType === "string") { - if (existingType === potentialNewType) { - return; - } - } - } else { - if (typeof potentialNewType === "string") { - continue; - } - if (typeChecker.isTypeAssignableTo(potentialNewType, existingType)) { - return; - } + for (let i = 0; i < existingTypes.length; i += 1) { + const existingType = existingTypes[i]; + if (typeof existingType === "string") { + if (typeof potentialNewType === "string") { + if (existingType === potentialNewType) { + return; + } + } + } else { + if (typeof potentialNewType === "string") { + continue; + } - if (typeChecker.isTypeAssignableTo(existingType, potentialNewType)) { - existingTypes[i] = potentialNewType; - return; - } - } - } + if (typeChecker.isTypeAssignableTo(potentialNewType, existingType)) { + return; + } - existingTypes.push(potentialNewType); + if (typeChecker.isTypeAssignableTo(existingType, potentialNewType)) { + existingTypes[i] = potentialNewType; + return; + } + } + } + + existingTypes.push(potentialNewType); }; diff --git a/src/mutations/generics.ts b/src/mutations/generics.ts index 091d4e700..b9278362b 100644 --- a/src/mutations/generics.ts +++ b/src/mutations/generics.ts @@ -1,26 +1,34 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../shared/fileMutator"; -import { isTypeBuiltIn } from "../shared/types"; - -import { constructArrayShorthand } from "./arrays"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { isTypeBuiltIn } from "../shared/types.js"; +import { constructArrayShorthand } from "./arrays.js"; /** * Creates a type like "string[]" or "Map" from a container and type arguments. */ -export const joinIntoGenericType = (request: FileMutationsRequest, containerType: ts.Type, allTypeArgumentTypes: ts.Type[][]) => { - const containerTypeName = request.services.printers - .type(containerType, undefined, ts.TypeFormatFlags.WriteArrayAsGenericType) - // Names with parameters like Array and Map should ignore those parameters - .split("<")[0]; +export const joinIntoGenericType = ( + request: FileMutationsRequest, + containerType: ts.Type, + allTypeArgumentTypes: ts.Type[][], +) => { + const containerTypeName = request.services.printers + .type(containerType, undefined, ts.TypeFormatFlags.WriteArrayAsGenericType) + // Names with parameters like Array and Map should ignore those parameters + .split("<")[0]; + + // By now we're assuming the generic types can all be named - // By now we're assuming the generic types can all be named - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const genericTypeNames = allTypeArgumentTypes.map((genericTypes) => request.services.printers.type(genericTypes)!); + const genericTypeNames = allTypeArgumentTypes.map((genericTypes) => + request.services.printers.type(genericTypes), + ); - if (containerTypeName.split("<")[0] === "Array" && isTypeBuiltIn(containerType)) { - return constructArrayShorthand(genericTypeNames); - } + if ( + containerTypeName.split("<")[0] === "Array" && + isTypeBuiltIn(containerType) + ) { + return constructArrayShorthand(genericTypeNames); + } - return `${containerTypeName}<${genericTypeNames.join(", ")}>`; + return `${containerTypeName}<${genericTypeNames.join(", ")}>`; }; diff --git a/src/mutations/naming.ts b/src/mutations/naming.ts index 7d540a463..f0be56f4b 100644 --- a/src/mutations/naming.ts +++ b/src/mutations/naming.ts @@ -1,41 +1,51 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../shared/fileMutator"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; export const isUpperCaseLetter = (letter: string) => { - return letter !== letter.toLowerCase(); + return letter !== letter.toLowerCase(); }; -export const getPerceivedNameOfClass = (request: FileMutationsRequest, node: ts.ClassLikeDeclaration): string => { - // Clases with their own names are the most common and mostly friendly case - if (node.name !== undefined) { - return node.name.text; - } - - // If the class is directly within a named variable, use that name - const { parent } = node; - if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) { - return parent.name.text; - } - - // We could probably do fancier things at this point but why bother... - return request.nameGenerator.generateName("Class"); +export const getPerceivedNameOfClass = ( + request: FileMutationsRequest, + node: ts.ClassLikeDeclaration, +): string => { + // Classes with their own names are the most common and mostly friendly case + if (node.name !== undefined) { + return node.name.text; + } + + // If the class is directly within a named variable, use that name + const { parent } = node; + if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) { + return parent.name.text; + } + + // We could probably do fancier things at this point but why bother... + return request.nameGenerator.generateName("Class"); }; export const getFriendlyTypeParameterDeclarationName = ( - baseTypeParameters: ts.NodeArray, - typeParameter: ts.TypeParameterDeclaration, + baseTypeParameters: ts.NodeArray, + typeParameter: ts.TypeParameterDeclaration, ) => { - const typeNameRaw = typeParameter.name.text; - const typeNameFriendly = - typeNameRaw.length > 1 && typeNameRaw.startsWith("T") && isUpperCaseLetter(typeNameRaw[1]) ? typeNameRaw.slice(1) : typeNameRaw; - - // If any sibling parameter actually happens to match the friendly name, use the raw instead - for (const siblingParameter of baseTypeParameters) { - if (siblingParameter !== typeParameter && siblingParameter.name.text === typeNameFriendly) { - return typeNameRaw; - } - } - - return typeNameFriendly; + const typeNameRaw = typeParameter.name.text; + const typeNameFriendly = + typeNameRaw.length > 1 && + typeNameRaw.startsWith("T") && + isUpperCaseLetter(typeNameRaw[1]) + ? typeNameRaw.slice(1) + : typeNameRaw; + + // If any sibling parameter actually happens to match the friendly name, use the raw instead + for (const siblingParameter of baseTypeParameters) { + if ( + siblingParameter !== typeParameter && + siblingParameter.name.text === typeNameFriendly + ) { + return typeNameRaw; + } + } + + return typeNameFriendly; }; diff --git a/src/mutations/readCharactersOfFile.ts b/src/mutations/readCharactersOfFile.ts index 602d44f16..6021fca9d 100644 --- a/src/mutations/readCharactersOfFile.ts +++ b/src/mutations/readCharactersOfFile.ts @@ -1,10 +1,13 @@ import * as fs from "fs"; -export const readCharactersOfFile = (fileName: string, length: number): string => { - const fd = fs.openSync(fileName, "r"); - const buffer = Buffer.alloc(length); +export const readCharactersOfFile = ( + fileName: string, + length: number, +): string => { + const fd = fs.openSync(fileName, "r"); + const buffer = Buffer.alloc(length); - fs.readSync(fd, buffer, 0, length, 0); + fs.readSync(fd, buffer, 0, length, 0); - return buffer.toString(); + return buffer.toString(); }; diff --git a/src/mutations/removals.ts b/src/mutations/removals.ts index e017c28f6..8865ca4eb 100644 --- a/src/mutations/removals.ts +++ b/src/mutations/removals.ts @@ -1,14 +1,20 @@ import { TextDeleteMutation } from "automutate"; -import { NodeWithType } from "../shared/nodeTypes"; -import { FileMutationsRequest } from "../shared/fileMutator"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { NodeWithType } from "../shared/nodeTypes.js"; -export const createTypeRemovalMutation = (request: FileMutationsRequest, node: NodeWithType): TextDeleteMutation => { - return { - range: { - begin: node.type.getStart(request.sourceFile) - node.type.getLeadingTriviaWidth(request.sourceFile) - 1, - end: node.type.end, - }, - type: "text-delete", - }; +export const createTypeRemovalMutation = ( + request: FileMutationsRequest, + node: NodeWithType, +): TextDeleteMutation => { + return { + range: { + begin: + node.type.getStart(request.sourceFile) - + node.type.getLeadingTriviaWidth(request.sourceFile) - + 1, + end: node.type.end, + }, + type: "text-delete", + }; }; diff --git a/src/mutations/renames/createRequireMutation.ts b/src/mutations/renames/createRequireMutation.ts index d09de0c73..aa8065241 100644 --- a/src/mutations/renames/createRequireMutation.ts +++ b/src/mutations/renames/createRequireMutation.ts @@ -1,21 +1,23 @@ import { TextSwapMutation } from "automutate"; -import { RequireRenameRequest } from "./findRequireRenameMutationsInFile"; -import { LocalImplicitRequireCallExpression } from "./isRequireToJsFile"; +import { RequireRenameRequest } from "./findRequireRenameMutationsInFile.js"; +import { LocalImplicitRequireCallExpression } from "./isRequireToJsFile.js"; export const createRequireMutation = ( - request: RequireRenameRequest, - node: LocalImplicitRequireCallExpression, + request: RequireRenameRequest, + node: LocalImplicitRequireCallExpression, ): TextSwapMutation | undefined => { - const newLocalFilePath = node.arguments[0].text.replace(/.js$/i, ".ts").replace(/.jsx$/i, ".tsx"); - const newLocalImportPath = newLocalFilePath.replace(/.tsx?$/i, ""); + const newLocalFilePath = node.arguments[0].text + .replace(/.js$/i, ".ts") + .replace(/.jsx$/i, ".tsx"); + const newLocalImportPath = newLocalFilePath.replace(/.tsx?$/i, ""); - return { - insertion: `(${node.getText(request.sourceFile)} as typeof import("${newLocalImportPath}"))`, - range: { - begin: node.getStart(request.sourceFile), - end: node.end, - }, - type: "text-swap", - }; + return { + insertion: `(${node.getText(request.sourceFile)} as typeof import("${newLocalImportPath}"))`, + range: { + begin: node.getStart(request.sourceFile), + end: node.end, + }, + type: "text-swap", + }; }; diff --git a/src/mutations/renames/findRequireRenameMutationsInFile.ts b/src/mutations/renames/findRequireRenameMutationsInFile.ts index 4ae677071..906b04c5f 100644 --- a/src/mutations/renames/findRequireRenameMutationsInFile.ts +++ b/src/mutations/renames/findRequireRenameMutationsInFile.ts @@ -1,32 +1,33 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { TypeStatOptions } from "../../options/types"; - -import { createRequireMutation } from "./createRequireMutation"; -import { isRequireToJsFile } from "./isRequireToJsFile"; +import { TypeStatOptions } from "../../options/types.js"; +import { createRequireMutation } from "./createRequireMutation.js"; +import { isRequireToJsFile } from "./isRequireToJsFile.js"; export interface RequireRenameRequest { - allFileNames: ReadonlySet; - options: TypeStatOptions; - sourceFile: ts.SourceFile; + allFileNames: ReadonlySet; + options: TypeStatOptions; + sourceFile: ts.SourceFile; } -export const findRequireRenameMutationsInFile = (request: RequireRenameRequest) => { - const mutations: Mutation[] = []; - const visitNode = (node: ts.Node) => { - if (isRequireToJsFile(node)) { - const mutation = createRequireMutation(request, node); +export const findRequireRenameMutationsInFile = ( + request: RequireRenameRequest, +) => { + const mutations: Mutation[] = []; + const visitNode = (node: ts.Node) => { + if (isRequireToJsFile(node)) { + const mutation = createRequireMutation(request, node); - if (mutation !== undefined) { - mutations.push(mutation); - } - } + if (mutation !== undefined) { + mutations.push(mutation); + } + } - ts.forEachChild(node, visitNode); - }; + ts.forEachChild(node, visitNode); + }; - visitNode(request.sourceFile); + visitNode(request.sourceFile); - return mutations; + return mutations; }; diff --git a/src/mutations/renames/isRequireToJsFile.ts b/src/mutations/renames/isRequireToJsFile.ts index 8d97dc272..fd2d6064b 100644 --- a/src/mutations/renames/isRequireToJsFile.ts +++ b/src/mutations/renames/isRequireToJsFile.ts @@ -1,20 +1,25 @@ -import * as ts from "typescript"; +import ts from "typescript"; export type LocalImplicitRequireCallExpression = ts.CallExpression & { - arguments: [ts.StringLiteral]; + arguments: [ts.StringLiteral]; }; -export const isRequireToJsFile = (node: ts.Node): node is LocalImplicitRequireCallExpression => { - if ( - !ts.isCallExpression(node) || - ts.isAsExpression(node.parent) || - ts.isTypeAssertionExpression(node.parent) || - node.arguments.length !== 1 - ) { - return false; - } +export const isRequireToJsFile = ( + node: ts.Node, +): node is LocalImplicitRequireCallExpression => { + if ( + !ts.isCallExpression(node) || + ts.isAsExpression(node.parent) || + ts.isTypeAssertionExpression(node.parent) || + node.arguments.length !== 1 + ) { + return false; + } - const firstArgument = node.arguments[0]; + const firstArgument = node.arguments[0]; - return ts.isStringLiteral(firstArgument) && firstArgument.text.match(/\.(.*)\.jsx?$/i) !== null; + return ( + ts.isStringLiteral(firstArgument) && + firstArgument.text.match(/\.(.*)\.jsx?$/i) !== null + ); }; diff --git a/src/mutations/typeMutating/createNonNullAssertion.ts b/src/mutations/typeMutating/createNonNullAssertion.ts index b6be238a4..c3fba4d87 100644 --- a/src/mutations/typeMutating/createNonNullAssertion.ts +++ b/src/mutations/typeMutating/createNonNullAssertion.ts @@ -1,7 +1,7 @@ import { TextInsertMutation, TextSwapMutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../shared/fileMutator"; +import { FileMutationsRequest } from "../../shared/fileMutator.js"; // The following node types need to be wrapped in parenthesis to stop the ! from being applied to the wrong (last) element: // As expressions: foo as Bar @@ -9,39 +9,44 @@ import { FileMutationsRequest } from "../../shared/fileMutator"; // Conditional expressions: foo ? bar : baz // Void expressions: void 0 const wrappedKinds = new Set([ - ts.SyntaxKind.AsExpression, - ts.SyntaxKind.AwaitExpression, - ts.SyntaxKind.BinaryExpression, - ts.SyntaxKind.ConditionalExpression, - ts.SyntaxKind.VoidExpression, + ts.SyntaxKind.AsExpression, + ts.SyntaxKind.AwaitExpression, + ts.SyntaxKind.BinaryExpression, + ts.SyntaxKind.ConditionalExpression, + ts.SyntaxKind.VoidExpression, ]); -export const createNonNullAssertion = (request: FileMutationsRequest, node: ts.Node): TextInsertMutation | TextSwapMutation => { - // For property assignments (`key: value`), create a non-null assertion only for `value`. - if (ts.isPropertyAssignment(node)) { - node = node.initializer; - } +export const createNonNullAssertion = ( + request: FileMutationsRequest, + node: ts.Node, +): TextInsertMutation | TextSwapMutation => { + // For property assignments (`key: value`), create a non-null assertion only for `value`. + if (ts.isPropertyAssignment(node)) { + node = node.initializer; + } - // If the node must be wrapped in parenthesis, replace all of it - if (wrappedKinds.has(node.kind)) { - return { - insertion: `(${node.getText(request.sourceFile)})!`, - range: { - begin: node.getStart(request.sourceFile), - end: node.end, - }, - type: "text-swap", - }; - } + // If the node must be wrapped in parenthesis, replace all of it + if (wrappedKinds.has(node.kind)) { + return { + insertion: `(${node.getText(request.sourceFile)})!`, + range: { + begin: node.getStart(request.sourceFile), + end: node.end, + }, + type: "text-swap", + }; + } - // Shorthand assignments (`{ value }`) must be converted to non-shorthand (`{ value: value ! }`) - const insertion = ts.isShorthandPropertyAssignment(node) ? `: ${node.getText(request.sourceFile)}!` : "!"; + // Shorthand assignments (`{ value }`) must be converted to non-shorthand (`{ value: value ! }`) + const insertion = ts.isShorthandPropertyAssignment(node) + ? `: ${node.getText(request.sourceFile)}!` + : "!"; - return { - insertion, - range: { - begin: node.end, - }, - type: "text-insert", - }; + return { + insertion, + range: { + begin: node.end, + }, + type: "text-insert", + }; }; diff --git a/src/mutators/builtIn/fixImportExtensions/README.md b/src/mutators/builtIn/fixImportExtensions/README.md index 0c30f0a17..dee512673 100644 --- a/src/mutators/builtIn/fixImportExtensions/README.md +++ b/src/mutators/builtIn/fixImportExtensions/README.md @@ -4,15 +4,15 @@ Whether to add extensions to `export` and `import` declarations that refer to fi ## Use Cases -* Your existing code uses a build tool to import from files without using extensions, but TypeScript's `declare module` syntax requires importing via extensions. +- Your existing code uses a build tool to import from files without using extensions, but TypeScript's `declare module` syntax requires importing via extensions. ## Configuration ```json { - "fixes": { - "importExtensions": true - } + "fixes": { + "importExtensions": true + } } ``` diff --git a/src/mutators/builtIn/fixImportExtensions/index.ts b/src/mutators/builtIn/fixImportExtensions/index.ts index f598063bb..8e2b4232b 100644 --- a/src/mutators/builtIn/fixImportExtensions/index.ts +++ b/src/mutators/builtIn/fixImportExtensions/index.ts @@ -1,64 +1,85 @@ import { TextInsertMutation } from "automutate"; import { glob } from "glob"; -import * as path from "path"; -import * as ts from "typescript"; +import * as path from "node:path"; +import ts from "typescript"; -import { getTypeAtLocationIfNotError } from "../../../shared/types"; -import { collectMutationsFromNodes } from "../../collectMutationsFromNodes"; -import { FileMutator, FileMutationsRequest } from "../../../shared/fileMutator"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../collectMutationsFromNodes.js"; -type ExtensionlessExportOrImport = (ts.ExportDeclaration | ts.ImportDeclaration) & { - moduleSpecifier: ts.StringLiteral; +type ExtensionlessExportOrImport = ( + | ts.ExportDeclaration + | ts.ImportDeclaration +) & { + moduleSpecifier: ts.StringLiteral; }; -export const fixImportExtensions: FileMutator = (request: FileMutationsRequest) => - request.options.fixes.importExtensions - ? collectMutationsFromNodes(request, isExtensionlessExportOrImport, visitExportOrImportDeclaration) - : undefined; +export const fixImportExtensions: FileMutator = ( + request: FileMutationsRequest, +) => + request.options.fixes.importExtensions + ? collectMutationsFromNodes( + request, + isExtensionlessExportOrImport, + visitExportOrImportDeclaration, + ) + : undefined; -const isExtensionlessExportOrImport = (node: ts.Node): node is ExtensionlessExportOrImport => { - return ( - (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && - node.moduleSpecifier !== undefined && - ts.isStringLiteral(node.moduleSpecifier) && - !path.basename(node.moduleSpecifier.text).includes(".") - ); +const isExtensionlessExportOrImport = ( + node: ts.Node, +): node is ExtensionlessExportOrImport => { + return ( + (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && + node.moduleSpecifier !== undefined && + ts.isStringLiteral(node.moduleSpecifier) && + !path.basename(node.moduleSpecifier.text).includes(".") + ); }; const visitExportOrImportDeclaration = ( - node: ExtensionlessExportOrImport, - request: FileMutationsRequest, + node: ExtensionlessExportOrImport, + request: FileMutationsRequest, ): TextInsertMutation | undefined => { - // If the type of the import is already known, we don't need to fix it - if (getTypeAtLocationIfNotError(request, node.moduleSpecifier) !== undefined) { - return undefined; - } + // If the type of the import is already known, we don't need to fix it + if ( + getTypeAtLocationIfNotError(request, node.moduleSpecifier) !== undefined + ) { + return undefined; + } - // Try each path that the import could resolve to - const basePath = path.join(path.dirname(request.sourceFile.fileName), node.moduleSpecifier.text); + // Try each path that the import could resolve to + const basePath = path.join( + path.dirname(request.sourceFile.fileName), + node.moduleSpecifier.text, + ); - for (const filePath of [basePath, path.join(basePath, "index")]) { - // If no files exist under that path, ignore this possibility - const possibilities = glob.sync(filePath + ".*"); - if (possibilities.length === 0) { - continue; - } + for (const filePath of [basePath, path.join(basePath, "index")]) { + // If no files exist under that path, ignore this possibility + const possibilities = glob.sync(filePath + ".*"); + if (possibilities.length === 0) { + continue; + } - // Figure out which extension might be relevant (i.e. anything but build artifacts) - const mostLikely = possibilities.find((possibility) => !/\.(((j|t)sx?)|map)$/.test(possibility)); - if (mostLikely === undefined) { - continue; - } + // Figure out which extension might be relevant (i.e. anything but build artifacts) + const mostLikely = possibilities.find( + (possibility) => !/\.(?:(?:j|t)sx?|map)$/.test(possibility), + ); + if (mostLikely === undefined) { + continue; + } - // Add the file's full extension to the original module specifier - return { - insertion: "." + path.basename(mostLikely).split(".").slice(1).join("."), - range: { - begin: node.moduleSpecifier.end - 1, - }, - type: "text-insert", - }; - } + // Add the file's full extension to the original module specifier + return { + insertion: "." + path.basename(mostLikely).split(".").slice(1).join("."), + range: { + begin: node.moduleSpecifier.end - 1, + }, + type: "text-insert", + }; + } - return undefined; + return undefined; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/README.md b/src/mutators/builtIn/fixIncompleteTypes/README.md index 5d9b9ddce..ca6e96403 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/README.md +++ b/src/mutators/builtIn/fixIncompleteTypes/README.md @@ -4,16 +4,16 @@ Whether to augment type annotations that don't capture all values constructs can ## Use Cases -* You're enabling `strictNullChecks` but existing types don't yet have `| null` or `| undefined` as appropriate -* You're converting from JavaScript to TypeScript and adding React component types +- You're enabling `strictNullChecks` but existing types don't yet have `| null` or `| undefined` as appropriate +- You're converting from JavaScript to TypeScript and adding React component types ## Configuration ```json { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } ``` @@ -127,11 +127,11 @@ class ContainsValue { React components can have types their props filled in using: -* Component classes: - * `static propTypes = ...` properties - * Later-assigned `.propTypes = ...` properties -* Functional components: `propTypes` properties -* Both: regular usage in JSX +- Component classes: + - `static propTypes = ...` properties + - Later-assigned `.propTypes = ...` properties +- Functional components: `propTypes` properties +- Both: regular usage in JSX Component classes will generate `interface`s, while function components will generate `type`s. diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/additions.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/additions.ts index 394f367fd..2e98b3456 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/additions.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/additions.ts @@ -1,38 +1,46 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { printNewLine } from "../../../../shared/printing/newlines"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { printNewLine } from "../../../../shared/printing/newlines.js"; -export const addNewTypeNodes = (request: FileMutationsRequest, node: ts.ClassLikeDeclaration, createdTypes: string[]) => { - const endline = printNewLine(request.options.compilerOptions); +export const addNewTypeNodes = ( + request: FileMutationsRequest, + node: ts.ClassLikeDeclaration, + createdTypes: string[], +) => { + const endline = printNewLine(request.options.compilerOptions); - return { - insertion: `${endline}${createdTypes.join(endline)}`, - range: { - begin: node.pos, - }, - type: "text-insert", - }; + return { + insertion: `${endline}${createdTypes.join(endline)}`, + range: { + begin: node.pos, + }, + type: "text-insert", + }; }; -export const addMissingTemplateTypes = (extension: ts.ExpressionWithTypeArguments, templateTypeNames: string[]) => { - if (extension.typeArguments === undefined) { - return { - insertion: `<${templateTypeNames.join(", ")}>`, - range: { - begin: extension.end, - }, - type: "text-insert", - }; - } +export const addMissingTemplateTypes = ( + extension: ts.ExpressionWithTypeArguments, + templateTypeNames: string[], +) => { + if (extension.typeArguments === undefined) { + return { + insertion: `<${templateTypeNames.join(", ")}>`, + range: { + begin: extension.end, + }, + type: "text-insert", + }; + } - const lastExistingTypeArgument = extension.typeArguments[extension.typeArguments.length - 1]; + const lastExistingTypeArgument = + extension.typeArguments[extension.typeArguments.length - 1]; - return { - insertion: `, ${templateTypeNames.slice(extension.typeArguments.length).join(", ")}`, - range: { - begin: lastExistingTypeArgument.end, - }, - type: "text-insert", - }; + return { + insertion: `, ${templateTypeNames.slice(extension.typeArguments.length).join(", ")}`, + range: { + begin: lastExistingTypeArgument.end, + }, + type: "text-insert", + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/collectTypeParameterReferences.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/collectTypeParameterReferences.ts index 1f5d27e49..ddc063def 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/collectTypeParameterReferences.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/collectTypeParameterReferences.ts @@ -1,70 +1,84 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { isNotUndefined } from "../../../../shared/arrays"; -import { getCloseAncestorCallOrNewExpression, getExpressionWithin } from "../../../../shared/nodes"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; +import { isNotUndefined } from "../../../../shared/arrays.js"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { + getCloseAncestorCallOrNewExpression, + getExpressionWithin, +} from "../../../../shared/nodes.js"; /** * Finds all the nodes that could indicate the type of a base type parameter, * by finding all references to the class's declaration nodes of that type parameter. */ export const collectTypeParameterReferences = ( - request: FileMutationsRequest, - childClass: ts.Node, - baseClass: ts.Node, - baseTypeParameter: ts.Node, + request: FileMutationsRequest, + childClass: ts.Node, + baseClass: ts.Node, + baseTypeParameter: ts.Node, ) => { - // Find nodes that reference (and therefore indicate type information for) the base type - const referencingNodes = request.fileInfoCache.getNodeReferencesAsNodes(baseTypeParameter); - if (referencingNodes === undefined) { - return undefined; - } + // Find nodes that reference (and therefore indicate type information for) the base type + const referencingNodes = + request.fileInfoCache.getNodeReferencesAsNodes(baseTypeParameter); + if (referencingNodes === undefined) { + return undefined; + } - const expandedReferences: ts.Node[] = []; + const expandedReferences: ts.Node[] = []; - // For each node, find *its* references to see what types it may be - for (const referencingNode of referencingNodes) { - const { parent } = referencingNode; - const expandedParentReferences = findParentExpandedReferences(request, parent); - if (expandedParentReferences !== undefined) { - expandedReferences.push(...expandedParentReferences); - } - } + // For each node, find *its* references to see what types it may be + for (const referencingNode of referencingNodes) { + const { parent } = referencingNode; + const expandedParentReferences = findParentExpandedReferences( + request, + parent, + ); + if (expandedParentReferences !== undefined) { + expandedReferences.push(...expandedParentReferences); + } + } - return expandedReferences; + return expandedReferences; }; -const findParentExpandedReferences = (request: FileMutationsRequest, node: ts.Node) => { - node = getEquivalentContainingTypeNode(node); +const findParentExpandedReferences = ( + request: FileMutationsRequest, + node: ts.Node, +) => { + node = getEquivalentContainingTypeNode(node); - // Property and variable declarations can be directly searched for as references - if (ts.isParameterPropertyDeclaration(node, node.parent) || ts.isPropertyDeclaration(node) || ts.isVariableDeclaration(node)) { - return request.fileInfoCache.getNodeReferencesAsNodes(node); - } + // Property and variable declarations can be directly searched for as references + if ( + ts.isParameterPropertyDeclaration(node, node.parent) || + ts.isPropertyDeclaration(node) || + ts.isVariableDeclaration(node) + ) { + return request.fileInfoCache.getNodeReferencesAsNodes(node); + } - // Parameters need to check the equivalent index of their function's calls - if (ts.isParameter(node) && ts.isFunctionLike(node.parent)) { - const calls = request.fileInfoCache.getNodeReferencesAsNodes(node.parent); - if (calls === undefined) { - return undefined; - } + // Parameters need to check the equivalent index of their function's calls + if (ts.isParameter(node) && ts.isFunctionLike(node.parent)) { + const calls = request.fileInfoCache.getNodeReferencesAsNodes(node.parent); + if (calls === undefined) { + return undefined; + } - const parentIndex = node.parent.parameters.indexOf(node); - return calls - .map(getExpressionWithin) - .map(getCloseAncestorCallOrNewExpression) - .filter(isNotUndefined) - .map((call) => call.arguments?.[parentIndex]) - .filter(isNotUndefined); - } + const parentIndex = node.parent.parameters.indexOf(node); + return calls + .map(getExpressionWithin) + .map(getCloseAncestorCallOrNewExpression) + .filter(isNotUndefined) + .map((call) => call.arguments?.[parentIndex]) + .filter(isNotUndefined); + } - return undefined; + return undefined; }; const getEquivalentContainingTypeNode = (node: ts.Node) => { - while (ts.isIntersectionTypeNode(node.parent)) { - node = node.parent.parent; - } + while (ts.isIntersectionTypeNode(node.parent)) { + node = node.parent.parent; + } - return node; + return node; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitClassGenerics/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitClassGenerics/index.ts index 696d547d0..050ecb0ec 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitClassGenerics/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitClassGenerics/index.ts @@ -1,41 +1,66 @@ -import { combineMutations, Mutation } from "automutate"; -import * as ts from "typescript"; - -import { isNotUndefined } from "../../../../../shared/arrays"; -import { getBaseClassDeclaration, getClassExtendsExpression } from "../../../../../shared/nodeExtensions"; -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; -import { addMissingTemplateTypes, addNewTypeNodes } from "../additions"; -import { findMissingTemplateTypes } from "../templateCollecting"; -import { fillInMissingTemplateTypes } from "../templateMutating"; - -export const fixIncompleteImplicitClassGenerics: FileMutator = (request: FileMutationsRequest) => - collectMutationsFromNodes(request, ts.isClassLike, visitClassLike); - -const visitClassLike = (node: ts.ClassLikeDeclaration, request: FileMutationsRequest): Mutation | undefined => { - // We'll want a class node that extends some base class - const extension = getClassExtendsExpression(node); - if (extension === undefined) { - return undefined; - } - - // If that base class doesn't include type parameters, there's nothing to fill out - const baseClass = getBaseClassDeclaration(request, extension); - if (baseClass === undefined || baseClass.typeParameters === undefined) { - return undefined; - } - - // If that class declares any templated types, check the node's types assigned as them - const missingTemplateTypes = findMissingTemplateTypes(request, node, baseClass); - - // We can skip performing any mutation if none of the parameter types had missing types - if (missingTemplateTypes.length === 0 || !missingTemplateTypes.some(isNotUndefined)) { - return undefined; - } - - // Collect type names to fill in and their corresponding new type declarations - const { createdTypes, templateTypeNames } = fillInMissingTemplateTypes(request, node, baseClass.typeParameters, missingTemplateTypes); - - // Print the new types above the class and fill in the new template types - return combineMutations(addNewTypeNodes(request, node, createdTypes), addMissingTemplateTypes(extension, templateTypeNames)); +import { Mutation, combineMutations } from "automutate"; +import ts from "typescript"; + +import { isNotUndefined } from "../../../../../shared/arrays.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { + getBaseClassDeclaration, + getClassExtendsExpression, +} from "../../../../../shared/nodeExtensions.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { addMissingTemplateTypes, addNewTypeNodes } from "../additions.js"; +import { findMissingTemplateTypes } from "../templateCollecting.js"; +import { fillInMissingTemplateTypes } from "../templateMutating.js"; + +export const fixIncompleteImplicitClassGenerics: FileMutator = ( + request: FileMutationsRequest, +) => collectMutationsFromNodes(request, ts.isClassLike, visitClassLike); + +const visitClassLike = ( + node: ts.ClassLikeDeclaration, + request: FileMutationsRequest, +): Mutation | undefined => { + // We'll want a class node that extends some base class + const extension = getClassExtendsExpression(node); + if (extension === undefined) { + return undefined; + } + + // If that base class doesn't include type parameters, there's nothing to fill out + const baseClass = getBaseClassDeclaration(request, extension); + if (baseClass?.typeParameters === undefined) { + return undefined; + } + + // If that class declares any templated types, check the node's types assigned as them + const missingTemplateTypes = findMissingTemplateTypes( + request, + node, + baseClass, + ); + + // We can skip performing any mutation if none of the parameter types had missing types + if ( + missingTemplateTypes.length === 0 || + !missingTemplateTypes.some(isNotUndefined) + ) { + return undefined; + } + + // Collect type names to fill in and their corresponding new type declarations + const { createdTypes, templateTypeNames } = fillInMissingTemplateTypes( + request, + node, + baseClass.typeParameters, + missingTemplateTypes, + ); + + // Print the new types above the class and fill in the new template types + return combineMutations( + addNewTypeNodes(request, node, createdTypes), + addMissingTemplateTypes(extension, templateTypeNames), + ); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/collectGenericUses.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/collectGenericUses.ts index 690455a60..182258bd0 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/collectGenericUses.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/collectGenericUses.ts @@ -1,88 +1,100 @@ -import * as ts from "typescript"; -import { getTypeAtLocationIfNotError } from "../../../../../shared/types"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; - -import { GenericClassDetails } from "./getGenericClassDetails"; -import { VariableWithImplicitGeneric } from "./implicitGenericTypes"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../../../shared/types.js"; +import { GenericClassDetails } from "./getGenericClassDetails.js"; +import { VariableWithImplicitGeneric } from "./implicitGenericTypes.js"; /** * @returns Map of the names of a class' generic template types to the types passed to them. */ export const collectGenericUses = ( - request: FileMutationsRequest, - node: VariableWithImplicitGeneric, - genericClassDetails: GenericClassDetails, + request: FileMutationsRequest, + node: VariableWithImplicitGeneric, + genericClassDetails: GenericClassDetails, ): Map | undefined => { - const references = request.fileInfoCache.getNodeReferencesAsNodes(node); - if (references === undefined) { - return undefined; - } - - const assignedParameterTypes = new Map(); - - const addAssignmentToTypeParameter = (typeParameterName: string, argumentType: ts.Type) => { - const existing = assignedParameterTypes.get(typeParameterName); - - if (existing === undefined) { - assignedParameterTypes.set(typeParameterName, [argumentType]); - } else { - existing.push(argumentType); - } - }; - - // Each reference might contain a call expression to a member of the generic container - for (const reference of references) { - if (!ts.isExpressionStatement(reference)) { - continue; - } - - const callExpression = reference.expression; - if (!ts.isCallExpression(callExpression)) { - continue; - } - - const callArguments = callExpression.arguments; - if (callArguments.length === 0) { - continue; - } - - const propertyAccessExpression = callExpression.expression; - if (!ts.isPropertyAccessExpression(propertyAccessExpression)) { - continue; - } - - // Only look at members that are known to have the generic parameters, like `indexOf(item: T)` - const memberName = propertyAccessExpression.name.text; - const memberDetails = genericClassDetails.membersWithGenericParameters.get(memberName); - if (memberDetails === undefined) { - continue; - } - - for (const [parameterIndex, { parameterName, parameterType }] of memberDetails) { - if (parameterIndex >= callArguments.length) { - continue; - } - - const parameterIndexType = getTypeAtLocationIfNotError(request, callArguments[parameterIndex]); - if (parameterIndexType === undefined) { - continue; - } - - // For each parameter passed to the generic use, we'll record its assignment type - addAssignmentToTypeParameter(parameterName, parameterIndexType); - - // If the parameter is a rest parameter, also add assignment types for any following arguments - if (parameterType.parent.dotDotDotToken !== undefined) { - for (const callArgument of callArguments.slice(parameterIndex + 1)) { - const callArgumentType = getTypeAtLocationIfNotError(request, callArgument); - if (callArgumentType !== undefined) { - addAssignmentToTypeParameter(parameterName, callArgumentType); - } - } - } - } - } - - return assignedParameterTypes; + const references = request.fileInfoCache.getNodeReferencesAsNodes(node); + if (references === undefined) { + return undefined; + } + + const assignedParameterTypes = new Map(); + + const addAssignmentToTypeParameter = ( + typeParameterName: string, + argumentType: ts.Type, + ) => { + const existing = assignedParameterTypes.get(typeParameterName); + + if (existing === undefined) { + assignedParameterTypes.set(typeParameterName, [argumentType]); + } else { + existing.push(argumentType); + } + }; + + // Each reference might contain a call expression to a member of the generic container + for (const reference of references) { + if (!ts.isExpressionStatement(reference)) { + continue; + } + + const callExpression = reference.expression; + if (!ts.isCallExpression(callExpression)) { + continue; + } + + const callArguments = callExpression.arguments; + if (callArguments.length === 0) { + continue; + } + + const propertyAccessExpression = callExpression.expression; + if (!ts.isPropertyAccessExpression(propertyAccessExpression)) { + continue; + } + + // Only look at members that are known to have the generic parameters, like `indexOf(item: T)` + const memberName = propertyAccessExpression.name.text; + const memberDetails = + genericClassDetails.membersWithGenericParameters.get(memberName); + if (memberDetails === undefined) { + continue; + } + + for (const [ + parameterIndex, + { parameterName, parameterType }, + ] of memberDetails) { + if (parameterIndex >= callArguments.length) { + continue; + } + + const parameterIndexType = getTypeAtLocationIfNotError( + request, + callArguments[parameterIndex], + ); + if (parameterIndexType === undefined) { + continue; + } + + // For each parameter passed to the generic use, we'll record its assignment type + addAssignmentToTypeParameter(parameterName, parameterIndexType); + + // If the parameter is a rest parameter, also add assignment types for any following arguments + if (parameterType.parent.dotDotDotToken !== undefined) { + for (const callArgument of callArguments.slice(parameterIndex + 1)) { + const callArgumentType = getTypeAtLocationIfNotError( + request, + callArgument, + ); + if (callArgumentType !== undefined) { + addAssignmentToTypeParameter(parameterName, callArgumentType); + } + } + } + } + } + + return assignedParameterTypes; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/createExplicitGenericType.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/createExplicitGenericType.ts index daede0473..632942f5e 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/createExplicitGenericType.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/createExplicitGenericType.ts @@ -1,90 +1,107 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { joinIntoGenericType } from "../../../../../mutations/generics"; -import { isTypeArgumentsType } from "../../../../../shared/typeNodes"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; - -import { GenericClassDetails } from "./getGenericClassDetails"; -import { VariableWithImplicitGeneric } from "./implicitGenericTypes"; +import { joinIntoGenericType } from "../../../../../mutations/generics.js"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { isTypeArgumentsType } from "../../../../../shared/typeNodes.js"; +import { GenericClassDetails } from "./getGenericClassDetails.js"; +import { VariableWithImplicitGeneric } from "./implicitGenericTypes.js"; /** * @returns Test insertion mutation if a generic type should be made explicit. */ export const createExplicitGenericType = ( - request: FileMutationsRequest, - node: VariableWithImplicitGeneric, - genericClassDetails: GenericClassDetails, - allAssignedGenericTypes: Map, + request: FileMutationsRequest, + node: VariableWithImplicitGeneric, + genericClassDetails: GenericClassDetails, + allAssignedGenericTypes: Map, ) => { - const allTypeArgumentTypes: ts.Type[][] = []; - - // For each type parameter, collect the types assigned to it - for (const typeParameterName of genericClassDetails.typeParameterNames) { - const typeArgumentTypes = allAssignedGenericTypes.get(typeParameterName); - if (typeArgumentTypes === undefined) { - return undefined; - } - - allTypeArgumentTypes.push(typeArgumentTypes); - } - - // If we couldn't find any types, there's nothing to do here - if (allTypeArgumentTypes.length === 0) { - return undefined; - } - - // If the node's inferred generic type already contains the later types, don't change anything - if (allTypeArgumentTypesMatch(request, allTypeArgumentTypes, node)) { - return undefined; - } - - // Convert the container and its type assignments into a labeled type - const joinedGenericType = joinIntoGenericType(request, genericClassDetails.containerType, allTypeArgumentTypes); - if (joinedGenericType === undefined) { - return undefined; - } - - return { - insertion: `: ${joinedGenericType}`, - range: { - begin: node.name.end, - }, - type: "text-insert", - }; + const allTypeArgumentTypes: ts.Type[][] = []; + + // For each type parameter, collect the types assigned to it + for (const typeParameterName of genericClassDetails.typeParameterNames) { + const typeArgumentTypes = allAssignedGenericTypes.get(typeParameterName); + if (typeArgumentTypes === undefined) { + return undefined; + } + + allTypeArgumentTypes.push(typeArgumentTypes); + } + + // If we couldn't find any types, there's nothing to do here + if (allTypeArgumentTypes.length === 0) { + return undefined; + } + + // If the node's inferred generic type already contains the later types, don't change anything + if (allTypeArgumentTypesMatch(request, allTypeArgumentTypes, node)) { + return undefined; + } + + // Convert the container and its type assignments into a labeled type + const joinedGenericType = joinIntoGenericType( + request, + genericClassDetails.containerType, + allTypeArgumentTypes, + ); + + return { + insertion: `: ${joinedGenericType}`, + range: { + begin: node.name.end, + }, + type: "text-insert", + }; }; -const allTypeArgumentTypesMatch = (request: FileMutationsRequest, allTypeArgumentTypes: ts.Type[][], node: ts.Node) => { - const typeChecker = request.services.program.getTypeChecker(); - - // If the original type doesn't have type arguments, bail out immediately - const originalType = typeChecker.getTypeAtLocation(node); - if (!isTypeArgumentsType(originalType)) { - return false; - } - - // If the implicit type has defaulted to any, ignore it (assume a non-match) - if (originalType.typeArguments.some((typeArgument) => tsutils.isTypeFlagSet(typeArgument, ts.TypeFlags.Any))) { - return false; - } - - // If the implicit types are all unknown, assume a non-match for being unknown - if (originalType.typeArguments.every((typeArgument) => tsutils.isTypeFlagSet(typeArgument, ts.TypeFlags.Unknown))) { - return false; - } - - // Otherwise, check that all type arguments sub-types match the original type at the same index - for (const typeArgumentTypes of allTypeArgumentTypes) { - if (typeArgumentTypes.length !== originalType.typeArguments.length) { - return false; - } - - for (let i = 0; i < typeArgumentTypes.length; i += 1) { - if (!typeChecker.isTypeAssignableTo(typeArgumentTypes[i], originalType.typeArguments[i])) { - return false; - } - } - } - - return true; +const allTypeArgumentTypesMatch = ( + request: FileMutationsRequest, + allTypeArgumentTypes: ts.Type[][], + node: ts.Node, +) => { + const typeChecker = request.services.program.getTypeChecker(); + + // If the original type doesn't have type arguments, bail out immediately + const originalType = typeChecker.getTypeAtLocation(node); + if (!isTypeArgumentsType(originalType)) { + return false; + } + + // If the implicit type has defaulted to any, ignore it (assume a non-match) + if ( + originalType.typeArguments.some((typeArgument) => + tsutils.isTypeFlagSet(typeArgument, ts.TypeFlags.Any), + ) + ) { + return false; + } + + // If the implicit types are all unknown, assume a non-match for being unknown + if ( + originalType.typeArguments.every((typeArgument) => + tsutils.isTypeFlagSet(typeArgument, ts.TypeFlags.Unknown), + ) + ) { + return false; + } + + // Otherwise, check that all type arguments sub-types match the original type at the same index + for (const typeArgumentTypes of allTypeArgumentTypes) { + if (typeArgumentTypes.length !== originalType.typeArguments.length) { + return false; + } + + for (let i = 0; i < typeArgumentTypes.length; i += 1) { + if ( + !typeChecker.isTypeAssignableTo( + typeArgumentTypes[i], + originalType.typeArguments[i], + ) + ) { + return false; + } + } + } + + return true; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/getGenericClassDetails.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/getGenericClassDetails.ts index 138eb0e69..c069f2883 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/getGenericClassDetails.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/getGenericClassDetails.ts @@ -1,151 +1,183 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { getTypeAtLocationIfNotError, typeHasLocalTypeParameters } from "../../../../../shared/types"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; - -import { VariableWithImplicitGeneric } from "./implicitGenericTypes"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { + getTypeAtLocationIfNotError, + typeHasLocalTypeParameters, +} from "../../../../../shared/types.js"; +import { VariableWithImplicitGeneric } from "./implicitGenericTypes.js"; /** * For a generic type, its type parameter names and member functions that use them. */ export interface GenericClassDetails { - /** - * Type of the underlying class (often an interface). - */ - containerType: ts.InterfaceType; - - /** - * Maps from member names to the parameter index and types associated with a type parameter. - * For example, in Array, that would be `{ "push" => { 0 => (T) } }` - */ - membersWithGenericParameters: Map>; - - /** - * Ordered names of (local) type parameters on the type. - */ - typeParameterNames: ReadonlyArray; + /** + * Type of the underlying class (often an interface). + */ + containerType: ts.InterfaceType; + + /** + * Maps from member names to the parameter index and types associated with a type parameter. + * For example, in Array, that would be `{ "push" => { 0 => (T) } }` + */ + membersWithGenericParameters: Map< + string, + Map + >; + + /** + * Ordered names of (local) type parameters on the type. + */ + typeParameterNames: readonly string[]; } export type ParameterTypeNode = ts.TypeNode & { - parent: ts.ParameterDeclaration; + parent: ts.ParameterDeclaration; }; export interface ParameterTypeNodeSummary { - parameterName: string; - parameterType: ParameterTypeNode; + parameterName: string; + parameterType: ParameterTypeNode; } -export const getGenericClassDetails = (request: FileMutationsRequest, node: VariableWithImplicitGeneric) => { - // Get the backing type of the variable's initializer - const initializerType = getTypeAtLocationIfNotError(request, node.initializer); - const initializerSymbol = initializerType?.getSymbol(); - if (initializerSymbol === undefined) { - return undefined; - } - - // We'll be looking at the list of members available on that type - const initializerMembers = initializerSymbol.members; - if (initializerMembers === undefined || initializerMembers.size === 0) { - return undefined; - } - - // Only care about types that have at least one (local?) type parameter - const typeChecker = request.services.program.getTypeChecker(); - const containerType = typeChecker.getDeclaredTypeOfSymbol(initializerSymbol); - if ( - !typeHasLocalTypeParameters(containerType) || - containerType.localTypeParameters === undefined || - containerType.localTypeParameters.length === 0 - ) { - return undefined; - } - - // Create the summary of type parameter names with relevant member functions - return fillMembersWithGenericParameters( - containerType, - containerType.localTypeParameters.map((typeParameter) => typeParameter.symbol.name), - initializerMembers, - ); +export const getGenericClassDetails = ( + request: FileMutationsRequest, + node: VariableWithImplicitGeneric, +) => { + // Get the backing type of the variable's initializer + const initializerType = getTypeAtLocationIfNotError( + request, + node.initializer, + ); + const initializerSymbol = initializerType?.getSymbol(); + if (initializerSymbol === undefined) { + return undefined; + } + + // We'll be looking at the list of members available on that type + const initializerMembers = initializerSymbol.members; + if (initializerMembers === undefined || initializerMembers.size === 0) { + return undefined; + } + + // Only care about types that have at least one (local?) type parameter + const typeChecker = request.services.program.getTypeChecker(); + const containerType = typeChecker.getDeclaredTypeOfSymbol(initializerSymbol); + if ( + !typeHasLocalTypeParameters(containerType) || + containerType.localTypeParameters === undefined || + containerType.localTypeParameters.length === 0 + ) { + return undefined; + } + + // Create the summary of type parameter names with relevant member functions + return fillMembersWithGenericParameters( + containerType, + containerType.localTypeParameters.map( + (typeParameter) => typeParameter.symbol.name, + ), + initializerMembers, + ); }; /** * @returns For the container type, type parameter names with member functions that use them */ const fillMembersWithGenericParameters = ( - containerType: ts.InterfaceType, - typeParameterNames: ReadonlyArray, - initializerMembers: ts.UnderscoreEscapedMap, + containerType: ts.InterfaceType, + typeParameterNames: readonly string[], + initializerMembers: Map, ): GenericClassDetails => { - const membersWithGenericParameters = new Map>(); - const typeParameterNamesSet = new Set(typeParameterNames); - - /** - * If a parameter's type name is a reference to a local parameter, adds it to the mapping. - */ - const setMemberWithGenericParameterIfMatched = ( - memberName: string, - parameterIndex: number, - typeName: ts.Node, - parameterType: ParameterTypeNode, - ) => { - if (!ts.isIdentifier(typeName)) { - return; - } - - const parameterName = typeName.text; - if (!typeParameterNamesSet.has(parameterName)) { - return; - } - - const existing = membersWithGenericParameters.get(memberName); - const summary = { parameterName, parameterType }; - - if (existing === undefined) { - membersWithGenericParameters.set(memberName, new Map([[parameterIndex, summary]])); - } else { - existing.set(parameterIndex, summary); - } - }; - - // We'll be looking through all members declared on the backing initializer's type - initializerMembers.forEach((memberSymbol) => { - // Skip the member if it's the type itself, as that might be included in .members - const memberName = memberSymbol.name; - if (typeParameterNamesSet.has(memberName)) { - return; - } - - // We only care about parameters that can receive instances of the generic type - const { valueDeclaration } = memberSymbol; - if (!ts.isFunctionLike(valueDeclaration)) { - return; - } - - for (let i = 0; i < valueDeclaration.parameters.length; i += 1) { - const parameter = valueDeclaration.parameters[i]; - const parameterType = parameter.type as ParameterTypeNode | undefined; - if (parameterType === undefined) { - continue; - } - - // Case: indexOf(item: T) - // Add the parameter if the direct T type matches - if (ts.isTypeReferenceNode(parameterType)) { - setMemberWithGenericParameterIfMatched(memberName, i, parameterType.typeName, parameterType); - continue; - } - - // Case: push(...items: T[]) - // Add the parameter if the T within the array type matches - if (ts.isArrayTypeNode(parameterType) && ts.isTypeReferenceNode(parameterType.elementType)) { - setMemberWithGenericParameterIfMatched(memberName, i, parameterType.elementType.typeName, parameterType); - continue; - } - - // There could probably be more cases here, such as `concat(...items: ConcatArray[])`, - // For now the `item: T` and `...items: T[]` cases capture most uses of built-in generics - } - }); - - return { containerType, membersWithGenericParameters, typeParameterNames }; + const membersWithGenericParameters = new Map< + string, + Map + >(); + const typeParameterNamesSet = new Set(typeParameterNames); + + /** + * If a parameter's type name is a reference to a local parameter, adds it to the mapping. + */ + const setMemberWithGenericParameterIfMatched = ( + memberName: string, + parameterIndex: number, + typeName: ts.Node, + parameterType: ParameterTypeNode, + ) => { + if (!ts.isIdentifier(typeName)) { + return; + } + + const parameterName = typeName.text; + if (!typeParameterNamesSet.has(parameterName)) { + return; + } + + const existing = membersWithGenericParameters.get(memberName); + const summary = { parameterName, parameterType }; + + if (existing === undefined) { + membersWithGenericParameters.set( + memberName, + new Map([[parameterIndex, summary]]), + ); + } else { + existing.set(parameterIndex, summary); + } + }; + + // We'll be looking through all members declared on the backing initializer's type + initializerMembers.forEach((memberSymbol) => { + // Skip the member if it's the type itself, as that might be included in .members + const memberName = memberSymbol.name; + if (typeParameterNamesSet.has(memberName)) { + return; + } + + // We only care about parameters that can receive instances of the generic type + const { valueDeclaration } = memberSymbol; + if (!ts.isFunctionLike(valueDeclaration)) { + return; + } + + for (let i = 0; i < valueDeclaration.parameters.length; i += 1) { + const parameter = valueDeclaration.parameters[i]; + const parameterType = parameter.type as ParameterTypeNode | undefined; + if (parameterType === undefined) { + continue; + } + + // Case: indexOf(item: T) + // Add the parameter if the direct T type matches + if (ts.isTypeReferenceNode(parameterType)) { + setMemberWithGenericParameterIfMatched( + memberName, + i, + parameterType.typeName, + parameterType, + ); + continue; + } + + // Case: push(...items: T[]) + // Add the parameter if the T within the array type matches + if ( + ts.isArrayTypeNode(parameterType) && + ts.isTypeReferenceNode(parameterType.elementType) + ) { + setMemberWithGenericParameterIfMatched( + memberName, + i, + parameterType.elementType.typeName, + parameterType, + ); + continue; + } + + // There could probably be more cases here, such as `concat(...items: ConcatArray[])`, + // For now the `item: T` and `...items: T[]` cases capture most uses of built-in generics + } + }); + + return { containerType, membersWithGenericParameters, typeParameterNames }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/implicitGenericTypes.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/implicitGenericTypes.ts index adaa8d1c9..23318bd7c 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/implicitGenericTypes.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/implicitGenericTypes.ts @@ -1,33 +1,37 @@ -import * as ts from "typescript"; +import ts from "typescript"; export type VariableWithImplicitGeneric = ts.VariableDeclaration & { - initializer: GenericCapableInitializer; - type: undefined; + initializer: GenericCapableInitializer; + type: undefined; }; type GenericCapableInitializer = ts.ArrayLiteralExpression | ts.NewExpression; -export const isVariableWithImplicitGeneric = (node: ts.Node): node is VariableWithImplicitGeneric => - // We'll be looking at variable declarations... - ts.isVariableDeclaration(node) && - // ...without a predeclared type... - node.type === undefined && - // ...but with an initially declared value... - node.initializer !== undefined && - // ...that's a value we know can have a generic added - isGenericCapableInitializer(node.initializer); +export const isVariableWithImplicitGeneric = ( + node: ts.Node, +): node is VariableWithImplicitGeneric => + // We'll be looking at variable declarations... + ts.isVariableDeclaration(node) && + // ...without a predeclared type... + node.type === undefined && + // ...but with an initially declared value... + node.initializer !== undefined && + // ...that's a value we know can have a generic added + isGenericCapableInitializer(node.initializer); -const isGenericCapableInitializer = (initializer: ts.Expression): initializer is GenericCapableInitializer => { - // Array literals can always be generic - if (ts.isArrayLiteralExpression(initializer)) { - return true; - } +const isGenericCapableInitializer = ( + initializer: ts.Expression, +): initializer is GenericCapableInitializer => { + // Array literals can always be generic + if (ts.isArrayLiteralExpression(initializer)) { + return true; + } - // New expressions are only valid if they don't already declare generics - if (ts.isNewExpression(initializer)) { - return initializer.typeArguments === undefined; - } + // New expressions are only valid if they don't already declare generics + if (ts.isNewExpression(initializer)) { + return initializer.typeArguments === undefined; + } - // So far, no other initializers are known to be generic capable - return false; + // So far, no other initializers are known to be generic capable + return false; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/index.ts index 58be11f18..c2f2a47c3 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/fixIncompleteImplicitVariableGenerics/index.ts @@ -1,29 +1,52 @@ -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { collectGenericUses } from "./collectGenericUses.js"; +import { createExplicitGenericType } from "./createExplicitGenericType.js"; +import { getGenericClassDetails } from "./getGenericClassDetails.js"; +import { + VariableWithImplicitGeneric, + isVariableWithImplicitGeneric, +} from "./implicitGenericTypes.js"; -import { collectGenericUses } from "./collectGenericUses"; -import { createExplicitGenericType } from "./createExplicitGenericType"; -import { getGenericClassDetails } from "./getGenericClassDetails"; -import { isVariableWithImplicitGeneric, VariableWithImplicitGeneric } from "./implicitGenericTypes"; +export const fixIncompleteImplicitVariableGenerics: FileMutator = ( + request: FileMutationsRequest, +) => + collectMutationsFromNodes( + request, + isVariableWithImplicitGeneric, + visitVariableWithImplicitGeneric, + ); -export const fixIncompleteImplicitVariableGenerics: FileMutator = (request: FileMutationsRequest) => - collectMutationsFromNodes(request, isVariableWithImplicitGeneric, visitVariableWithImplicitGeneric); +const visitVariableWithImplicitGeneric = ( + node: VariableWithImplicitGeneric, + request: FileMutationsRequest, +) => { + // Get the type of class the variable is an instance of, such as [] (Array) or Map + // If the variable's class didn't have generics, we can ignore this + const genericClassDetails = getGenericClassDetails(request, node); + if (genericClassDetails === undefined) { + return undefined; + } -const visitVariableWithImplicitGeneric = (node: VariableWithImplicitGeneric, request: FileMutationsRequest) => { - // Get the type of class the variable is an instance of, such as [] (Array) or Map - // If the variable's class didn't have generics, we can ignore this - const genericClassDetails = getGenericClassDetails(request, node); - if (genericClassDetails === undefined) { - return undefined; - } + // Find places where the node was either assigned a known type or its method was called with a type + // If the node is never used with a (non-any) type, there's nothing we can (or would want) to do + const assignedGenericTypes = collectGenericUses( + request, + node, + genericClassDetails, + ); + if (assignedGenericTypes === undefined || assignedGenericTypes.size === 0) { + return undefined; + } - // Find places where the node was either assigned a known type or its method was called with a type - // If the node is never used with a (non-any) type, there's nothing we can (or would want) to do - const assignedGenericTypes = collectGenericUses(request, node, genericClassDetails); - if (assignedGenericTypes === undefined || assignedGenericTypes.size === 0) { - return undefined; - } - - // Combine those type uses into a new explicit generic type on the node - return createExplicitGenericType(request, node, genericClassDetails, assignedGenericTypes); + // Combine those type uses into a new explicit generic type on the node + return createExplicitGenericType( + request, + node, + genericClassDetails, + assignedGenericTypes, + ); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/index.ts index 8b467e0d8..0c6da0929 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/index.ts @@ -1,11 +1,18 @@ -import { findFirstMutations } from "../../../../shared/runtime"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../../shared/runtime.js"; +import { fixIncompleteImplicitClassGenerics } from "./fixIncompleteImplicitClassGenerics/index.js"; +import { fixIncompleteImplicitVariableGenerics } from "./fixIncompleteImplicitVariableGenerics/index.js"; -import { fixIncompleteImplicitClassGenerics } from "./fixIncompleteImplicitClassGenerics"; -import { fixIncompleteImplicitVariableGenerics } from "./fixIncompleteImplicitVariableGenerics"; - -export const fixIncompleteImplicitGenerics: FileMutator = (request: FileMutationsRequest) => - findFirstMutations(request, [ - ["fixIncompleteImplicitClassGenerics", fixIncompleteImplicitClassGenerics], - ["fixIncompleteImplicitVariableGenerics", fixIncompleteImplicitVariableGenerics], - ]); +export const fixIncompleteImplicitGenerics: FileMutator = ( + request: FileMutationsRequest, +) => + findFirstMutations(request, [ + ["fixIncompleteImplicitClassGenerics", fixIncompleteImplicitClassGenerics], + [ + "fixIncompleteImplicitVariableGenerics", + fixIncompleteImplicitVariableGenerics, + ], + ]); diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateCollecting.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateCollecting.ts index e396bae80..1abd3650b 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateCollecting.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateCollecting.ts @@ -1,223 +1,279 @@ -import * as ts from "typescript"; - -import { AssignedTypesByName, AssignedTypeValue, joinAssignedTypesByName } from "../../../../mutations/assignments"; -import { getCallExpressionType } from "../../../../shared/calls"; -import { getStaticNameOfProperty } from "../../../../shared/names"; -import { isNodeAssigningBinaryExpression, isNodeWithinNode } from "../../../../shared/nodes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; - -import { collectTypeParameterReferences } from "./collectTypeParameterReferences"; +import ts from "typescript"; + +import { + AssignedTypeValue, + AssignedTypesByName, + joinAssignedTypesByName, +} from "../../../../mutations/assignments.js"; +import { getCallExpressionType } from "../../../../shared/calls.js"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { getStaticNameOfProperty } from "../../../../shared/names.js"; +import { + isNodeAssigningBinaryExpression, + isNodeWithinNode, +} from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectTypeParameterReferences } from "./collectTypeParameterReferences.js"; export const findMissingTemplateTypes = ( - request: FileMutationsRequest, - childClass: ts.ClassLikeDeclaration, - baseClass: ts.ClassLikeDeclaration, -): (string | AssignedTypesByName | undefined)[] => { - // If the base class doesn't define any type parameters, we have nothing to do - const baseTypeParameters = baseClass.typeParameters; - if (baseTypeParameters === undefined) { - return []; - } - - const missingTemplateTypes: (string | AssignedTypesByName | undefined)[] = []; - let i = 0; - - // Ignore any type parameters already declared on the class - if (childClass.heritageClauses !== undefined) { - for (const heritageClause of childClass.heritageClauses) { - if (heritageClause.token === ts.SyntaxKind.ExtendsKeyword) { - for (const heritageType of heritageClause.types) { - if (heritageType.typeArguments !== undefined) { - for (i; i < heritageType.typeArguments.length; i += 1) { - missingTemplateTypes.push(undefined); - } - } - } - } - } - } - - // For each remaining base type parameter, collect any extra types not yet declared on it - // For example, if it defaults to `{ exists: boolean }` but is given `.extra = 1;`, collect `extra: number` - for (const baseTypeParameter of baseTypeParameters.slice(i)) { - missingTemplateTypes.push(collectMissingParameterTypes(request, childClass, baseClass, baseTypeParameter)); - } - - return missingTemplateTypes; + request: FileMutationsRequest, + childClass: ts.ClassLikeDeclaration, + baseClass: ts.ClassLikeDeclaration, +): (AssignedTypesByName | string | undefined)[] => { + // If the base class doesn't define any type parameters, we have nothing to do + const baseTypeParameters = baseClass.typeParameters; + if (baseTypeParameters === undefined) { + return []; + } + + const missingTemplateTypes: (AssignedTypesByName | string | undefined)[] = []; + let i = 0; + + // Ignore any type parameters already declared on the class + if (childClass.heritageClauses !== undefined) { + for (const heritageClause of childClass.heritageClauses) { + if (heritageClause.token === ts.SyntaxKind.ExtendsKeyword) { + for (const heritageType of heritageClause.types) { + if (heritageType.typeArguments !== undefined) { + for (i; i < heritageType.typeArguments.length; i += 1) { + missingTemplateTypes.push(undefined); + } + } + } + } + } + } + + // For each remaining base type parameter, collect any extra types not yet declared on it + // For example, if it defaults to `{ exists: boolean }` but is given `.extra = 1;`, collect `extra: number` + for (const baseTypeParameter of baseTypeParameters.slice(i)) { + missingTemplateTypes.push( + collectMissingParameterTypes( + request, + childClass, + baseClass, + baseTypeParameter, + ), + ); + } + + return missingTemplateTypes; }; const collectMissingParameterTypes = ( - request: FileMutationsRequest, - childClass: ts.ClassLikeDeclaration, - baseClass: ts.ClassLikeDeclaration, - baseTypeParameter: ts.TypeParameterDeclaration, -): string | AssignedTypesByName | undefined => { - // Each usage of the base type parameter might introduce new assigned types - const typeParameterReferences = collectTypeParameterReferences(request, childClass, baseClass, baseTypeParameter); - if (typeParameterReferences === undefined) { - return undefined; - } - - // Collect all types assigned by those uses that don't already exist on the template's default - const missingAssignedTypeValues = collectMissingAssignedParameterTypes(request, childClass, baseTypeParameter, typeParameterReferences); - - // If we found known names for the node, use them as a raw string - if (missingAssignedTypeValues instanceof Set) { - return Array.from(missingAssignedTypeValues).join(" | "); - } - - // If we've found nothing, the parameter checks out and shouldn't be filled in - if (missingAssignedTypeValues.length === 0) { - return undefined; - } - - // If we've found missing type members, return them to indicate they should be filled in - return joinAssignedTypesByName(request, missingAssignedTypeValues); + request: FileMutationsRequest, + childClass: ts.ClassLikeDeclaration, + baseClass: ts.ClassLikeDeclaration, + baseTypeParameter: ts.TypeParameterDeclaration, +): AssignedTypesByName | string | undefined => { + // Each usage of the base type parameter might introduce new assigned types + const typeParameterReferences = collectTypeParameterReferences( + request, + childClass, + baseClass, + baseTypeParameter, + ); + if (typeParameterReferences === undefined) { + return undefined; + } + + // Collect all types assigned by those uses that don't already exist on the template's default + const missingAssignedTypeValues = collectMissingAssignedParameterTypes( + request, + childClass, + baseTypeParameter, + typeParameterReferences, + ); + + // If we found known names for the node, use them as a raw string + if (missingAssignedTypeValues instanceof Set) { + return Array.from(missingAssignedTypeValues).join(" | "); + } + + // If we've found nothing, the parameter checks out and shouldn't be filled in + if (missingAssignedTypeValues.length === 0) { + return undefined; + } + + // If we've found missing type members, return them to indicate they should be filled in + return joinAssignedTypesByName(request, missingAssignedTypeValues); }; const collectMissingAssignedParameterTypes = ( - request: FileMutationsRequest, - childClass: ts.ClassLikeDeclaration, - baseTypeParameter: ts.TypeParameterDeclaration, - typeParameterReferences: ts.Node[], + request: FileMutationsRequest, + childClass: ts.ClassLikeDeclaration, + baseTypeParameter: ts.TypeParameterDeclaration, + typeParameterReferences: ts.Node[], ) => { - const knownNames = new Set(); - const assignedTypeValues: AssignedTypeValue[] = []; - const childClassType = getTypeAtLocationIfNotError(request, childClass); - if (childClassType === undefined) { - return knownNames; - } - - const defaultTypeParameterType = - baseTypeParameter.default === undefined ? undefined : getTypeAtLocationIfNotError(request, baseTypeParameter.default); - - for (const typeParameterReference of typeParameterReferences) { - // For now, we only look at nodes whose usage is declared *within* the child class - // In theory this could be expanded to check target instances, but that'd be more work... - // e.g. new ClassWithGeneric().setGenericValue('it is a string'); - if (!isNodeWithinNode(request.sourceFile, typeParameterReference, childClass)) { - continue; - } - - const discoveredAssignedTypes = collectMissingAssignedTypesOnChildClassNode( - request, - childClassType, - defaultTypeParameterType, - typeParameterReference, - ); - - if (typeof discoveredAssignedTypes === "string") { - knownNames.add(discoveredAssignedTypes); - } else if (discoveredAssignedTypes !== undefined) { - assignedTypeValues.push(discoveredAssignedTypes); - } - } - - // If we have any number of known names found (e.g. 'string'), use them directly - // Otherwise use the raw descriptions of what members should go on the types - return knownNames.size === 0 ? assignedTypeValues : knownNames; + const knownNames = new Set(); + const assignedTypeValues: AssignedTypeValue[] = []; + const childClassType = getTypeAtLocationIfNotError(request, childClass); + if (childClassType === undefined) { + return knownNames; + } + + const defaultTypeParameterType = + baseTypeParameter.default === undefined + ? undefined + : getTypeAtLocationIfNotError(request, baseTypeParameter.default); + + for (const typeParameterReference of typeParameterReferences) { + // For now, we only look at nodes whose usage is declared *within* the child class + // In theory this could be expanded to check target instances, but that'd be more work... + // e.g. new ClassWithGeneric().setGenericValue('it is a string'); + if ( + !isNodeWithinNode(request.sourceFile, typeParameterReference, childClass) + ) { + continue; + } + + const discoveredAssignedTypes = collectMissingAssignedTypesOnChildClassNode( + request, + childClassType, + defaultTypeParameterType, + typeParameterReference, + ); + + if (typeof discoveredAssignedTypes === "string") { + knownNames.add(discoveredAssignedTypes); + } else if (discoveredAssignedTypes !== undefined) { + assignedTypeValues.push(discoveredAssignedTypes); + } + } + + // If we have any number of known names found (e.g. 'string'), use them directly + // Otherwise use the raw descriptions of what members should go on the types + return knownNames.size === 0 ? assignedTypeValues : knownNames; }; const collectMissingAssignedTypesOnChildClassNode = ( - request: FileMutationsRequest, - childClassType: ts.Type, - defaultTypeParameterType: ts.Type | undefined, - typeParameterReference: ts.Node, + request: FileMutationsRequest, + childClassType: ts.Type, + defaultTypeParameterType: ts.Type | undefined, + typeParameterReference: ts.Node, ) => { - // If the reference is a property declaration with an initial type, use that - if (ts.isPropertyDeclaration(typeParameterReference)) { - return collectMissingAssignedTypeOnPropertyDeclaration(request, defaultTypeParameterType, typeParameterReference); - } - - const parentPropertyAccess = typeParameterReference.parent; - - // If the parent is a call, treat the reference as a parameter, and use its type directly - if (ts.isCallOrNewExpression(parentPropertyAccess)) { - return getMissingAssignedType(request, defaultTypeParameterType, typeParameterReference, true /* asStandaloneProperty */); - } - - // Otherwise, for now, we'll only look at references that directly access the property on some container - if (!ts.isPropertyAccessExpression(parentPropertyAccess)) { - return undefined; - } - - // We only care about this node if the instance it's referencing is (or generally is a subtype of) the child class - const expressionType = getTypeAtLocationIfNotError(request, parentPropertyAccess.expression); - if (expressionType === undefined || !request.services.program.getTypeChecker().isTypeAssignableTo(expressionType, childClassType)) { - return undefined; - } - - // If the grandparent is an assigning binary expression, add the right side as a full new type - if (isNodeAssigningBinaryExpression(parentPropertyAccess.parent)) { - return getMissingAssignedType( - request, - defaultTypeParameterType, - parentPropertyAccess.parent.right, - true /* asStandaloneProperty */, - ); - } - - // If we're calling the member reference as a function, grab the perceived function type - if (ts.isCallExpression(parentPropertyAccess.parent.parent) && ts.isPropertyAccessExpression(parentPropertyAccess.parent)) { - return { - name: parentPropertyAccess.parent.name.text, - type: getCallExpressionType(request, parentPropertyAccess.parent.parent), - }; - } - - // Otherwise we ignore any other types - // Eventually this will likely expand to types like property access expressions and captured identifier references - return undefined; + // If the reference is a property declaration with an initial type, use that + if (ts.isPropertyDeclaration(typeParameterReference)) { + return collectMissingAssignedTypeOnPropertyDeclaration( + request, + defaultTypeParameterType, + typeParameterReference, + ); + } + + const parentPropertyAccess = typeParameterReference.parent; + + // If the parent is a call, treat the reference as a parameter, and use its type directly + if (ts.isCallOrNewExpression(parentPropertyAccess)) { + return getMissingAssignedType( + request, + defaultTypeParameterType, + typeParameterReference, + true /* asStandaloneProperty */, + ); + } + + // Otherwise, for now, we'll only look at references that directly access the property on some container + if (!ts.isPropertyAccessExpression(parentPropertyAccess)) { + return undefined; + } + + // We only care about this node if the instance it's referencing is (or generally is a subtype of) the child class + const expressionType = getTypeAtLocationIfNotError( + request, + parentPropertyAccess.expression, + ); + if ( + expressionType === undefined || + !request.services.program + .getTypeChecker() + .isTypeAssignableTo(expressionType, childClassType) + ) { + return undefined; + } + + // If the grandparent is an assigning binary expression, add the right side as a full new type + if (isNodeAssigningBinaryExpression(parentPropertyAccess.parent)) { + return getMissingAssignedType( + request, + defaultTypeParameterType, + parentPropertyAccess.parent.right, + true /* asStandaloneProperty */, + ); + } + + // If we're calling the member reference as a function, grab the perceived function type + if ( + ts.isCallExpression(parentPropertyAccess.parent.parent) && + ts.isPropertyAccessExpression(parentPropertyAccess.parent) + ) { + return { + name: parentPropertyAccess.parent.name.text, + type: getCallExpressionType(request, parentPropertyAccess.parent.parent), + }; + } + + // Otherwise we ignore any other types + // Eventually this will likely expand to types like property access expressions and captured identifier references + return undefined; }; const collectMissingAssignedTypeOnPropertyDeclaration = ( - request: FileMutationsRequest, - defaultTypeParameterType: ts.Type | undefined, - typeParameterReference: ts.PropertyDeclaration, + request: FileMutationsRequest, + defaultTypeParameterType: ts.Type | undefined, + typeParameterReference: ts.PropertyDeclaration, ) => { - // Our happiest case is a member that already has a named type - if ( - typeParameterReference.type !== undefined && - ts.isTypeReferenceNode(typeParameterReference.type) && - ts.isIdentifier(typeParameterReference.type.typeName) - ) { - return typeParameterReference.type.typeName.escapedText.toString(); - } - - // Otherwise, we'll have to manually craft a type for it - return getMissingAssignedType(request, defaultTypeParameterType, typeParameterReference, /* asStandaloneProperty */ true); + // Our happiest case is a member that already has a named type + if ( + typeParameterReference.type !== undefined && + ts.isTypeReferenceNode(typeParameterReference.type) && + ts.isIdentifier(typeParameterReference.type.typeName) + ) { + return typeParameterReference.type.typeName.escapedText.toString(); + } + + // Otherwise, we'll have to manually craft a type for it + return getMissingAssignedType( + request, + defaultTypeParameterType, + typeParameterReference, + /* asStandaloneProperty */ true, + ); }; const getMissingAssignedType = ( - request: FileMutationsRequest, - defaultTypeParameterType: ts.Type | undefined, - assigningNode: ts.Node, - asStandaloneProperty: boolean, + request: FileMutationsRequest, + defaultTypeParameterType: ts.Type | undefined, + assigningNode: ts.Node, + asStandaloneProperty: boolean, ) => { - const assigningType = getTypeAtLocationIfNotError(request, assigningNode); - if (assigningType === undefined) { - return undefined; - } - - // If the type parameter came with a default, ignore types already equivalent to it - if ( - defaultTypeParameterType !== undefined && - request.services.program.getTypeChecker().isTypeAssignableTo(defaultTypeParameterType, assigningType) - ) { - return undefined; - } - - // Nodes that reach here are either 'standalone' declarations (the full type) or members thereof... - // For a full type, go through the normal hoops to figure out its name - if (asStandaloneProperty) { - const standaloneType = getTypeAtLocationIfNotError(request, assigningNode); - return standaloneType === undefined ? undefined : request.services.printers.type(standaloneType); - } - - // For a property, just grab the basic name and type, so we can join them all together later - return { - name: getStaticNameOfProperty(assigningNode), - type: assigningType, - }; + const assigningType = getTypeAtLocationIfNotError(request, assigningNode); + if (assigningType === undefined) { + return undefined; + } + + // If the type parameter came with a default, ignore types already equivalent to it + if ( + defaultTypeParameterType !== undefined && + request.services.program + .getTypeChecker() + .isTypeAssignableTo(defaultTypeParameterType, assigningType) + ) { + return undefined; + } + + // Nodes that reach here are either 'standalone' declarations (the full type) or members thereof... + // For a full type, go through the normal hoops to figure out its name + if (asStandaloneProperty) { + const standaloneType = getTypeAtLocationIfNotError(request, assigningNode); + return standaloneType === undefined + ? undefined + : request.services.printers.type(standaloneType); + } + + // For a property, just grab the basic name and type, so we can join them all together later + return { + name: getStaticNameOfProperty(assigningNode), + type: assigningType, + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateMutating.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateMutating.ts index bb3bd797e..b4f235b9f 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateMutating.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteImplicitGenerics/templateMutating.ts @@ -1,82 +1,110 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { AssignedTypesByName, joinAssignedTypesByName } from "../../../../mutations/assignments"; -import { createDeclarationForTypeSummaries } from "../../../../mutations/creations/creationMutations"; -import { summarizeAllAssignedTypes } from "../../../../mutations/expansions/summarization"; -import { getFriendlyTypeParameterDeclarationName, getPerceivedNameOfClass } from "../../../../mutations/naming"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; +import { + AssignedTypesByName, + joinAssignedTypesByName, +} from "../../../../mutations/assignments.js"; +import { createDeclarationForTypeSummaries } from "../../../../mutations/creations/creationMutations.js"; +import { summarizeAllAssignedTypes } from "../../../../mutations/expansions/summarization.js"; +import { + getFriendlyTypeParameterDeclarationName, + getPerceivedNameOfClass, +} from "../../../../mutations/naming.js"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; export const fillInMissingTemplateTypes = ( - request: FileMutationsRequest, - childClass: ts.ClassLikeDeclaration, - baseTypeParameters: ts.NodeArray, - templateTypeLists: (string | AssignedTypesByName | undefined)[], + request: FileMutationsRequest, + childClass: ts.ClassLikeDeclaration, + baseTypeParameters: ts.NodeArray, + templateTypeLists: (AssignedTypesByName | string | undefined)[], ) => { - const createdTypes: string[] = []; - const templateTypeNames: string[] = []; - const childClassName = getPerceivedNameOfClass(request, childClass); + const createdTypes: string[] = []; + const templateTypeNames: string[] = []; + const childClassName = getPerceivedNameOfClass(request, childClass); - // Template types will be marked on the node up through the last missing type - for (let i = 0; i < templateTypeLists.length; i += 1) { - const templateTypes = templateTypeLists[i]; + // Template types will be marked on the node up through the last missing type + for (let i = 0; i < templateTypeLists.length; i += 1) { + const templateTypes = templateTypeLists[i]; - // If the template type is fine on the node but missing, use the default from the generic - // Example: a React component's props are {} but its state needs a new type - if (templateTypes === undefined) { - const defaultTemplateValue = findDefaultTemplateValue(request, baseTypeParameters[i]); - if (defaultTemplateValue !== undefined) { - templateTypeNames.push(defaultTemplateValue); - } - continue; - } + // If the template type is fine on the node but missing, use the default from the generic + // Example: a React component's props are {} but its state needs a new type + if (templateTypes === undefined) { + const defaultTemplateValue = findDefaultTemplateValue( + request, + baseTypeParameters[i], + ); + if (defaultTemplateValue !== undefined) { + templateTypeNames.push(defaultTemplateValue); + } - // If the template type is already a known name, directly use it - if (typeof templateTypes === "string") { - templateTypeNames.push(templateTypes); - continue; - } + continue; + } - // In this case, the template type is missing: create a new type to fill the missing template type - // That new type will need a name, which we'll generate from the class and relevant type parameter - const newTemplateTypeName = createTemplateTypeName(childClassName, baseTypeParameters, baseTypeParameters[i]); + // If the template type is already a known name, directly use it + if (typeof templateTypes === "string") { + templateTypeNames.push(templateTypes); + continue; + } - // Properties on that template type are collected from uses of the type in the node - const assignedTypeValues = Array.from(templateTypes).map(([name, type]) => ({ name, type })); - const allAssignedTypes = joinAssignedTypesByName(request, assignedTypeValues); - const newType = createDeclarationForTypeSummaries( - request, - undefined /* enclosingDeclaration */, - newTemplateTypeName, - summarizeAllAssignedTypes(request, [allAssignedTypes]), - ); + // In this case, the template type is missing: create a new type to fill the missing template type + // That new type will need a name, which we'll generate from the class and relevant type parameter + const newTemplateTypeName = createTemplateTypeName( + childClassName, + baseTypeParameters, + baseTypeParameters[i], + ); - createdTypes.push(newType); - templateTypeNames.push(newTemplateTypeName); - } + // Properties on that template type are collected from uses of the type in the node + const assignedTypeValues = Array.from(templateTypes).map( + ([name, type]) => ({ name, type }), + ); + const allAssignedTypes = joinAssignedTypesByName( + request, + assignedTypeValues, + ); + const newType = createDeclarationForTypeSummaries( + request, + undefined /* enclosingDeclaration */, + newTemplateTypeName, + summarizeAllAssignedTypes(request, [allAssignedTypes]), + ); - return { createdTypes, templateTypeNames }; + createdTypes.push(newType); + templateTypeNames.push(newTemplateTypeName); + } + + return { createdTypes, templateTypeNames }; }; -const findDefaultTemplateValue = (request: FileMutationsRequest, baseTypeParameter: ts.TypeParameterDeclaration) => { - if (baseTypeParameter.default === undefined) { - return "{}"; - } +const findDefaultTemplateValue = ( + request: FileMutationsRequest, + baseTypeParameter: ts.TypeParameterDeclaration, +) => { + if (baseTypeParameter.default === undefined) { + return "{}"; + } - const baseTypeDefault = getTypeAtLocationIfNotError(request, baseTypeParameter.default); - if (baseTypeDefault === undefined) { - return undefined; - } + const baseTypeDefault = getTypeAtLocationIfNotError( + request, + baseTypeParameter.default, + ); + if (baseTypeDefault === undefined) { + return undefined; + } - return request.services.printers.type(baseTypeDefault); + return request.services.printers.type(baseTypeDefault); }; const createTemplateTypeName = ( - childClassName: string, - baseTypeParameters: ts.NodeArray, - baseTypeParameter: ts.TypeParameterDeclaration, + childClassName: string, + baseTypeParameters: ts.NodeArray, + baseTypeParameter: ts.TypeParameterDeclaration, ) => { - const friendlyName = getFriendlyTypeParameterDeclarationName(baseTypeParameters, baseTypeParameter); + const friendlyName = getFriendlyTypeParameterDeclarationName( + baseTypeParameters, + baseTypeParameter, + ); - return childClassName + friendlyName[0].toUpperCase() + friendlyName.slice(1); + return childClassName + friendlyName[0].toUpperCase() + friendlyName.slice(1); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences.ts index 2cdccd860..d0228db78 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/collectGenericNodeReferences.ts @@ -1,229 +1,290 @@ -import * as ts from "typescript"; +import ts from "typescript"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; import { - getIdentifyingTypeLiteralParent, - isNodeWithDefinedTypeArguments, - isNodeWithDefinedTypeParameters, - isNodeWithIdentifierName, -} from "../../../../shared/nodeTypes"; -import { isTypeArgumentsType } from "../../../../shared/typeNodes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; - -export type InterfaceOrTypeLiteral = ts.InterfaceDeclaration | ts.TypeLiteralNode; - -export const collectGenericNodeReferences = (request: FileMutationsRequest, node: InterfaceOrTypeLiteral) => { - // Find all generic references purported to be of this type - const referencingNodes = collectDirectNodeReferences(request, node); - if (referencingNodes === undefined) { - return undefined; - } - - // For any reference that uses the node as a generic type, - // expand the node's references to include references to that generic type - return expandReferencesForGenericTypes(request, node, referencingNodes); + getIdentifyingTypeLiteralParent, + isNodeWithDefinedTypeArguments, + isNodeWithDefinedTypeParameters, + isNodeWithIdentifierName, +} from "../../../../shared/nodeTypes.js"; +import { isTypeArgumentsType } from "../../../../shared/typeNodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; + +export type InterfaceOrTypeLiteral = + | ts.InterfaceDeclaration + | ts.TypeLiteralNode; + +export const collectGenericNodeReferences = ( + request: FileMutationsRequest, + node: InterfaceOrTypeLiteral, +) => { + // Find all generic references purported to be of this type + const referencingNodes = collectDirectNodeReferences(request, node); + if (referencingNodes === undefined) { + return undefined; + } + + // For any reference that uses the node as a generic type, + // expand the node's references to include references to that generic type + return expandReferencesForGenericTypes(request, node, referencingNodes); }; -const collectDirectNodeReferences = (request: FileMutationsRequest, node: InterfaceOrTypeLiteral) => { - // Interfaces are referenced by themselves, as they provide their own name - // Type literals are referenced by their parent, which is often a type alias or variable - const identifyingNode = ts.isInterfaceDeclaration(node) ? node : getIdentifyingTypeLiteralParent(node); +const collectDirectNodeReferences = ( + request: FileMutationsRequest, + node: InterfaceOrTypeLiteral, +) => { + // Interfaces are referenced by themselves, as they provide their own name + // Type literals are referenced by their parent, which is often a type alias or variable + const identifyingNode = ts.isInterfaceDeclaration(node) + ? node + : getIdentifyingTypeLiteralParent(node); - return request.fileInfoCache.getNodeReferencesAsNodes(identifyingNode); + return request.fileInfoCache.getNodeReferencesAsNodes(identifyingNode); }; export const expandReferencesForGenericTypes = ( - request: FileMutationsRequest, - interfaceOrTypeLiteral: InterfaceOrTypeLiteral, - referencingNodes: ReadonlyArray, + request: FileMutationsRequest, + interfaceOrTypeLiteral: InterfaceOrTypeLiteral, + referencingNodes: readonly ts.Node[], ) => { - const expandedReferences: ts.Node[] = []; - - // For each of the references we'll look at, there are two relevant nodes we need to map together: - // * The templated declaration with type parameters: e.g. class Container { ... } - // * The templated instantiation with type arguments: e.g. new Container() { ... } - for (const referencingNode of referencingNodes) { - // We only care about type references within generics - if (!ts.isTypeReferenceNode(referencingNode)) { - continue; - } - - // Nodes with a "typeArguments" are the only ones we care about - const templatedParentInstantiation = referencingNode.parent; - if (!isNodeWithDefinedTypeArguments(templatedParentInstantiation)) { - continue; - } - - // Find the corresponding type node in the templated parent's type arguments - // Note that call expressions (e.g. `container({})`) store the type in the expression (e.g. `container`), - // while other types (e.g. `container.value = {};`) store the type on themselves - const relevantNodeWithTypeSignatures = ts.isCallExpression(templatedParentInstantiation) - ? templatedParentInstantiation.expression - : templatedParentInstantiation; - const templatedDeclarationSymbol = getTypeAtLocationIfNotError(request, relevantNodeWithTypeSignatures)?.getSymbol(); - if (templatedDeclarationSymbol === undefined) { - continue; - } - - // The templated declaration is the backing value declaration for the instantiation's symbol - const templatedDeclaration = templatedDeclarationSymbol.valueDeclaration; - if ( - templatedDeclaration === undefined || - !isNodeWithDefinedTypeParameters(templatedDeclaration) || - templatedParentInstantiation.typeArguments === undefined - ) { - continue; - } - - // Find the index of the corresponding type argument in the instantation of the node, - // and finally use that to grab the node for the template parameter from the type argument's index - const typeArgumentIndex = templatedParentInstantiation.typeArguments.indexOf(referencingNode); - const templateDeclaredTypeNode = templatedDeclaration.typeParameters[typeArgumentIndex]; - - // Collect all nodes that are of the template declared type node when its value is - // the interface or type alias we're considering expanding - expandedReferences.push(...collectGenericReferencesOfType(request, interfaceOrTypeLiteral, templateDeclaredTypeNode)); - } - - return expandedReferences; + const expandedReferences: ts.Node[] = []; + + // For each of the references we'll look at, there are two relevant nodes we need to map together: + // * The templated declaration with type parameters: e.g. class Container { ... } + // * The templated instantiation with type arguments: e.g. new Container() { ... } + for (const referencingNode of referencingNodes) { + // We only care about type references within generics + if (!ts.isTypeReferenceNode(referencingNode)) { + continue; + } + + // Nodes with a "typeArguments" are the only ones we care about + const templatedParentInstantiation = referencingNode.parent; + if (!isNodeWithDefinedTypeArguments(templatedParentInstantiation)) { + continue; + } + + // Find the corresponding type node in the templated parent's type arguments + // Note that call expressions (e.g. `container({})`) store the type in the expression (e.g. `container`), + // while other types (e.g. `container.value = {};`) store the type on themselves + const relevantNodeWithTypeSignatures = ts.isCallExpression( + templatedParentInstantiation, + ) + ? templatedParentInstantiation.expression + : templatedParentInstantiation; + const templatedDeclarationSymbol = getTypeAtLocationIfNotError( + request, + relevantNodeWithTypeSignatures, + )?.getSymbol(); + if (templatedDeclarationSymbol === undefined) { + continue; + } + + // The templated declaration is the backing value declaration for the instantiation's symbol + const templatedDeclaration = templatedDeclarationSymbol.valueDeclaration; + if ( + templatedDeclaration === undefined || + !isNodeWithDefinedTypeParameters(templatedDeclaration) || + templatedParentInstantiation.typeArguments === undefined + ) { + continue; + } + + // Find the index of the corresponding type argument in the instantiation of the node, + // and finally use that to grab the node for the template parameter from the type argument's index + const typeArgumentIndex = + templatedParentInstantiation.typeArguments.indexOf(referencingNode); + const templateDeclaredTypeNode = + templatedDeclaration.typeParameters[typeArgumentIndex]; + + // Collect all nodes that are of the template declared type node when its value is + // the interface or type alias we're considering expanding + expandedReferences.push( + ...collectGenericReferencesOfType( + request, + interfaceOrTypeLiteral, + templateDeclaredTypeNode, + ), + ); + } + + return expandedReferences; }; const collectGenericReferencesOfType = ( - request: FileMutationsRequest, - interfaceOrTypeLiteral: InterfaceOrTypeLiteral, - templateDeclaredTypeNode: ts.TypeNode, + request: FileMutationsRequest, + interfaceOrTypeLiteral: InterfaceOrTypeLiteral, + templateDeclaredTypeNode: ts.TypeNode, ) => { - const genericNodeReferences: ts.Node[] = []; - const originalType = getTypeAtLocationIfNotError(request, interfaceOrTypeLiteral); - - // Find all the references to the declared template type within its declaration - // For example, in `class Container { member: T; }`, that would be the T in `member: T;` - const referencingTypeNodes = request.fileInfoCache.getNodeReferencesAsNodes(templateDeclaredTypeNode); - if (referencingTypeNodes === undefined) { - return genericNodeReferences; - } - - for (const referencingTypeNode of referencingTypeNodes) { - // From the referencing type node, grab the node it's declared as the type of - if (!ts.isTypeNode(referencingTypeNode)) { - continue; - } - - // The parent node of the referencing type node will typically be something like a parameter or variable declaration - // For example, in `class Container { member: T; }`, that would be the `member: T;` - const parent = referencingTypeNode.parent; - if (!isNodeWithIdentifierName(parent)) { - continue; - } - - // Try finding all references to the name of the parent (declaration) - // For example, if the parent is `member: T;`, that would be `member` - const allReferencingInstantiationNodes = request.fileInfoCache.getNodeReferencesAsNodes(parent.name); - if (allReferencingInstantiationNodes !== undefined) { - for (const referencingInstantiationNode of allReferencingInstantiationNodes) { - if (getTypeAtLocationIfNotError(request, referencingInstantiationNode) === originalType) { - genericNodeReferences.push(referencingInstantiationNode); - } - } - } - - // If the is a parameter, try all objects passed into its containing signature - if (ts.isParameter(parent) || ts.isParameterPropertyDeclaration(parent, parent.parent)) { - genericNodeReferences.push(...findProvidedTypesForParameter(request, interfaceOrTypeLiteral, parent.parent, parent)); - } - } - - return genericNodeReferences; + const genericNodeReferences: ts.Node[] = []; + const originalType = getTypeAtLocationIfNotError( + request, + interfaceOrTypeLiteral, + ); + + // Find all the references to the declared template type within its declaration + // For example, in `class Container { member: T; }`, that would be the T in `member: T;` + const referencingTypeNodes = request.fileInfoCache.getNodeReferencesAsNodes( + templateDeclaredTypeNode, + ); + if (referencingTypeNodes === undefined) { + return genericNodeReferences; + } + + for (const referencingTypeNode of referencingTypeNodes) { + // From the referencing type node, grab the node it's declared as the type of + if (!ts.isTypeNode(referencingTypeNode)) { + continue; + } + + // The parent node of the referencing type node will typically be something like a parameter or variable declaration + // For example, in `class Container { member: T; }`, that would be the `member: T;` + const parent = referencingTypeNode.parent; + if (!isNodeWithIdentifierName(parent)) { + continue; + } + + // Try finding all references to the name of the parent (declaration) + // For example, if the parent is `member: T;`, that would be `member` + const allReferencingInstantiationNodes = + request.fileInfoCache.getNodeReferencesAsNodes(parent.name); + if (allReferencingInstantiationNodes !== undefined) { + for (const referencingInstantiationNode of allReferencingInstantiationNodes) { + if ( + getTypeAtLocationIfNotError(request, referencingInstantiationNode) === + originalType + ) { + genericNodeReferences.push(referencingInstantiationNode); + } + } + } + + // If the is a parameter, try all objects passed into its containing signature + if ( + ts.isParameter(parent) || + ts.isParameterPropertyDeclaration(parent, parent.parent) + ) { + genericNodeReferences.push( + ...findProvidedTypesForParameter( + request, + interfaceOrTypeLiteral, + parent.parent, + parent, + ), + ); + } + } + + return genericNodeReferences; }; const findProvidedTypesForParameter = ( - request: FileMutationsRequest, - interfaceOrTypeLiteral: InterfaceOrTypeLiteral, - signature: ts.SignatureDeclaration, - parameter: ts.ParameterDeclaration | ts.ParameterPropertyDeclaration, + request: FileMutationsRequest, + interfaceOrTypeLiteral: InterfaceOrTypeLiteral, + signature: ts.SignatureDeclaration, + parameter: ts.ParameterDeclaration | ts.ParameterPropertyDeclaration, ) => { - const providedNodes: ts.Node[] = []; - const allReferencingNodes = request.fileInfoCache.getNodeReferencesAsNodes(signature); - if (allReferencingNodes === undefined) { - return providedNodes; - } - - const originalType = getTypeAtLocationIfNotError(request, interfaceOrTypeLiteral); - if (originalType === undefined) { - return providedNodes; - } - - const parameterIndex = signature.parameters.indexOf(parameter); - - for (let referencingNode of allReferencingNodes) { - // Call signatures might be found to be referenced by an expression, e.g. `container({});` - // We want the call expression within, e.g. `container({})` (note the lack of `;`) - if (ts.isExpressionStatement(referencingNode)) { - referencingNode = referencingNode.expression; - } - - for (const potentialCallOrNewExpression of [ - // Direct call expressions will have arguments on themselves, e.g. `container({})` - referencingNode, - // New expressions will have arguments on their parents, e.g. `new Container({})` - referencingNode.parent, - // Method expressions will have arguments on their grandparents, e.g. `container.setValues({})` - referencingNode.parent.parent, - ]) { - if (!ts.isCallOrNewExpression(potentialCallOrNewExpression)) { - continue; - } - - const providedArguments = potentialCallOrNewExpression.arguments; - if (providedArguments === undefined) { - continue; - } - - if (expressionRefersToOriginalType(request, originalType, potentialCallOrNewExpression)) { - providedNodes.push(providedArguments[parameterIndex]); - break; - } - } - } - - return providedNodes; + const providedNodes: ts.Node[] = []; + const allReferencingNodes = + request.fileInfoCache.getNodeReferencesAsNodes(signature); + if (allReferencingNodes === undefined) { + return providedNodes; + } + + const originalType = getTypeAtLocationIfNotError( + request, + interfaceOrTypeLiteral, + ); + if (originalType === undefined) { + return providedNodes; + } + + const parameterIndex = signature.parameters.indexOf(parameter); + + for (let referencingNode of allReferencingNodes) { + // Call signatures might be found to be referenced by an expression, e.g. `container({});` + // We want the call expression within, e.g. `container({})` (note the lack of `;`) + if (ts.isExpressionStatement(referencingNode)) { + referencingNode = referencingNode.expression; + } + + for (const potentialCallOrNewExpression of [ + // Direct call expressions will have arguments on themselves, e.g. `container({})` + referencingNode, + // New expressions will have arguments on their parents, e.g. `new Container({})` + referencingNode.parent, + // Method expressions will have arguments on their grandparents, e.g. `container.setValues({})` + referencingNode.parent.parent, + ]) { + if (!ts.isCallOrNewExpression(potentialCallOrNewExpression)) { + continue; + } + + const providedArguments = potentialCallOrNewExpression.arguments; + if (providedArguments === undefined) { + continue; + } + + if ( + expressionRefersToOriginalType( + request, + originalType, + potentialCallOrNewExpression, + ) + ) { + providedNodes.push(providedArguments[parameterIndex]); + break; + } + } + } + + return providedNodes; }; /** * Given: - * * Declaration of a call or construct signature with a type argument (on it or a parent) - * * Usage of that same signature - * * An original interface or type literal + * Declaration of a call or construct signature with a type argument (on it or a parent) + * Usage of that same signature + * An original interface or type literal * How can we determine whether the signature usage is on that same type argument? * These are definitely not the right ways to do this... * ...but I spent three hours wrangling with it and don't know how... */ const expressionRefersToOriginalType = ( - request: FileMutationsRequest, - originalType: ts.Type, - potentialCallOrNewExpression: ts.CallExpression | ts.NewExpression, + request: FileMutationsRequest, + originalType: ts.Type, + potentialCallOrNewExpression: ts.CallExpression | ts.NewExpression, ) => { - const expressionNodeType = getTypeAtLocationIfNotError(request, potentialCallOrNewExpression); - if (expressionNodeType === undefined) { - return false; - } - - // If the expression node's type already has type arguments, do they match the original type? - // This is more likely with classes that are instantiated with a type - // This can go wrong easily: e.g. with multiple type arguments that have intermixed usages - if (isTypeArgumentsType(expressionNodeType) && expressionNodeType.typeArguments?.includes(originalType)) { - return true; - } - - // Alternately, what about functions that themselves have types? - // Again, this can go wrong: e.g. with multiple type arguments that have intermixed usages - if (isNodeWithDefinedTypeArguments(potentialCallOrNewExpression)) { - for (const typeArgument of potentialCallOrNewExpression.typeArguments || []) { - if (getTypeAtLocationIfNotError(request, typeArgument) === originalType) { - return true; - } - } - } - - return false; + const expressionNodeType = getTypeAtLocationIfNotError( + request, + potentialCallOrNewExpression, + ); + if (expressionNodeType === undefined) { + return false; + } + + // If the expression node's type already has type arguments, do they match the original type? + // This is more likely with classes that are instantiated with a type + // This can go wrong easily: e.g. with multiple type arguments that have intermixed usages + if ( + isTypeArgumentsType(expressionNodeType) && + expressionNodeType.typeArguments.includes(originalType) + ) { + return true; + } + + // Alternately, what about functions that themselves have types? + // Again, this can go wrong: e.g. with multiple type arguments that have intermixed usages + if ( + isNodeWithDefinedTypeArguments(potentialCallOrNewExpression) && + potentialCallOrNewExpression.typeArguments + ) { + for (const typeArgument of potentialCallOrNewExpression.typeArguments) { + if (getTypeAtLocationIfNotError(request, typeArgument) === originalType) { + return true; + } + } + } + + return false; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/expandValuesAssignedToReferenceNodes.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/expandValuesAssignedToReferenceNodes.ts index ac31d4932..8c32dbf1b 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/expandValuesAssignedToReferenceNodes.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/expandValuesAssignedToReferenceNodes.ts @@ -1,82 +1,100 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { AssignedTypeValue } from "../../../../mutations/assignments"; -import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; +import { AssignedTypeValue } from "../../../../mutations/assignments.js"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; export const expandValuesAssignedToReferenceNodes = ( - request: FileMutationsRequest, - originalType: ts.Type, - genericReferenceNodes: ts.Node[], + request: FileMutationsRequest, + originalType: ts.Type, + genericReferenceNodes: ts.Node[], ) => { - const assignedValues = new Set(); + const assignedValues = new Set(); - for (const genericReferenceNode of genericReferenceNodes) { - const assignedGenericValue = getAssignedGenericValue(request, originalType, genericReferenceNode); - if (assignedGenericValue !== undefined) { - assignedValues.add(assignedGenericValue); - } - } + for (const genericReferenceNode of genericReferenceNodes) { + const assignedGenericValue = getAssignedGenericValue( + request, + originalType, + genericReferenceNode, + ); + if (assignedGenericValue !== undefined) { + assignedValues.add(assignedGenericValue); + } + } - return Array.from(assignedValues); + return Array.from(assignedValues); }; -const getAssignedGenericValue = (request: FileMutationsRequest, originalType: ts.Type, node: ts.Node): AssignedTypeValue | undefined => { - // Case: - // function container(values: T) { } - // type Values = {}; - // container({ laterAssigned: true, }); - // Case: - // declare class Container { values: t; } - // type Values = {}; - // new Container({ laterAssigned: true, }); - // Case: - // declare class Container { setValues(values: t): void; } - // type Values = {}; - // new Container({}).setValues({ laterAssigned: true }); - if (ts.isObjectLiteralExpression(node)) { - return assignedTypeOrUndefined({ - type: getTypeAtLocationIfNotError(request, node), - }); - } +const getAssignedGenericValue = ( + request: FileMutationsRequest, + originalType: ts.Type, + node: ts.Node, +): AssignedTypeValue | undefined => { + // Case: + // function container(values: T) { } + // type Values = {}; + // container({ laterAssigned: true, }); + // Case: + // declare class Container { values: t; } + // type Values = {}; + // new Container({ laterAssigned: true, }); + // Case: + // declare class Container { setValues(values: t): void; } + // type Values = {}; + // new Container({}).setValues({ laterAssigned: true }); + if (ts.isObjectLiteralExpression(node)) { + return assignedTypeOrUndefined({ + type: getTypeAtLocationIfNotError(request, node), + }); + } - if (ts.isIdentifier(node) && ts.isPropertyAccessExpression(node.parent)) { - // Case: - // declare class Container { values: t; } - // type Values = {}; - // const container = new Container({}); - // container.values = { laterAssigned: true, }; - if (isNodeAssigningBinaryExpression(node.parent.parent) && getTypeAtLocationIfNotError(request, node.parent) === originalType) { - return assignedTypeOrUndefined({ - type: getTypeAtLocationIfNotError(request, node.parent.parent.right), - }); - } + if (ts.isIdentifier(node) && ts.isPropertyAccessExpression(node.parent)) { + // Case: + // declare class Container { values: t; } + // type Values = {}; + // const container = new Container({}); + // container.values = { laterAssigned: true, }; + if ( + isNodeAssigningBinaryExpression(node.parent.parent) && + getTypeAtLocationIfNotError(request, node.parent) === originalType + ) { + return assignedTypeOrUndefined({ + type: getTypeAtLocationIfNotError(request, node.parent.parent.right), + }); + } - // Case: - // declare class Container { values: T; } - // type Values = {}; - // const container = new Container({}); - // container.values.laterAssigned = true; - // Case: - // declare class Container { values: T; } - // type Values = {}; - // new Container({}).values.quicklyAssigned = true; - if ( - ts.isPropertyAccessExpression(node.parent.parent) && - ts.isIdentifier(node.parent.parent.name) && - isNodeAssigningBinaryExpression(node.parent.parent.parent) && - getTypeAtLocationIfNotError(request, node.parent) === originalType - ) { - return assignedTypeOrUndefined({ - name: node.parent.parent.name.getText(), - type: getTypeAtLocationIfNotError(request, node.parent.parent.parent.right), - }); - } - } + // Case: + // declare class Container { values: T; } + // type Values = {}; + // const container = new Container({}); + // container.values.laterAssigned = true; + // Case: + // declare class Container { values: T; } + // type Values = {}; + // new Container({}).values.quicklyAssigned = true; + if ( + ts.isPropertyAccessExpression(node.parent.parent) && + ts.isIdentifier(node.parent.parent.name) && + isNodeAssigningBinaryExpression(node.parent.parent.parent) && + getTypeAtLocationIfNotError(request, node.parent) === originalType + ) { + return assignedTypeOrUndefined({ + name: node.parent.parent.name.getText(), + type: getTypeAtLocationIfNotError( + request, + node.parent.parent.parent.right, + ), + }); + } + } - return undefined; + return undefined; }; -const assignedTypeOrUndefined = (assignedType: Partial): AssignedTypeValue | undefined => - assignedType.type === undefined ? undefined : (assignedType as AssignedTypeValue); +const assignedTypeOrUndefined = ( + assignedType: Partial, +): AssignedTypeValue | undefined => + assignedType.type === undefined + ? undefined + : (assignedType as AssignedTypeValue); diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/index.ts index 1e13a6d96..9cc516e34 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteInterfaceOrTypeLiteralGenerics/index.ts @@ -1,39 +1,62 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { joinAssignedTypesByName } from "../../../../mutations/assignments"; -import { createTypeExpansionMutation } from "../../../../mutations/expansions/expansionMutations"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { joinAssignedTypesByName } from "../../../../mutations/assignments.js"; +import { createTypeExpansionMutation } from "../../../../mutations/expansions/expansionMutations.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; +import { + InterfaceOrTypeLiteral, + collectGenericNodeReferences, +} from "./collectGenericNodeReferences.js"; +import { expandValuesAssignedToReferenceNodes } from "./expandValuesAssignedToReferenceNodes.js"; -import { collectGenericNodeReferences, InterfaceOrTypeLiteral } from "./collectGenericNodeReferences"; -import { expandValuesAssignedToReferenceNodes } from "./expandValuesAssignedToReferenceNodes"; +export const fixIncompleteInterfaceOrTypeLiteralGenerics: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isInterfaceOrTypeLiteral, + visitInterfaceOrTypeLiteral, + ); -export const fixIncompleteInterfaceOrTypeLiteralGenerics: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isInterfaceOrTypeLiteral, visitInterfaceOrTypeLiteral); +const isInterfaceOrTypeLiteral = ( + node: ts.Node, +): node is InterfaceOrTypeLiteral => + ts.isInterfaceDeclaration(node) || ts.isTypeLiteralNode(node); -const isInterfaceOrTypeLiteral = (node: ts.Node): node is InterfaceOrTypeLiteral => - ts.isInterfaceDeclaration(node) || ts.isTypeLiteralNode(node); +const visitInterfaceOrTypeLiteral = ( + node: InterfaceOrTypeLiteral, + request: FileMutationsRequest, +): Mutation | undefined => { + // Find all nodes that seem like they could possibly reference the generic + const genericReferenceNodes = collectGenericNodeReferences(request, node); + if (genericReferenceNodes === undefined) { + return undefined; + } -const visitInterfaceOrTypeLiteral = (node: InterfaceOrTypeLiteral, request: FileMutationsRequest): Mutation | undefined => { - // Find all nodes that seem like they could possibly reference the generic - const genericReferenceNodes = collectGenericNodeReferences(request, node); - if (genericReferenceNodes === undefined) { - return undefined; - } + // Given all those generic references, find all the types being assigned to those nodes + const originalType = getTypeAtLocationIfNotError(request, node); + if (originalType === undefined) { + return undefined; + } - // Given all those generic references, find all the types being assigned to those nodes - const originalType = getTypeAtLocationIfNotError(request, node); - if (originalType === undefined) { - return undefined; - } - const valuesAssignedToReferenceNodes = expandValuesAssignedToReferenceNodes(request, originalType, genericReferenceNodes); - if (valuesAssignedToReferenceNodes.length === 0) { - return undefined; - } + const valuesAssignedToReferenceNodes = expandValuesAssignedToReferenceNodes( + request, + originalType, + genericReferenceNodes, + ); + if (valuesAssignedToReferenceNodes.length === 0) { + return undefined; + } - // Join those types into a mapping that keys them by property name - // That mapping is directly translatable into a mutation to add those properties - return createTypeExpansionMutation(request, node, [joinAssignedTypesByName(request, valuesAssignedToReferenceNodes)]); + // Join those types into a mapping that keys them by property name + // That mapping is directly translatable into a mutation to add those properties + return createTypeExpansionMutation(request, node, [ + joinAssignedTypesByName(request, valuesAssignedToReferenceNodes), + ]); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteParameterTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteParameterTypes/index.ts index 502972a36..89fc95737 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteParameterTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteParameterTypes/index.ts @@ -1,78 +1,120 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { createTypeAdditionMutation, createTypeCreationMutation } from "../../../../mutations/creators"; -import { isNodeWithType, NodeWithType } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { + createTypeAdditionMutation, + createTypeCreationMutation, +} from "../../../../mutations/creators.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { NodeWithType, isNodeWithType } from "../../../../shared/nodeTypes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixIncompleteParameterTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isParameterWithType, visitParameterDeclaration); +export const fixIncompleteParameterTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isParameterWithType, + visitParameterDeclaration, + ); -const isParameterWithType = (node: ts.Node): node is ts.ParameterDeclaration & NodeWithType => ts.isParameter(node) && isNodeWithType(node); +const isParameterWithType = ( + node: ts.Node, +): node is ts.ParameterDeclaration & NodeWithType => + ts.isParameter(node) && isNodeWithType(node); -const visitParameterDeclaration = (node: ts.ParameterDeclaration, request: FileMutationsRequest): Mutation | undefined => { - // Collect types initially assigned or later called with as the parameter - const callingTypes = getCallingTypesFromReferencedSymbols(node, request); +const visitParameterDeclaration = ( + node: ts.ParameterDeclaration, + request: FileMutationsRequest, +): Mutation | undefined => { + // Collect types initially assigned or later called with as the parameter + const callingTypes = getCallingTypesFromReferencedSymbols(node, request); - // Collect the type(s) initially declared on the parameter - const declaredType = getTypeAtLocationIfNotError(request, node); - if (declaredType === undefined) { - return undefined; - } + // Collect the type(s) initially declared on the parameter + const declaredType = getTypeAtLocationIfNotError(request, node); + if (declaredType === undefined) { + return undefined; + } - // If the parameter already has a declared type, add assigned types to it if necessary - if (isNodeWithType(node)) { - return createTypeAdditionMutation(request, node, declaredType, callingTypes); - } + // If the parameter already has a declared type, add assigned types to it if necessary + if (isNodeWithType(node)) { + return createTypeAdditionMutation( + request, + node, + declaredType, + callingTypes, + ); + } - // Since the parameter doesn't have its own type, give it one if necessary - return createTypeCreationMutation(request, node, declaredType, callingTypes); + // Since the parameter doesn't have its own type, give it one if necessary + return createTypeCreationMutation(request, node, declaredType, callingTypes); }; -const getCallingTypesFromReferencedSymbols = (node: ts.ParameterDeclaration, request: FileMutationsRequest): ReadonlyArray => { - const callingTypes: ts.Type[] = []; +const getCallingTypesFromReferencedSymbols = ( + node: ts.ParameterDeclaration, + request: FileMutationsRequest, +): readonly ts.Type[] => { + const callingTypes: ts.Type[] = []; - // If the parameter has a default, also consider that a calling type - const initializerType = getTypeAtLocationIfNotError(request, node.initializer); - if (initializerType !== undefined) { - callingTypes.push(initializerType); - } + // If the parameter has a default, also consider that a calling type + const initializerType = getTypeAtLocationIfNotError( + request, + node.initializer, + ); + if (initializerType !== undefined) { + callingTypes.push(initializerType); + } - // Find all locations the containing method is called - const references = request.fileInfoCache.getNodeReferencesAsNodes(node.parent); - if (references !== undefined) { - const parameterIndex = node.parent.parameters.indexOf(node); + // Find all locations the containing method is called + const references = request.fileInfoCache.getNodeReferencesAsNodes( + node.parent, + ); + if (references !== undefined) { + const parameterIndex = node.parent.parameters.indexOf(node); - // For each calling location, add any types it's called with there - for (const reference of references) { - updateCallingTypesForReference(parameterIndex, reference, callingTypes, request); - } - } + // For each calling location, add any types it's called with there + for (const reference of references) { + updateCallingTypesForReference( + parameterIndex, + reference, + callingTypes, + request, + ); + } + } - return callingTypes; + return callingTypes; }; const updateCallingTypesForReference = ( - parameterIndex: number, - callingNode: ts.Node, - callingTypes: ts.Type[], - request: FileMutationsRequest, + parameterIndex: number, + callingNode: ts.Node, + callingTypes: ts.Type[], + request: FileMutationsRequest, ): void => { - // In order to be calling with this parameter, the referencing node should be an expression... - if (!ts.isExpressionStatement(callingNode)) { - return; - } + // In order to be calling with this parameter, the referencing node should be an expression... + if (!ts.isExpressionStatement(callingNode)) { + return; + } - // ...that calls to the parameter we're looking at - if (!ts.isCallExpression(callingNode.expression) || callingNode.expression.arguments.length <= parameterIndex) { - return; - } + // ...that calls to the parameter we're looking at + if ( + !ts.isCallExpression(callingNode.expression) || + callingNode.expression.arguments.length <= parameterIndex + ) { + return; + } - // Mark the type of parameter at our index as being called with - const callingType = getTypeAtLocationIfNotError(request, callingNode.expression.arguments[parameterIndex]); - if (callingType !== undefined) { - callingTypes.push(callingType); - } + // Mark the type of parameter at our index as being called with + const callingType = getTypeAtLocationIfNotError( + request, + callingNode.expression.arguments[parameterIndex], + ); + if (callingType !== undefined) { + callingTypes.push(callingType); + } }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompletePropertyDeclarationTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompletePropertyDeclarationTypes/index.ts index df578d1f5..5a31a5951 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompletePropertyDeclarationTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompletePropertyDeclarationTypes/index.ts @@ -1,105 +1,153 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; - -import { createTypeAdditionMutation, createTypeCreationMutation } from "../../../../mutations/creators"; -import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes"; -import { isNodeWithType, NodeWithType } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; - -export const fixIncompletePropertyDeclarationTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isPropertyDeclarationWithType, visitPropertyDeclaration); - -const isPropertyDeclarationWithType = (node: ts.Node): node is ts.PropertyDeclaration & NodeWithType => - ts.isPropertyDeclaration(node) && isNodeWithType(node); - -const visitPropertyDeclaration = (node: ts.PropertyDeclaration, request: FileMutationsRequest): Mutation | undefined => { - // Collect types later assigned to the property, and types initially declared by or inferred on the property - const assignedTypes = collectPropertyAssignedTypes(node, request); - const declaredType = getTypeAtLocationIfNotError(request, node); - if (declaredType === undefined || tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { - return undefined; - } - - // If the property already has a declared type, add assigned types to it if necessary - if (isNodeWithType(node)) { - return createTypeAdditionMutation(request, node, declaredType, assignedTypes); - } - - // Since the parameter doesn't have its own type, give it one if necessary - return createTypeCreationMutation(request, node, declaredType, assignedTypes); +import ts from "typescript"; + +import { + createTypeAdditionMutation, + createTypeCreationMutation, +} from "../../../../mutations/creators.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { NodeWithType, isNodeWithType } from "../../../../shared/nodeTypes.js"; +import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; + +export const fixIncompletePropertyDeclarationTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isPropertyDeclarationWithType, + visitPropertyDeclaration, + ); + +const isPropertyDeclarationWithType = ( + node: ts.Node, +): node is ts.PropertyDeclaration & NodeWithType => + ts.isPropertyDeclaration(node) && isNodeWithType(node); + +const visitPropertyDeclaration = ( + node: ts.PropertyDeclaration, + request: FileMutationsRequest, +): Mutation | undefined => { + // Collect types later assigned to the property, and types initially declared by or inferred on the property + const assignedTypes = collectPropertyAssignedTypes(node, request); + const declaredType = getTypeAtLocationIfNotError(request, node); + if ( + declaredType === undefined || + tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any) + ) { + return undefined; + } + + // If the property already has a declared type, add assigned types to it if necessary + if (isNodeWithType(node)) { + return createTypeAdditionMutation( + request, + node, + declaredType, + assignedTypes, + ); + } + + // Since the parameter doesn't have its own type, give it one if necessary + return createTypeCreationMutation(request, node, declaredType, assignedTypes); }; -const collectPropertyAssignedTypes = (node: ts.PropertyDeclaration, request: FileMutationsRequest): ReadonlyArray => { - const assignedTypes: ts.Type[] = []; - - // If the property has an initial value, consider that an assignment - if (node.initializer !== undefined) { - const initializerType = getTypeAtLocationIfNotError(request, node.initializer); - if (initializerType !== undefined) { - assignedTypes.push(initializerType); - } - } - - // If the property is marked as readonly, don't bother checking for more types - if (tsutils.isModifierFlagSet(node, ts.ModifierFlags.Readonly)) { - return assignedTypes; - } - - // Find everything else referencing the property - const references = request.fileInfoCache.getNodeReferencesAsNodes(node); - if (references !== undefined) { - // For each referencing location, update types if the type is assigned to there - for (const reference of references) { - updateAssignedTypesForReference(node.parent, reference, assignedTypes, request); - } - } - - return assignedTypes; +const collectPropertyAssignedTypes = ( + node: ts.PropertyDeclaration, + request: FileMutationsRequest, +): readonly ts.Type[] => { + const assignedTypes: ts.Type[] = []; + + // If the property has an initial value, consider that an assignment + if (node.initializer !== undefined) { + const initializerType = getTypeAtLocationIfNotError( + request, + node.initializer, + ); + if (initializerType !== undefined) { + assignedTypes.push(initializerType); + } + } + + // If the property is marked as readonly, don't bother checking for more types + if (tsutils.isModifierFlagSet(node, ts.ModifierFlags.Readonly)) { + return assignedTypes; + } + + // Find everything else referencing the property + const references = request.fileInfoCache.getNodeReferencesAsNodes(node); + if (references !== undefined) { + // For each referencing location, update types if the type is assigned to there + for (const reference of references) { + updateAssignedTypesForReference( + node.parent, + reference, + assignedTypes, + request, + ); + } + } + + return assignedTypes; }; /** * Adds missing types for a reference to a property. - * + * @param targetClass Class whose properties are being referenced. * @param identifier Node referencing the property. * @param assignedTypes In-progress collection of types assigned to a property. * @param request Metadata and settings to collect mutations in a file. */ const updateAssignedTypesForReference = ( - targetClass: ts.ClassLikeDeclaration, - identifier: ts.Node, - assignedTypes: ts.Type[], - request: FileMutationsRequest, + targetClass: ts.ClassLikeDeclaration, + identifier: ts.Node, + assignedTypes: ts.Type[], + request: FileMutationsRequest, ): void => { - // In order to write a new type, the referencing node should be an identifier... - if (!ts.isIdentifier(identifier)) { - return; - } - - // ...contained as a name inside a property access... - const propertyAccess = identifier.parent; - if (!ts.isPropertyAccessExpression(propertyAccess) || propertyAccess.name !== identifier) { - return; - } - - // ...contained as the left-hand side of an "=" binary expression... - const binaryExpression = propertyAccess.parent; - if (!isNodeAssigningBinaryExpression(binaryExpression) || binaryExpression.left !== propertyAccess) { - return; - } - - // ...and where the original property access expression refers to the target class - // (this is important when multiple child classes of a single base class redeclare a member, such as React.Component's state) - const assigneeType = getTypeAtLocationIfNotError(request, propertyAccess.expression); - if (assigneeType?.getSymbol()?.valueDeclaration !== targetClass) { - return; - } - - // Mark the type of the right-hand side of the "=" expression as being assigned - const assignmentType = getTypeAtLocationIfNotError(request, binaryExpression.right); - if (assignmentType !== undefined) { - assignedTypes.push(assignmentType); - } + // In order to write a new type, the referencing node should be an identifier... + if (!ts.isIdentifier(identifier)) { + return; + } + + // ...contained as a name inside a property access... + const propertyAccess = identifier.parent; + if ( + !ts.isPropertyAccessExpression(propertyAccess) || + propertyAccess.name !== identifier + ) { + return; + } + + // ...contained as the left-hand side of an "=" binary expression... + const binaryExpression = propertyAccess.parent; + if ( + !isNodeAssigningBinaryExpression(binaryExpression) || + binaryExpression.left !== propertyAccess + ) { + return; + } + + // ...and where the original property access expression refers to the target class + // (this is important when multiple child classes of a single base class redeclare a member, such as React.Component's state) + const assigneeType = getTypeAtLocationIfNotError( + request, + propertyAccess.expression, + ); + if (assigneeType?.getSymbol()?.valueDeclaration !== targetClass) { + return; + } + + // Mark the type of the right-hand side of the "=" expression as being assigned + const assignmentType = getTypeAtLocationIfNotError( + request, + binaryExpression.right, + ); + if (assignmentType !== undefined) { + assignedTypes.push(assignmentType); + } }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/collectAllFunctionCallTypes.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/collectAllFunctionCallTypes.ts index 647b18193..138024ce9 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/collectAllFunctionCallTypes.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/collectAllFunctionCallTypes.ts @@ -1,89 +1,113 @@ -import * as ts from "typescript"; -import { getDeclaredTypesOfArgument } from "../../../../../shared/calls"; -import { isPropertySignatureWithStaticName, PropertySignatureWithStaticName } from "../../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../../shared/types"; - -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; -import { ReactComponentPropsNode } from "../getComponentPropsNode"; -import { getPropNodeFromReference } from "../getPropNodeFromReference"; +import ts from "typescript"; + +import { getDeclaredTypesOfArgument } from "../../../../../shared/calls.js"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { + PropertySignatureWithStaticName, + isPropertySignatureWithStaticName, +} from "../../../../../shared/nodeTypes.js"; +import { getTypeAtLocationIfNotError } from "../../../../../shared/types.js"; +import { ReactComponentPropsNode } from "../getComponentPropsNode.js"; +import { getPropNodeFromReference } from "../getPropNodeFromReference.js"; export interface FunctionCallType { - parameters?: (ts.Type | undefined)[]; - returnValue?: ts.Type; + parameters?: (ts.Type | undefined)[]; + returnValue?: ts.Type; } -export const collectAllFunctionCallTypes = (request: FileMutationsRequest, propsNode: ReactComponentPropsNode) => { - const allFunctionCallTypes = new Map(); - - for (const member of propsNode.members) { - // Don't look at properties without obvious names and types explicitly set to Function - if ( - !isPropertySignatureWithStaticName(member) || - member.type === undefined || - !ts.isTypeReferenceNode(member.type) || - !ts.isIdentifier(member.type.typeName) || - member.type.typeName.text !== "Function" - ) { - continue; - } - - collectFunctionCallsTypes(request, member, allFunctionCallTypes); - } - - return allFunctionCallTypes; +export const collectAllFunctionCallTypes = ( + request: FileMutationsRequest, + propsNode: ReactComponentPropsNode, +) => { + const allFunctionCallTypes = new Map< + PropertySignatureWithStaticName, + FunctionCallType[] + >(); + + for (const member of propsNode.members) { + // Don't look at properties without obvious names and types explicitly set to Function + if ( + !isPropertySignatureWithStaticName(member) || + member.type === undefined || + !ts.isTypeReferenceNode(member.type) || + !ts.isIdentifier(member.type.typeName) || + member.type.typeName.text !== "Function" + ) { + continue; + } + + collectFunctionCallsTypes(request, member, allFunctionCallTypes); + } + + return allFunctionCallTypes; }; const collectFunctionCallsTypes = ( - request: FileMutationsRequest, - member: PropertySignatureWithStaticName, - allFunctionCallTypes: Map, + request: FileMutationsRequest, + member: PropertySignatureWithStaticName, + allFunctionCallTypes: Map< + PropertySignatureWithStaticName, + FunctionCallType[] + >, ) => { - // Find all references to the name of the type - const references = request.fileInfoCache.getNodeReferencesAsNodes(member.name); - if (references === undefined) { - return; - } - - const functionCallTypes: FunctionCallType[] = []; - - // For each reference, try to infer the type from its usage... - for (const reference of references) { - // (except for the original member we're looking around) - if (reference === member || !ts.isExpression(reference)) { - continue; - } - - const call = getCallForReference(reference); - if (call !== undefined) { - collectFunctionCallTypes(request, functionCallTypes, call); - } - } - - allFunctionCallTypes.set(member, functionCallTypes); + // Find all references to the name of the type + const references = request.fileInfoCache.getNodeReferencesAsNodes( + member.name, + ); + if (references === undefined) { + return; + } + + const functionCallTypes: FunctionCallType[] = []; + + // For each reference, try to infer the type from its usage... + for (const reference of references) { + // (except for the original member we're looking around) + if (reference === member || !ts.isExpression(reference)) { + continue; + } + + const call = getCallForReference(reference); + if (call !== undefined) { + collectFunctionCallTypes(request, functionCallTypes, call); + } + } + + allFunctionCallTypes.set(member, functionCallTypes); }; const getCallForReference = (reference: ts.Expression) => { - reference = getPropNodeFromReference(reference); + reference = getPropNodeFromReference(reference); - return ts.isCallExpression(reference.parent) ? reference.parent : undefined; + return ts.isCallExpression(reference.parent) ? reference.parent : undefined; }; -const collectFunctionCallTypes = (request: FileMutationsRequest, functionCallTypes: FunctionCallType[], call: ts.CallExpression) => { - // Case: the return value is directly passed to a function - if (ts.isCallExpression(call.parent) || ts.isNewExpression(call.parent)) { - const declaredTypes = getDeclaredTypesOfArgument(request, call.parent, call); - - for (const declaredType of declaredTypes) { - functionCallTypes.push({ - returnValue: declaredType, - }); - } - } - - // If the prop function is passed arguments, infer types from them - if (call.arguments.length !== 0) { - functionCallTypes.push({ - parameters: call.arguments.map((callArgument) => getTypeAtLocationIfNotError(request, callArgument)), - }); - } +const collectFunctionCallTypes = ( + request: FileMutationsRequest, + functionCallTypes: FunctionCallType[], + call: ts.CallExpression, +) => { + // Case: the return value is directly passed to a function + if (ts.isCallExpression(call.parent) || ts.isNewExpression(call.parent)) { + const declaredTypes = getDeclaredTypesOfArgument( + request, + call.parent, + call, + ); + + for (const declaredType of declaredTypes) { + functionCallTypes.push({ + returnValue: declaredType, + }); + } + } + + // If the prop function is passed arguments, infer types from them + if (call.arguments.length !== 0) { + functionCallTypes.push({ + parameters: call.arguments.map((callArgument) => + getTypeAtLocationIfNotError(request, callArgument), + ), + }); + } }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/createFunctionCallTypesMutation.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/createFunctionCallTypesMutation.ts index 8c45355c6..fb74e1d68 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/createFunctionCallTypesMutation.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/createFunctionCallTypesMutation.ts @@ -1,88 +1,116 @@ -import { combineMutations, TextSwapMutation } from "automutate"; -import * as ts from "typescript"; +import { TextSwapMutation, combineMutations } from "automutate"; +import ts from "typescript"; -import { collectOptionals, isNotUndefined } from "../../../../../shared/arrays"; -import { PropertySignatureWithStaticName } from "../../../../../shared/nodeTypes"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; -import { FunctionCallType } from "./collectAllFunctionCallTypes"; +import { + collectOptionals, + isNotUndefined, +} from "../../../../../shared/arrays.js"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { PropertySignatureWithStaticName } from "../../../../../shared/nodeTypes.js"; +import { FunctionCallType } from "./collectAllFunctionCallTypes.js"; -type CombinedFunctionType = { - parameters: ts.Type[][]; - returnValue?: ts.Type[]; -}; +interface CombinedFunctionType { + parameters: ts.Type[][]; + returnValue?: ts.Type[]; +} export const createFunctionCallTypesMutation = ( - request: FileMutationsRequest, - allFunctionCallTypes: Map, + request: FileMutationsRequest, + allFunctionCallTypes: Map< + PropertySignatureWithStaticName, + FunctionCallType[] + >, ) => { - const mutations = Array.from(allFunctionCallTypes).map(([member, functionCallTypes]) => { - return createFunctionCallTypeMutation(request, member, functionCallTypes); - }); + const mutations = Array.from(allFunctionCallTypes).map( + ([member, functionCallTypes]) => { + return createFunctionCallTypeMutation(request, member, functionCallTypes); + }, + ); - return mutations === undefined || mutations.length === 0 ? undefined : combineMutations(...mutations); + return mutations.length === 0 ? undefined : combineMutations(...mutations); }; const createFunctionCallTypeMutation = ( - request: FileMutationsRequest, - member: PropertySignatureWithStaticName, - functionCallTypes: FunctionCallType[], + request: FileMutationsRequest, + member: PropertySignatureWithStaticName, + functionCallTypes: FunctionCallType[], ): TextSwapMutation => { - const combinedType = functionCallTypes.reduce( - (accum, functionCallType) => { - return { - parameters: combineParameters(request, accum.parameters, functionCallType.parameters), - returnValue: collectOptionals(accum.returnValue, [functionCallType.returnValue]).filter(isNotUndefined), - }; - }, - { - parameters: [], - returnValue: [], - }, - ); + const combinedType = functionCallTypes.reduce( + (accumulator, functionCallType) => { + return { + parameters: combineParameters( + request, + accumulator.parameters, + functionCallType.parameters, + ), + returnValue: collectOptionals(accumulator.returnValue, [ + functionCallType.returnValue, + ]).filter(isNotUndefined), + }; + }, + { + parameters: [], + returnValue: [], + }, + ); - return { - insertion: `${member.name.text}: ${printFunctionType(request, combinedType)}`, - range: { - begin: member.getStart(request.sourceFile), - end: member.end, - }, - type: "text-swap", - }; + return { + insertion: `${member.name.text}: ${printFunctionType(request, combinedType)}`, + range: { + begin: member.getStart(request.sourceFile), + end: member.end, + }, + type: "text-swap", + }; }; -const combineParameters = (request: FileMutationsRequest, previous: ts.Type[][], next: (ts.Type | undefined)[] | undefined) => { - if (next === undefined) { - return previous; - } +const combineParameters = ( + request: FileMutationsRequest, + previous: ts.Type[][], + next: (ts.Type | undefined)[] | undefined, +) => { + if (next === undefined) { + return previous; + } - const combined: ts.Type[][] = []; - let i: number; + const combined: ts.Type[][] = []; + let i: number; - for (i = 0; i < previous.length; i += 1) { - combined.push([...previous[i]]); + for (i = 0; i < previous.length; i += 1) { + combined.push([...previous[i]]); - if (i < next.length && next[i] !== undefined) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - combined[i].push(next[i]!); - } - } + if (i < next.length && next[i] !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + combined[i].push(next[i]!); + } + } - for (i; i < next.length; i += 1) { - if (next[i] !== undefined) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - combined.push([next[i]!]); - } - } + for (i; i < next.length; i += 1) { + if (next[i] !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + combined.push([next[i]!]); + } + } - return combined; + return combined; }; -const printFunctionType = (request: FileMutationsRequest, combinedType: CombinedFunctionType) => { - return [ - "(", - combinedType.parameters?.map((parameter, index) => `arg${index}: ${request.services.printers.type(parameter)}`).join(", "), - ") => ", - combinedType.returnValue?.length ? request.services.printers.type(combinedType.returnValue) : "void", - ";", - ].join(""); +const printFunctionType = ( + request: FileMutationsRequest, + combinedType: CombinedFunctionType, +) => { + return [ + "(", + combinedType.parameters + .map( + (parameter, index) => + `arg${index}: ${request.services.printers.type(parameter)}`, + ) + .join(", "), + ") => ", + combinedType.returnValue?.length + ? request.services.printers.type(combinedType.returnValue) + : "void", + ";", + ].join(""); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/index.ts index 1fb22d482..43d6e2aa6 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropFunctionsFromCalls/index.ts @@ -1,30 +1,39 @@ -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; -import { isReactComponentNode, ReactComponentNode } from "../reactFiltering/isReactComponentNode"; - -import { getComponentPropsNode } from "../getComponentPropsNode"; -import { collectAllFunctionCallTypes } from "./collectAllFunctionCallTypes"; -import { createFunctionCallTypesMutation } from "./createFunctionCallTypesMutation"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { getComponentPropsNode } from "../getComponentPropsNode.js"; +import { + ReactComponentNode, + isReactComponentNode, +} from "../reactFiltering/isReactComponentNode.js"; +import { collectAllFunctionCallTypes } from "./collectAllFunctionCallTypes.js"; +import { createFunctionCallTypesMutation } from "./createFunctionCallTypesMutation.js"; /** * Expands a component's props declared as Function to be more specific types. */ export const fixReactPropFunctionsFromCalls: FileMutator = (request) => { - return collectMutationsFromNodes(request, isReactComponentNode, visitReactComponentNode); + return collectMutationsFromNodes( + request, + isReactComponentNode, + visitReactComponentNode, + ); }; -const visitReactComponentNode = (node: ReactComponentNode, request: FileMutationsRequest) => { - // Grab the node used to declare the node's props type, if it exists - const propsNode = getComponentPropsNode(request, node); - if (propsNode === undefined) { - return undefined; - } +const visitReactComponentNode = ( + node: ReactComponentNode, + request: FileMutationsRequest, +) => { + // Grab the node used to declare the node's props type, if it exists + const propsNode = getComponentPropsNode(request, node); + if (propsNode === undefined) { + return undefined; + } - // Find all Function prop calls used internally within the node - const allFunctionCallTypes = collectAllFunctionCallTypes(request, propsNode); - if (allFunctionCallTypes === undefined) { - return undefined; - } + // Find all Function prop calls used internally within the node + const allFunctionCallTypes = collectAllFunctionCallTypes(request, propsNode); - return createFunctionCallTypesMutation(request, allFunctionCallTypes); + return createFunctionCallTypesMutation(request, allFunctionCallTypes); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/getComponentAssignedTypesFromUsage.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/getComponentAssignedTypesFromUsage.ts index 6ccb282a0..3698ade60 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/getComponentAssignedTypesFromUsage.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/getComponentAssignedTypesFromUsage.ts @@ -1,76 +1,85 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { AssignedTypesByName } from "../../../../../mutations/assignments"; -import { getStaticNameOfProperty } from "../../../../../shared/names"; -import { getTypeAtLocationIfNotError } from "../../../../../shared/types"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; -import { ReactComponentNode } from "../reactFiltering/isReactComponentNode"; +import { AssignedTypesByName } from "../../../../../mutations/assignments.js"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; +import { getStaticNameOfProperty } from "../../../../../shared/names.js"; +import { getTypeAtLocationIfNotError } from "../../../../../shared/types.js"; +import { ReactComponentNode } from "../reactFiltering/isReactComponentNode.js"; /** * Finds all assigned types for props in each JSX usage of a React component. */ export const getComponentAssignedTypesFromUsage = ( - request: FileMutationsRequest, - node: ReactComponentNode, + request: FileMutationsRequest, + node: ReactComponentNode, ): AssignedTypesByName[] | undefined => { - const references = getComponentReferences(request, node); - if (references === undefined) { - return undefined; - } + const references = getComponentReferences(request, node); + if (references === undefined) { + return undefined; + } - const assignedTypes: AssignedTypesByName[] = []; + const assignedTypes: AssignedTypesByName[] = []; - // For each referencing location, update types if the node is used as a component there - for (const reference of references) { - updateAssignedTypesForReference(reference, assignedTypes, request); - } + // For each referencing location, update types if the node is used as a component there + for (const reference of references) { + updateAssignedTypesForReference(reference, assignedTypes, request); + } - return assignedTypes; + return assignedTypes; }; -const getComponentReferences = (request: FileMutationsRequest, node: ReactComponentNode) => { - const referencesNode = ts.isClassDeclaration(node) || ts.isFunctionDeclaration(node) ? node : node.parent; +const getComponentReferences = ( + request: FileMutationsRequest, + node: ReactComponentNode, +) => { + const referencesNode = + ts.isClassDeclaration(node) || ts.isFunctionDeclaration(node) + ? node + : node.parent; - return request.fileInfoCache.getNodeReferencesAsNodes(referencesNode); + return request.fileInfoCache.getNodeReferencesAsNodes(referencesNode); }; const updateAssignedTypesForReference = ( - identifier: ts.Node, - componentAssignedTypes: AssignedTypesByName[], - request: FileMutationsRequest, + identifier: ts.Node, + componentAssignedTypes: AssignedTypesByName[], + request: FileMutationsRequest, ): void => { - // In order to assign props, the referencing node should be an identifier... - if (!ts.isIdentifier(identifier)) { - return; - } + // In order to assign props, the referencing node should be an identifier... + if (!ts.isIdentifier(identifier)) { + return; + } - // ...inside a starting JSX element - const jsxElement = identifier.parent; - if (!ts.isJsxSelfClosingElement(jsxElement) && !ts.isJsxOpeningElement(jsxElement)) { - return; - } + // ...inside a starting JSX element + const jsxElement = identifier.parent; + if ( + !ts.isJsxSelfClosingElement(jsxElement) && + !ts.isJsxOpeningElement(jsxElement) + ) { + return; + } - // For each property passed in this element's attributes, grab its name and type into a map - const assignedTypes: AssignedTypesByName = new Map(); + // For each property passed in this element's attributes, grab its name and type into a map + const assignedTypes: AssignedTypesByName = new Map(); - for (const property of jsxElement.attributes.properties) { - // Ignore properties that aren't directly JSX attributes - if (!ts.isJsxAttribute(property)) { - continue; - } + for (const property of jsxElement.attributes.properties) { + // Ignore properties that aren't directly JSX attributes + if (!ts.isJsxAttribute(property)) { + continue; + } - // For now, ignore any property with a name that's not immediately convertable to a string - const name = getStaticNameOfProperty(property.name); - if (name === undefined) { - continue; - } + // For now, ignore any property with a name that's not immediately convertible to a string + const name = getStaticNameOfProperty(property.name); + if (name === undefined) { + continue; + } - // TypeScript stores the type of the property's value on the property itself - const propertyType = getTypeAtLocationIfNotError(request, property); - if (propertyType !== undefined) { - assignedTypes.set(name, propertyType); - } - } + // TypeScript stores the type of the property's value on the property itself + const propertyType = getTypeAtLocationIfNotError(request, property); + if (propertyType !== undefined) { + assignedTypes.set(name, propertyType); + } + } - componentAssignedTypes.push(assignedTypes); + componentAssignedTypes.push(assignedTypes); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/index.ts index 9c7bc3bf6..93d6bd357 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromLaterAssignments/index.ts @@ -1,30 +1,52 @@ -import { createTypeExpansionMutation } from "../../../../../mutations/expansions/expansionMutations"; -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; -import { isReactComponentNode, ReactComponentNode } from "../reactFiltering/isReactComponentNode"; - -import { getComponentAssignedTypesFromUsage } from "./getComponentAssignedTypesFromUsage"; -import { getComponentPropsNode } from "../getComponentPropsNode"; +import { createTypeExpansionMutation } from "../../../../../mutations/expansions/expansionMutations.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { getComponentPropsNode } from "../getComponentPropsNode.js"; +import { + ReactComponentNode, + isReactComponentNode, +} from "../reactFiltering/isReactComponentNode.js"; +import { getComponentAssignedTypesFromUsage } from "./getComponentAssignedTypesFromUsage.js"; /** * Expands the existing props type for a component from its external JSX-style declarations. */ export const fixReactPropsFromLaterAssignments: FileMutator = (request) => { - return collectMutationsFromNodes(request, isReactComponentNode, visitReactComponentNode); + return collectMutationsFromNodes( + request, + isReactComponentNode, + visitReactComponentNode, + ); }; -const visitReactComponentNode = (node: ReactComponentNode, request: FileMutationsRequest) => { - // Grab the node used to declare the node's props type, if it exists - const propsNode = getComponentPropsNode(request, node); - if (propsNode === undefined) { - return undefined; - } +const visitReactComponentNode = ( + node: ReactComponentNode, + request: FileMutationsRequest, +) => { + // Grab the node used to declare the node's props type, if it exists + const propsNode = getComponentPropsNode(request, node); + if (propsNode === undefined) { + return undefined; + } - // Find all types of props later passed to the node - const componentAssignedTypes = getComponentAssignedTypesFromUsage(request, node); - if (componentAssignedTypes === undefined || componentAssignedTypes.length === 0) { - return undefined; - } + // Find all types of props later passed to the node + const componentAssignedTypes = getComponentAssignedTypesFromUsage( + request, + node, + ); + if ( + componentAssignedTypes === undefined || + componentAssignedTypes.length === 0 + ) { + return undefined; + } - return createTypeExpansionMutation(request, propsNode, componentAssignedTypes); + return createTypeExpansionMutation( + request, + propsNode, + componentAssignedTypes, + ); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/annotation/createInterfaceUsageMutation.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/annotation/createInterfaceUsageMutation.ts index 28fd927f4..04119747b 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/annotation/createInterfaceUsageMutation.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/annotation/createInterfaceUsageMutation.ts @@ -1,38 +1,51 @@ import { TextInsertMutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { getClassExtendsType } from "../../../../../../shared/nodes"; -import { ReactClassComponentNode, ReactComponentNode, ReactFunctionalComponentNode } from "../../reactFiltering/isReactComponentNode"; +import { getClassExtendsType } from "../../../../../../shared/nodes.js"; +import { + ReactClassComponentNode, + ReactComponentNode, + ReactFunctionalComponentNode, +} from "../../reactFiltering/isReactComponentNode.js"; -export const createInterfaceUsageMutation = (node: ReactComponentNode, interfaceName: string): TextInsertMutation | undefined => { - return ts.isClassLike(node) - ? createClassInterfaceUsageMutation(node, interfaceName) - : createFunctionLikeInterfaceUsageMutation(node, interfaceName); +export const createInterfaceUsageMutation = ( + node: ReactComponentNode, + interfaceName: string, +): TextInsertMutation | undefined => { + return ts.isClassLike(node) + ? createClassInterfaceUsageMutation(node, interfaceName) + : createFunctionLikeInterfaceUsageMutation(node, interfaceName); }; -const createClassInterfaceUsageMutation = (node: ReactClassComponentNode, interfaceName: string): TextInsertMutation | undefined => { - const extension = getClassExtendsType(node); - if (extension === undefined) { - return undefined; - } +const createClassInterfaceUsageMutation = ( + node: ReactClassComponentNode, + interfaceName: string, +): TextInsertMutation | undefined => { + const extension = getClassExtendsType(node); + if (extension === undefined) { + return undefined; + } - return { - insertion: `<${interfaceName}>`, - range: { - begin: extension.end, - }, - type: "text-insert", - }; + return { + insertion: `<${interfaceName}>`, + range: { + begin: extension.end, + }, + type: "text-insert", + }; }; -const createFunctionLikeInterfaceUsageMutation = (node: ReactFunctionalComponentNode, interfaceName: string): TextInsertMutation => { - const propsArgument = node.parameters[0]; +const createFunctionLikeInterfaceUsageMutation = ( + node: ReactFunctionalComponentNode, + interfaceName: string, +): TextInsertMutation => { + const propsArgument = node.parameters[0]; - return { - insertion: `: ${interfaceName}`, - range: { - begin: propsArgument.end, - }, - type: "text-insert", - }; + return { + insertion: `: ${interfaceName}`, + range: { + begin: propsArgument.end, + }, + type: "text-insert", + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/index.ts index 58bfb389e..a71d3d4d6 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/index.ts @@ -1,73 +1,96 @@ -import { combineMutations, Mutation, TextInsertMutation } from "automutate"; -import * as ts from "typescript"; +import { Mutation, TextInsertMutation, combineMutations } from "automutate"; +import ts from "typescript"; -import { ReactPropTypesHint } from "../../../../../options/enums"; -import { getClassExtendsType } from "../../../../../shared/nodes"; -import { printNewLine } from "../../../../../shared/printing/newlines"; -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; -import { isReactComponentNode, ReactComponentNode } from "../reactFiltering/isReactComponentNode"; - -import { createInterfaceUsageMutation } from "./annotation/createInterfaceUsageMutation"; -import { createInterfaceFromPropTypes } from "./propTypes/createInterfaceFromPropTypes"; -import { getPropTypesValue } from "./propTypes/getPropTypesValue"; +import { ReactPropTypesHint } from "../../../../../options/enums.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { getClassExtendsType } from "../../../../../shared/nodes.js"; +import { printNewLine } from "../../../../../shared/printing/newlines.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { + ReactComponentNode, + isReactComponentNode, +} from "../reactFiltering/isReactComponentNode.js"; +import { createInterfaceUsageMutation } from "./annotation/createInterfaceUsageMutation.js"; +import { createInterfaceFromPropTypes } from "./propTypes/createInterfaceFromPropTypes.js"; +import { getPropTypesValue } from "./propTypes/getPropTypesValue.js"; /** * Creates an initial props type for a component from its PropTypes declaration. */ -export const fixReactPropsFromPropTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - if (request.options.hints.react.propTypes === ReactPropTypesHint.Ignore) { - return []; - } +export const fixReactPropsFromPropTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + if (request.options.hints.react.propTypes === ReactPropTypesHint.Ignore) { + return []; + } - return collectMutationsFromNodes(request, isReactComponentNode, visitReactComponentNode); + return collectMutationsFromNodes( + request, + isReactComponentNode, + visitReactComponentNode, + ); }; -const visitReactComponentNode = (node: ReactComponentNode, request: FileMutationsRequest): Mutation | undefined => { - // If the node is a class declaration, don't bother with prop types if it already declares a React.Component template - if (ts.isClassDeclaration(node)) { - const extendsType = getClassExtendsType(node); +const visitReactComponentNode = ( + node: ReactComponentNode, + request: FileMutationsRequest, +): Mutation | undefined => { + // If the node is a class declaration, don't bother with prop types if it already declares a React.Component template + if (ts.isClassDeclaration(node)) { + const extendsType = getClassExtendsType(node); - if (extendsType?.typeArguments !== undefined && extendsType.typeArguments.length > 0) { - return undefined; - } - } + if ( + extendsType?.typeArguments !== undefined && + extendsType.typeArguments.length > 0 + ) { + return undefined; + } + } - // Try to find a static `propTypes` member to indicate the interface - // If it doesn't exist, we can't infer anything about the component here, so we bail out - const propTypes = getPropTypesValue(node); - if (propTypes === undefined) { - return undefined; - } + // Try to find a static `propTypes` member to indicate the interface + // If it doesn't exist, we can't infer anything about the component here, so we bail out + const propTypes = getPropTypesValue(node); + if (propTypes === undefined) { + return undefined; + } - // Since we did find the propTypes object, we can generate an interface from its members - const { interfaceName, interfaceNode } = createInterfaceFromPropTypes(request, node, propTypes); + // Since we did find the propTypes object, we can generate an interface from its members + const { interfaceName, interfaceNode } = createInterfaceFromPropTypes( + request, + node, + propTypes, + ); - // That interface will be injected with blank lines around it just before the component - const mutations: Mutation[] = [createInterfaceCreationMutation(request, node, interfaceNode)]; + // That interface will be injected with blank lines around it just before the component + const mutations: Mutation[] = [ + createInterfaceCreationMutation(request, node, interfaceNode), + ]; - // We'll also annotate the component with a type declaration to use the new prop type - const usage = createInterfaceUsageMutation(node, interfaceName); - if (usage !== undefined) { - mutations.push(usage); - } + // We'll also annotate the component with a type declaration to use the new prop type + const usage = createInterfaceUsageMutation(node, interfaceName); + if (usage !== undefined) { + mutations.push(usage); + } - return combineMutations(...mutations); + return combineMutations(...mutations); }; const createInterfaceCreationMutation = ( - request: FileMutationsRequest, - node: ReactComponentNode, - interfaceNode: ts.InterfaceDeclaration, + request: FileMutationsRequest, + node: ReactComponentNode, + interfaceNode: ts.InterfaceDeclaration, ): TextInsertMutation => { - const endline = printNewLine(request.options.compilerOptions); - const interfaceNodeText = request.services.printers.node(interfaceNode); + const endline = printNewLine(request.options.compilerOptions); + const interfaceNodeText = request.services.printers.node(interfaceNode); - return { - insertion: [endline, endline, interfaceNodeText, endline].join(""), - range: { - begin: node.pos, - }, - type: "text-insert", - }; + return { + insertion: [endline, endline, interfaceNodeText, endline].join(""), + range: { + begin: node.pos, + }, + type: "text-insert", + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/createInterfaceFromPropTypes.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/createInterfaceFromPropTypes.ts index d9f8dbbef..561b1ed37 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/createInterfaceFromPropTypes.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/createInterfaceFromPropTypes.ts @@ -1,34 +1,33 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "../../../../../../shared/fileMutator"; -import { getApparentNameOfComponent } from "../../getApparentNameOfComponent"; -import { ReactComponentNode } from "../../reactFiltering/isReactComponentNode"; - -import { createPropTypesProperty } from "./propTypesProperties"; +import { FileMutationsRequest } from "../../../../../../shared/fileMutator.js"; +import { getApparentNameOfComponent } from "../../getApparentNameOfComponent.js"; +import { ReactComponentNode } from "../../reactFiltering/isReactComponentNode.js"; +import { createPropTypesProperty } from "./propTypesProperties.js"; export const createInterfaceFromPropTypes = ( - request: FileMutationsRequest, - node: ReactComponentNode, - propTypes: ts.ObjectLiteralExpression, + request: FileMutationsRequest, + node: ReactComponentNode, + propTypes: ts.ObjectLiteralExpression, ) => { - const members: ts.TypeElement[] = []; + const members: ts.TypeElement[] = []; - for (const rawProperty of propTypes.properties) { - const member = createPropTypesProperty(request, rawProperty); - if (member !== undefined) { - members.push(member); - } - } + for (const rawProperty of propTypes.properties) { + const member = createPropTypesProperty(request, rawProperty); + if (member !== undefined) { + members.push(member); + } + } - const interfaceName = `${getApparentNameOfComponent(request, node)}Props`; + const interfaceName = `${getApparentNameOfComponent(request, node)}Props`; - const interfaceNode = ts.factory.createInterfaceDeclaration( - undefined /* modifiers */, - interfaceName, - undefined /* typeParameters */, - undefined /* heritageClauses */, - members, - ); + const interfaceNode = ts.factory.createInterfaceDeclaration( + undefined /* modifiers */, + interfaceName, + undefined /* typeParameters */, + undefined /* heritageClauses */, + members, + ); - return { interfaceName, interfaceNode }; + return { interfaceName, interfaceNode }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/getPropTypesValue.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/getPropTypesValue.ts index 57239c43c..607dc934f 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/getPropTypesValue.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/getPropTypesValue.ts @@ -1,91 +1,101 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { ReactComponentNode } from "../../reactFiltering/isReactComponentNode"; +import { ReactComponentNode } from "../../reactFiltering/isReactComponentNode.js"; type PropTypesMember = ts.PropertyDeclaration & { - initializer: ts.ObjectLiteralExpression; - name: { - kind: ts.SyntaxKind.Identifier; - text: "propTypes"; - }; + initializer: ts.ObjectLiteralExpression; + name: { + kind: ts.SyntaxKind.Identifier; + text: "propTypes"; + }; }; /** * @returns Whether a node is a `propTypes` class member with an object literal value. */ const getStaticPropTypes = (node: ts.ClassElement): node is PropTypesMember => - ts.isPropertyDeclaration(node) && - tsutils.includesModifier(node.modifiers as ts.NodeArray, ts.SyntaxKind.StaticKeyword) && - ts.isIdentifier(node.name) && - node.name.text === "propTypes" && - node.initializer !== undefined && - ts.isObjectLiteralExpression(node.initializer); + ts.isPropertyDeclaration(node) && + tsutils.includesModifier( + node.modifiers as ts.NodeArray, + ts.SyntaxKind.StaticKeyword, + ) && + ts.isIdentifier(node.name) && + node.name.text === "propTypes" && + node.initializer !== undefined && + ts.isObjectLiteralExpression(node.initializer); const getPropTypesChildFromParent = (parent: ts.Node, className: string) => { - let result: ts.ObjectLiteralExpression | undefined; + let result: ts.ObjectLiteralExpression | undefined; - parent.forEachChild((child: ts.Node) => { - const propTypes = isPropTypesStatement(child, className); - if (propTypes !== undefined) { - result = propTypes; - return true; - } + parent.forEachChild((child: ts.Node) => { + const propTypes = isPropTypesStatement(child, className); + if (propTypes !== undefined) { + result = propTypes; + return true; + } - return false; - }); + return false; + }); - return result; + return result; }; /** * @returns Object literal `propTypes` assigned to the class, if it exists in a sibling property setter. */ const isPropTypesStatement = (node: ts.Node, className: string) => { - if (!ts.isExpressionStatement(node) || !ts.isBinaryExpression(node.expression)) { - return undefined; - } + if ( + !ts.isExpressionStatement(node) || + !ts.isBinaryExpression(node.expression) + ) { + return undefined; + } - const { left, right } = node.expression; - if ( - !ts.isPropertyAccessExpression(left) || - !ts.isIdentifier(left.expression) || - left.expression.text !== className || - !ts.isIdentifier(left.name) || - left.name.text !== "propTypes" || - !ts.isObjectLiteralExpression(right) - ) { - return undefined; - } + const { left, right } = node.expression; + if ( + !ts.isPropertyAccessExpression(left) || + !ts.isIdentifier(left.expression) || + left.expression.text !== className || + !ts.isIdentifier(left.name) || + left.name.text !== "propTypes" || + !ts.isObjectLiteralExpression(right) + ) { + return undefined; + } - return right; + return right; }; /** * Finds the equivalent `propTypes` object literal for a class, if it exists. - * * @todo * This assumes an object literal (`{ ... }`) with all inline members. * It doesn't yet handle shared variable references or `...` spread operations. */ -export const getPropTypesValue = (node: ReactComponentNode): ts.ObjectLiteralExpression | undefined => { - // If the component's parent declares a prop types for it, use it - if (node.name !== undefined) { - const propTypesStatement = getPropTypesChildFromParent(node.parent, node.name.text); - if (propTypesStatement !== undefined) { - return propTypesStatement; - } - } +export const getPropTypesValue = ( + node: ReactComponentNode, +): ts.ObjectLiteralExpression | undefined => { + // If the component's parent declares a prop types for it, use it + if (node.name !== undefined) { + const propTypesStatement = getPropTypesChildFromParent( + node.parent, + node.name.text, + ); + if (propTypesStatement !== undefined) { + return propTypesStatement; + } + } - // If the component is a class that declares its own static prop types, use it - if (ts.isClassDeclaration(node)) { - const staticPropTypes = node.members.find(getStaticPropTypes); + // If the component is a class that declares its own static prop types, use it + if (ts.isClassDeclaration(node)) { + const staticPropTypes = node.members.find(getStaticPropTypes); - if (staticPropTypes !== undefined) { - return staticPropTypes.initializer; - } - } + if (staticPropTypes !== undefined) { + return staticPropTypes.initializer; + } + } - // Since none of the above worked out, assume no prop types are declared - return undefined; + // Since none of the above worked out, assume no prop types are declared + return undefined; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesExtraction.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesExtraction.ts index 154cacfca..a1dedf1a5 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesExtraction.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesExtraction.ts @@ -1,42 +1,41 @@ -import * as ts from "typescript"; +import ts from "typescript"; /** * Description of a single prop type via PropTypes. */ export interface PropTypesMembers { - /** - * Parent node of the name node. - */ - accessNode: PropTypesAccessNode; - - /** - * `.isRequired` ending node, if it exists. - */ - isRequired?: ts.Identifier | ts.PrivateIdentifier; - - /** - * Node representing the name of the type, such as `number` or `shape`. - */ - nameNode: ts.Identifier | ts.PrivateIdentifier; + /** + * Parent node of the name node. + */ + accessNode: PropTypesAccessNode; + + /** + * `.isRequired` ending node, if it exists. + */ + isRequired?: ts.Identifier | ts.PrivateIdentifier; + + /** + * Node representing the name of the type, such as `number` or `shape`. + */ + nameNode: ts.Identifier | ts.PrivateIdentifier; } /** * Node type that can represent the value for a PropTypes description. */ export type PropTypesAccessNode = - /** - * Called descriptor, such as `PropTypes.shapeOf({ ... })`. - */ - | ts.CallExpression + /** + * Called descriptor, such as `PropTypes.shapeOf({ ... })`. + */ + | ts.CallExpression - /** - * Simple string descriptor, such as `PropTypes.number`. - */ - | ts.PropertyAccessExpression; + /** + * Simple string descriptor, such as `PropTypes.number`. + */ + | ts.PropertyAccessExpression; /** * Selects the relevant member nodes for a PropTypes member expression. - * * @param node * PropTypes assignment in an object literal, as one of: * `PropTypes.number` @@ -44,82 +43,87 @@ export type PropTypesAccessNode = * `PropTypes.shape({})` * `PropTypes.shape({}).isRequired` */ -export const getPropTypesMember = (node: ts.Expression): PropTypesMembers | undefined => { - if (ts.isCallExpression(node)) { - return getPropTypesMemberFromCallExpression(node); - } +export const getPropTypesMember = ( + node: ts.Expression, +): PropTypesMembers | undefined => { + if (ts.isCallExpression(node)) { + return getPropTypesMemberFromCallExpression(node); + } - if (ts.isPropertyAccessExpression(node)) { - return getPropTypesMemberFromPropertyAccessExpression(node); - } + if (ts.isPropertyAccessExpression(node)) { + return getPropTypesMemberFromPropertyAccessExpression(node); + } - return undefined; + return undefined; }; /** - * @remarks * Must be like `PropTypes.shape({})`, as `.isRequired` would make this a property access expression. */ -const getPropTypesMemberFromCallExpression = (node: ts.CallExpression): PropTypesMembers | undefined => { - const accessNode = node.expression; - if (!ts.isPropertyAccessExpression(accessNode)) { - return undefined; - } +const getPropTypesMemberFromCallExpression = ( + node: ts.CallExpression, +): PropTypesMembers | undefined => { + const accessNode = node.expression; + if (!ts.isPropertyAccessExpression(accessNode)) { + return undefined; + } - const nameNode = accessNode.name; + const nameNode = accessNode.name; - return { accessNode, nameNode }; + return { accessNode, nameNode }; }; /** - * @remarks * Must be like `PropTypes.number`, `PropTypes.number.isRequired`, or `PropTypes.shape({}).isRequired`. */ -const getPropTypesMemberFromPropertyAccessExpression = (node: ts.PropertyAccessExpression): PropTypesMembers | undefined => { - const isRequired = node.name.text === "isRequired" ? node.name : undefined; +const getPropTypesMemberFromPropertyAccessExpression = ( + node: ts.PropertyAccessExpression, +): PropTypesMembers | undefined => { + const isRequired = node.name.text === "isRequired" ? node.name : undefined; - return isRequired === undefined - ? getPropTypesMemberFromPropertyAccessExpressionOptional(node) - : getPropTypesMemberFromPropertyAccessExpressionRequired(node, isRequired); + return isRequired === undefined + ? getPropTypesMemberFromPropertyAccessExpressionOptional(node) + : getPropTypesMemberFromPropertyAccessExpressionRequired(node, isRequired); }; /** - * @remarks * Must be like `PropTypes.number`. */ -const getPropTypesMemberFromPropertyAccessExpressionOptional = (node: ts.PropertyAccessExpression): PropTypesMembers | undefined => { - return { accessNode: node, nameNode: node.name }; +const getPropTypesMemberFromPropertyAccessExpressionOptional = ( + node: ts.PropertyAccessExpression, +): PropTypesMembers | undefined => { + return { accessNode: node, nameNode: node.name }; }; /** - * @remarks * Must be like `PropTypes.shape({}).isRequired` or `PropTypes.number.isRequired`. */ const getPropTypesMemberFromPropertyAccessExpressionRequired = ( - node: ts.PropertyAccessExpression, - isRequired: ts.Identifier | ts.PrivateIdentifier, + node: ts.PropertyAccessExpression, + isRequired: ts.Identifier | ts.PrivateIdentifier, ): PropTypesMembers | undefined => { - const { expression } = node; - - if (ts.isCallExpression(expression)) { - const callExpressionTypesMember = getPropTypesMemberFromCallExpression(expression); - if (callExpressionTypesMember === undefined) { - return undefined; - } - - return { - ...callExpressionTypesMember, - isRequired, - }; - } - - if (!ts.isPropertyAccessExpression(expression)) { - return undefined; - } - - return { - accessNode: expression, - isRequired, - nameNode: expression.name, - }; + const { expression } = node; + + if (ts.isCallExpression(expression)) { + const callExpressionTypesMember = + getPropTypesMemberFromCallExpression(expression); + if (callExpressionTypesMember === undefined) { + return undefined; + } + + return { + ...callExpressionTypesMember, + isRequired, + }; + } + + if (!ts.isPropertyAccessExpression(expression)) { + return undefined; + } + + return { + accessNode: expression, + isRequired, + nameNode: expression.name, + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesProperties.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesProperties.ts index d65d2f4e3..bf416536f 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesProperties.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesProperties.ts @@ -1,38 +1,51 @@ -import * as ts from "typescript"; -import { ReactPropTypesOptionality } from "../../../../../../options/enums"; -import { FileMutationsRequest } from "../../../../../../shared/fileMutator"; +import ts from "typescript"; -import { getPropTypesMember } from "./propTypesExtraction"; -import { createPropTypesTransform } from "./propTypesTransforms"; +import { ReactPropTypesOptionality } from "../../../../../../options/enums.js"; +import { FileMutationsRequest } from "../../../../../../shared/fileMutator.js"; +import { getPropTypesMember } from "./propTypesExtraction.js"; +import { createPropTypesTransform } from "./propTypesTransforms.js"; /** * Creates a type signature node for a raw PropTypes object literal property. */ -export const createPropTypesProperty = (request: FileMutationsRequest, rawProperty: ts.ObjectLiteralElementLike) => { - if (!ts.isPropertyAssignment(rawProperty) || !ts.isIdentifier(rawProperty.name)) { - return undefined; - } +export const createPropTypesProperty = ( + request: FileMutationsRequest, + rawProperty: ts.ObjectLiteralElementLike, +) => { + if ( + !ts.isPropertyAssignment(rawProperty) || + !ts.isIdentifier(rawProperty.name) + ) { + return undefined; + } - const propTypesMembers = getPropTypesMember(rawProperty.initializer); - if (propTypesMembers === undefined) { - return undefined; - } + const propTypesMembers = getPropTypesMember(rawProperty.initializer); + if (propTypesMembers === undefined) { + return undefined; + } - const memberTypeNode = createPropTypesTransform(request, propTypesMembers); - if (memberTypeNode === undefined) { - return undefined; - } + const memberTypeNode = createPropTypesTransform(request, propTypesMembers); + if (memberTypeNode === undefined) { + return undefined; + } - return ts.factory.createPropertySignature( - undefined /* modifiers */, - ts.factory.createIdentifier(rawProperty.name.text), - getQuestionToken(!!propTypesMembers.isRequired, request.options.hints.react.propTypesOptionality), - memberTypeNode, - ); + return ts.factory.createPropertySignature( + undefined /* modifiers */, + ts.factory.createIdentifier(rawProperty.name.text), + getQuestionToken( + !!propTypesMembers.isRequired, + request.options.hints.react.propTypesOptionality, + ), + memberTypeNode, + ); }; -const getQuestionToken = (isRequired: boolean, optionality: ReactPropTypesOptionality) => { - return optionality === ReactPropTypesOptionality.AlwaysOptional || (!isRequired && optionality === ReactPropTypesOptionality.AsWritten) - ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) - : undefined; +const getQuestionToken = ( + isRequired: boolean, + optionality: ReactPropTypesOptionality, +) => { + return optionality === ReactPropTypesOptionality.AlwaysOptional || + (!isRequired && optionality === ReactPropTypesOptionality.AsWritten) + ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) + : undefined; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesTransforms.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesTransforms.ts index 7427048a3..2edc929b8 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesTransforms.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromPropTypes/propTypes/propTypesTransforms.ts @@ -1,161 +1,210 @@ -import * as ts from "typescript"; - -import { KnownTypeLiteralNode, transformLiteralToTypeLiteralNode } from "../../../../../../shared/transforms"; -import { FileMutationsRequest } from "../../../../../../shared/fileMutator"; - -import { getPropTypesMember, PropTypesAccessNode, PropTypesMembers } from "./propTypesExtraction"; -import { createPropTypesProperty } from "./propTypesProperties"; +import ts from "typescript"; + +import { FileMutationsRequest } from "../../../../../../shared/fileMutator.js"; +import { + KnownTypeLiteralNode, + transformLiteralToTypeLiteralNode, +} from "../../../../../../shared/transforms.js"; +import { + PropTypesAccessNode, + PropTypesMembers, + getPropTypesMember, +} from "./propTypesExtraction.js"; +import { createPropTypesProperty } from "./propTypesProperties.js"; export const createPropTypesTransform = ( - request: FileMutationsRequest, - { accessNode, nameNode }: Exclude, + request: FileMutationsRequest, + { accessNode, nameNode }: Exclude, ): ts.TypeNode | undefined => { - switch (nameNode.text) { - case "array": - return ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)); + switch (nameNode.text) { + case "array": + return ts.factory.createArrayTypeNode( + ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), + ); - case "arrayOf": - return createArrayOfTransform(request, accessNode); + case "arrayOf": + return createArrayOfTransform(request, accessNode); - case "bool": - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword); + case "bool": + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword); - case "func": - return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Function"), undefined); + case "func": + return ts.factory.createTypeReferenceNode( + ts.factory.createIdentifier("Function"), + undefined, + ); - case "element": - return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("React.ReactElement"), undefined); + case "element": + return ts.factory.createTypeReferenceNode( + ts.factory.createIdentifier("React.ReactElement"), + undefined, + ); - case "instanceOf": - return createInstanceOfTransform(accessNode); + case "instanceOf": + return createInstanceOfTransform(accessNode); - case "number": - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); + case "number": + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); - case "node": - return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("React.ReactNode"), undefined); + case "node": + return ts.factory.createTypeReferenceNode( + ts.factory.createIdentifier("React.ReactNode"), + undefined, + ); - case "object": - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword); + case "object": + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword); - case "oneOf": - return createOneOfTransform(accessNode); + case "oneOf": + return createOneOfTransform(accessNode); - case "oneOfType": - return createOneOfTypeTransform(request, accessNode); + case "oneOfType": + return createOneOfTypeTransform(request, accessNode); - case "shape": - return createShapeTransform(request, accessNode); + case "shape": + return createShapeTransform(request, accessNode); - case "string": - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword); + case "string": + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword); - case "symbol": - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword); - } + case "symbol": + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword); + } - return undefined; + return undefined; }; -const createArrayOfTransform = (request: FileMutationsRequest, accessNode: PropTypesAccessNode) => { - if (!ts.isCallExpression(accessNode.parent) || accessNode.parent.arguments.length !== 1) { - return undefined; - } - - const memberTypeNode = getPropTypesMember(accessNode.parent.arguments[0]); - if (memberTypeNode === undefined) { - return undefined; - } - - const innerTransform = createPropTypesTransform(request, memberTypeNode); - if (innerTransform === undefined) { - return undefined; - } - - return ts.factory.createArrayTypeNode(innerTransform); +const createArrayOfTransform = ( + request: FileMutationsRequest, + accessNode: PropTypesAccessNode, +) => { + if ( + !ts.isCallExpression(accessNode.parent) || + accessNode.parent.arguments.length !== 1 + ) { + return undefined; + } + + const memberTypeNode = getPropTypesMember(accessNode.parent.arguments[0]); + if (memberTypeNode === undefined) { + return undefined; + } + + const innerTransform = createPropTypesTransform(request, memberTypeNode); + if (innerTransform === undefined) { + return undefined; + } + + return ts.factory.createArrayTypeNode(innerTransform); }; const createInstanceOfTransform = (accessNode: PropTypesAccessNode) => { - if (!ts.isCallExpression(accessNode.parent) || accessNode.parent.arguments.length !== 1) { - return undefined; - } - - const className = accessNode.parent.arguments[0]; - if (!ts.isIdentifier(className)) { - return undefined; - } - - return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(className.text), undefined); + if ( + !ts.isCallExpression(accessNode.parent) || + accessNode.parent.arguments.length !== 1 + ) { + return undefined; + } + + const className = accessNode.parent.arguments[0]; + if (!ts.isIdentifier(className)) { + return undefined; + } + + return ts.factory.createTypeReferenceNode( + ts.factory.createIdentifier(className.text), + undefined, + ); }; const createOneOfTransform = (accessNode: PropTypesAccessNode) => { - if (!ts.isCallExpression(accessNode.parent) || accessNode.parent.arguments.length !== 1) { - return undefined; - } - - const allowedItems = accessNode.parent.arguments[0]; - if (!ts.isArrayLiteralExpression(allowedItems)) { - return undefined; - } - - const allowedTypes = allowedItems.elements - .map(transformLiteralToTypeLiteralNode) - .filter((typeNode): typeNode is KnownTypeLiteralNode => typeNode !== undefined); - if (allowedTypes.length === 0) { - return undefined; - } - - return ts.factory.createUnionTypeNode(allowedTypes); + if ( + !ts.isCallExpression(accessNode.parent) || + accessNode.parent.arguments.length !== 1 + ) { + return undefined; + } + + const allowedItems = accessNode.parent.arguments[0]; + if (!ts.isArrayLiteralExpression(allowedItems)) { + return undefined; + } + + const allowedTypes = allowedItems.elements + .map(transformLiteralToTypeLiteralNode) + .filter( + (typeNode): typeNode is KnownTypeLiteralNode => typeNode !== undefined, + ); + if (allowedTypes.length === 0) { + return undefined; + } + + return ts.factory.createUnionTypeNode(allowedTypes); }; -const createOneOfTypeTransform = (request: FileMutationsRequest, accessNode: PropTypesAccessNode) => { - if (!ts.isCallExpression(accessNode.parent) || accessNode.parent.arguments.length !== 1) { - return undefined; - } - - const allowedItems = accessNode.parent.arguments[0]; - if (!ts.isArrayLiteralExpression(allowedItems)) { - return undefined; - } - - const allowedTypes = allowedItems.elements - .map((element) => { - if (!ts.isPropertyAccessExpression(element) || !ts.isIdentifier(element.name)) { - return undefined; - } - - return createPropTypesTransform(request, { - accessNode: element, - nameNode: element.name, - }); - }) - .filter((typeName): typeName is ts.TypeNode => typeName !== undefined); - if (allowedTypes.length === 0) { - return undefined; - } - - return ts.factory.createUnionTypeNode(allowedTypes); +const createOneOfTypeTransform = ( + request: FileMutationsRequest, + accessNode: PropTypesAccessNode, +) => { + if ( + !ts.isCallExpression(accessNode.parent) || + accessNode.parent.arguments.length !== 1 + ) { + return undefined; + } + + const allowedItems = accessNode.parent.arguments[0]; + if (!ts.isArrayLiteralExpression(allowedItems)) { + return undefined; + } + + const allowedTypes = allowedItems.elements + .map((element) => { + if ( + !ts.isPropertyAccessExpression(element) || + !ts.isIdentifier(element.name) + ) { + return undefined; + } + + return createPropTypesTransform(request, { + accessNode: element, + nameNode: element.name, + }); + }) + .filter((typeName): typeName is ts.TypeNode => typeName !== undefined); + if (allowedTypes.length === 0) { + return undefined; + } + + return ts.factory.createUnionTypeNode(allowedTypes); }; -const createShapeTransform = (request: FileMutationsRequest, accessNode: PropTypesAccessNode) => { - if (!ts.isCallExpression(accessNode.parent) || accessNode.parent.arguments.length !== 1) { - return undefined; - } - - const shape = accessNode.parent.arguments[0]; - // Todo: handle shared variables and `...` object spreads - if (!ts.isObjectLiteralExpression(shape)) { - return undefined; - } - - const members: ts.TypeElement[] = []; - - for (const rawProperty of shape.properties) { - const member = createPropTypesProperty(request, rawProperty); - if (member !== undefined) { - members.push(member); - } - } - - return ts.factory.createTypeLiteralNode(members); +const createShapeTransform = ( + request: FileMutationsRequest, + accessNode: PropTypesAccessNode, +) => { + if ( + !ts.isCallExpression(accessNode.parent) || + accessNode.parent.arguments.length !== 1 + ) { + return undefined; + } + + const shape = accessNode.parent.arguments[0]; + // Todo: handle shared variables and `...` object spreads + if (!ts.isObjectLiteralExpression(shape)) { + return undefined; + } + + const members: ts.TypeElement[] = []; + + for (const rawProperty of shape.properties) { + const member = createPropTypesProperty(request, rawProperty); + if (member !== undefined) { + members.push(member); + } + } + + return ts.factory.createTypeLiteralNode(members); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/getPropsUsageTypes.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/getPropsUsageTypes.ts index 3df46decf..a53338ead 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/getPropsUsageTypes.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/getPropsUsageTypes.ts @@ -1,121 +1,162 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { AssignedTypesByName } from "../../../../../mutations/assignments"; -import { getDeclaredTypesOfArgument } from "../../../../../shared/calls"; -import { isNodeWithinNode } from "../../../../../shared/nodes"; +import { AssignedTypesByName } from "../../../../../mutations/assignments.js"; +import { getDeclaredTypesOfArgument } from "../../../../../shared/calls.js"; +import { FileMutationsRequest } from "../../../../../shared/fileMutator.js"; import { - isNodeWithIdentifierName, - isPropertySignatureWithStaticName, - PropertySignatureWithStaticName, -} from "../../../../../shared/nodeTypes"; -import { getSymbolAtLocationIfNotError, getTypeAtLocationIfNotError } from "../../../../../shared/types"; -import { FileMutationsRequest } from "../../../../../shared/fileMutator"; -import { getComponentPropsNode, ReactComponentPropsNode } from "../getComponentPropsNode"; -import { getPropNodeFromReference } from "../getPropNodeFromReference"; -import { getReactComponentNode } from "../reactFiltering/getReactComponentNode"; -import { ReactComponentNode } from "../reactFiltering/isReactComponentNode"; + PropertySignatureWithStaticName, + isNodeWithIdentifierName, + isPropertySignatureWithStaticName, +} from "../../../../../shared/nodeTypes.js"; +import { isNodeWithinNode } from "../../../../../shared/nodes.js"; +import { + getSymbolAtLocationIfNotError, + getTypeAtLocationIfNotError, +} from "../../../../../shared/types.js"; +import { + ReactComponentPropsNode, + getComponentPropsNode, +} from "../getComponentPropsNode.js"; +import { getPropNodeFromReference } from "../getPropNodeFromReference.js"; +import { getReactComponentNode } from "../reactFiltering/getReactComponentNode.js"; +import { ReactComponentNode } from "../reactFiltering/isReactComponentNode.js"; export const getPropsUsageTypes = ( - request: FileMutationsRequest, - componentNode: ReactComponentNode, - propsNode: ReactComponentPropsNode, + request: FileMutationsRequest, + componentNode: ReactComponentNode, + propsNode: ReactComponentPropsNode, ) => { - const allAssignedTypes: AssignedTypesByName[] = []; - - for (const member of propsNode.members) { - if (isPropertySignatureWithStaticName(member)) { - updateAssignedTypesForReferences(request, member, componentNode, member.name, new Set(), allAssignedTypes); - } - } - - return allAssignedTypes; + const allAssignedTypes: AssignedTypesByName[] = []; + + for (const member of propsNode.members) { + if (isPropertySignatureWithStaticName(member)) { + updateAssignedTypesForReferences( + request, + member, + componentNode, + member.name, + new Set(), + allAssignedTypes, + ); + } + } + + return allAssignedTypes; }; const updateAssignedTypesForReferences = ( - request: FileMutationsRequest, - member: PropertySignatureWithStaticName, - componentNode: ReactComponentNode, - start: ts.Node, - seenNodes: Set, - allAssignedTypes: AssignedTypesByName[], + request: FileMutationsRequest, + member: PropertySignatureWithStaticName, + componentNode: ReactComponentNode, + start: ts.Node, + seenNodes: Set, + allAssignedTypes: AssignedTypesByName[], ) => { - // Don't repeatedly bounce back and forth between references - if (seenNodes.has(start)) { - return; - } - seenNodes.add(start); - - // Find all references to the name of the type within the component - const references = request.fileInfoCache - .getNodeReferencesAsNodes(start) - ?.filter((reference) => isNodeWithinNode(request.sourceFile, reference, componentNode)); - if (references === undefined || references.length === 0) { - return; - } - - // For each reference, try to infer the type from its usage... - for (const reference of references) { - // (except for the original member we're looking around) - if (reference === member) { - continue; - } - - // If the reference is an indirect storage, such as a variable, recurse on *its* references - if (!ts.isExpression(reference)) { - updateAssignedTypesForReferences(request, member, componentNode, reference, seenNodes, allAssignedTypes); - continue; - } - - const propUsage = getPropNodeFromReference(reference); - - // Case: used as the value in a JSX attribute - if (ts.isJsxExpression(propUsage.parent)) { - // Use the type value for the declaration of that attribute (its own prop) - const attributePropType = getAttributePropType(request, propUsage.parent.parent); - if (attributePropType !== undefined) { - allAssignedTypes.push(new Map([[member.name.text, attributePropType]])); - } - - continue; - } - - // Case: passed as an argument to a function - if (ts.isCallExpression(propUsage.parent) || ts.isNewExpression(propUsage.parent)) { - const declaredTypes = getDeclaredTypesOfArgument(request, propUsage.parent, propUsage); - - for (const declaredType of declaredTypes) { - allAssignedTypes.push(new Map([[member.name.text, declaredType]])); - } - } - } + // Don't repeatedly bounce back and forth between references + if (seenNodes.has(start)) { + return; + } + + seenNodes.add(start); + + // Find all references to the name of the type within the component + const references = request.fileInfoCache + .getNodeReferencesAsNodes(start) + ?.filter((reference) => + isNodeWithinNode(request.sourceFile, reference, componentNode), + ); + if (references === undefined || references.length === 0) { + return; + } + + // For each reference, try to infer the type from its usage... + for (const reference of references) { + // (except for the original member we're looking around) + if (reference === member) { + continue; + } + + // If the reference is an indirect storage, such as a variable, recurse on *its* references + if (!ts.isExpression(reference)) { + updateAssignedTypesForReferences( + request, + member, + componentNode, + reference, + seenNodes, + allAssignedTypes, + ); + continue; + } + + const propUsage = getPropNodeFromReference(reference); + + // Case: used as the value in a JSX attribute + if (ts.isJsxExpression(propUsage.parent)) { + // Use the type value for the declaration of that attribute (its own prop) + const attributePropType = getAttributePropType( + request, + propUsage.parent.parent, + ); + if (attributePropType !== undefined) { + allAssignedTypes.push(new Map([[member.name.text, attributePropType]])); + } + + continue; + } + + // Case: passed as an argument to a function + if ( + ts.isCallExpression(propUsage.parent) || + ts.isNewExpression(propUsage.parent) + ) { + const declaredTypes = getDeclaredTypesOfArgument( + request, + propUsage.parent, + propUsage, + ); + + for (const declaredType of declaredTypes) { + allAssignedTypes.push(new Map([[member.name.text, declaredType]])); + } + } + } }; -const getAttributePropType = (request: FileMutationsRequest, attribute: ts.Node) => { - if (!ts.isJsxAttribute(attribute) || !isNodeWithIdentifierName(attribute)) { - return undefined; - } - - // Find the corresponding declaration or (containing variable) for the node's backing React component - // In theory we could try to get the symbol or type at the location, - // but in practice it seems that always resolves to the (potentially incomplete) provided type - const { tagName } = attribute.parent.parent; - const tagDeclaration = getSymbolAtLocationIfNotError(request, tagName)?.valueDeclaration; - if (tagDeclaration === undefined) { - return undefined; - } - - // Get the React component associated with the declaration - const tagComponent = getReactComponentNode(tagDeclaration); - if (tagComponent === undefined) { - return undefined; - } - - // Find the props node declaration for that component, - // and within that, the specific prop declaration - const tagProps = getComponentPropsNode(request, tagComponent); - const propDeclaration = tagProps?.members.find( - (member) => isNodeWithIdentifierName(member) && member.name.text === attribute.name.text, - ); - - return getTypeAtLocationIfNotError(request, propDeclaration); +const getAttributePropType = ( + request: FileMutationsRequest, + attribute: ts.Node, +) => { + if (!ts.isJsxAttribute(attribute) || !isNodeWithIdentifierName(attribute)) { + return undefined; + } + + // Find the corresponding declaration or (containing variable) for the node's backing React component + // In theory we could try to get the symbol or type at the location, + // but in practice it seems that always resolves to the (potentially incomplete) provided type + const { tagName } = attribute.parent.parent; + const tagDeclaration = getSymbolAtLocationIfNotError( + request, + tagName, + )?.valueDeclaration; + if (tagDeclaration === undefined) { + return undefined; + } + + // Get the React component associated with the declaration + const tagComponent = getReactComponentNode(tagDeclaration); + if (tagComponent === undefined) { + return undefined; + } + + // Find the props node declaration for that component, + // and within that, the specific prop declaration + const tagProps = getComponentPropsNode(request, tagComponent); + const propDeclaration = tagProps?.members.find( + (member) => + isNodeWithIdentifierName(member) && + member.name.text === attribute.name.text, + ); + + return getTypeAtLocationIfNotError(request, propDeclaration); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/index.ts index e6843a1ee..65a078e3f 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsFromUses/index.ts @@ -1,30 +1,46 @@ -import { createTypeExpansionMutation } from "../../../../../mutations/expansions/expansionMutations"; -import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../../shared/fileMutator"; -import { isReactComponentNode, ReactComponentNode } from "../reactFiltering/isReactComponentNode"; - -import { getComponentPropsNode } from "../getComponentPropsNode"; -import { getPropsUsageTypes } from "./getPropsUsageTypes"; +import { createTypeExpansionMutation } from "../../../../../mutations/expansions/expansionMutations.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../../collectMutationsFromNodes.js"; +import { getComponentPropsNode } from "../getComponentPropsNode.js"; +import { + ReactComponentNode, + isReactComponentNode, +} from "../reactFiltering/isReactComponentNode.js"; +import { getPropsUsageTypes } from "./getPropsUsageTypes.js"; /** * Expands the existing props type for a component from its external JSX-style declarations. */ export const fixReactPropsFromUses: FileMutator = (request) => { - return collectMutationsFromNodes(request, isReactComponentNode, visitReactComponentNode); + return collectMutationsFromNodes( + request, + isReactComponentNode, + visitReactComponentNode, + ); }; -const visitReactComponentNode = (node: ReactComponentNode, request: FileMutationsRequest) => { - // Grab the node used to declare the node's props type, if it exists - const propsNode = getComponentPropsNode(request, node); - if (propsNode === undefined) { - return undefined; - } +const visitReactComponentNode = ( + node: ReactComponentNode, + request: FileMutationsRequest, +) => { + // Grab the node used to declare the node's props type, if it exists + const propsNode = getComponentPropsNode(request, node); + if (propsNode === undefined) { + return undefined; + } - // Find all types of props later passed to the node - const componentAssignedTypes = getPropsUsageTypes(request, node, propsNode); - if (componentAssignedTypes === undefined || componentAssignedTypes.length === 0) { - return undefined; - } + // Find all types of props later passed to the node + const componentAssignedTypes = getPropsUsageTypes(request, node, propsNode); + if (!componentAssignedTypes.length) { + return undefined; + } - return createTypeExpansionMutation(request, propsNode, componentAssignedTypes); + return createTypeExpansionMutation( + request, + propsNode, + componentAssignedTypes, + ); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsMissing.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsMissing.ts index c4ffc5ff6..656c40ec5 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsMissing.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/fixReactPropsMissing.ts @@ -1,189 +1,226 @@ import { combineMutations } from "automutate"; -import * as ts from "typescript"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; -import { isReactComponentNode, ReactComponentNode } from "./reactFiltering/isReactComponentNode"; -import { getComponentPropsNode } from "./getComponentPropsNode"; -import { getApparentNameOfComponent } from "./getApparentNameOfComponent"; -import { printNewLine } from "../../../../shared/printing/newlines"; +import ts from "typescript"; + +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { printNewLine } from "../../../../shared/printing/newlines.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; +import { getApparentNameOfComponent } from "./getApparentNameOfComponent.js"; +import { getComponentPropsNode } from "./getComponentPropsNode.js"; +import { + ReactComponentNode, + isReactComponentNode, +} from "./reactFiltering/isReactComponentNode.js"; /** * Creates a new props type for a React component from scratch. */ export const fixReactPropsMissing: FileMutator = (request) => { - return collectMutationsFromNodes(request, isReactComponentNode, visitReactComponentNode); + return collectMutationsFromNodes( + request, + isReactComponentNode, + visitReactComponentNode, + ); }; -const visitReactComponentNode = (node: ReactComponentNode, request: FileMutationsRequest) => { - // Make sure a node doesn't yet exist to declare the node's props type - const propsNode = getComponentPropsNode(request, node); - if (propsNode !== undefined) { - return undefined; - } - - // Find all types of props later passed to the node - const attributeTypesAndRequirements = collectComponentAttributeTypes(request, node); - if (!attributeTypesAndRequirements?.attributeTypes.size) { - return undefined; - } - - // Generate a name for a new props interface to use on the node - const interfaceName = `${getApparentNameOfComponent(request, node)}Props`; - - return combineMutations( - // That interface will be injected with blank lines around it just before the component - createPropsTypeCreationMutation(request, node, interfaceName, attributeTypesAndRequirements), - // We'll also annotate the component with a type declaration to use the new prop type - createPropsTypeUsageMutation(node, interfaceName), - ); +const visitReactComponentNode = ( + node: ReactComponentNode, + request: FileMutationsRequest, +) => { + // Make sure a node doesn't yet exist to declare the node's props type + const propsNode = getComponentPropsNode(request, node); + if (propsNode !== undefined) { + return undefined; + } + + // Find all types of props later passed to the node + const attributeTypesAndRequirements = collectComponentAttributeTypes( + request, + node, + ); + if (!attributeTypesAndRequirements?.attributeTypes.size) { + return undefined; + } + + // Generate a name for a new props interface to use on the node + const interfaceName = `${getApparentNameOfComponent(request, node)}Props`; + + return combineMutations( + // That interface will be injected with blank lines around it just before the component + createPropsTypeCreationMutation( + request, + node, + interfaceName, + attributeTypesAndRequirements, + ), + // We'll also annotate the component with a type declaration to use the new prop type + createPropsTypeUsageMutation(node, interfaceName), + ); }; -const collectComponentAttributeTypes = (request: FileMutationsRequest, node: ReactComponentNode) => { - // Find all references to the node, if there are more than just the node itself - const references = request.fileInfoCache.getNodeReferencesAsNodes( - node.parent.kind === ts.SyntaxKind.VariableDeclaration ? node.parent : node, - ); - if (references === undefined || references.length === 0) { - return undefined; - } - - const allAttributeNames = new Set(); - const allAttributeNameUses: Set[] = []; - const attributeTypes = new Map(); - - // For each reference, try to collect attribute type from its usage... - for (const reference of references) { - // ...assuming the reference is a JSX element used with attributes - const attributesElement = getAttributesElement(reference); - if (attributesElement === undefined) { - continue; - } - - // Keep track of attribute names that are used, so later we can figure out which are optional - const usedAttributeNames: string[] = []; - - for (const attribute of attributesElement.attributes.properties) { - // Only look at JSX attributes, like prop={value} and prop - if (!ts.isJsxAttribute(attribute)) { - continue; - } - - // Attempt to retrieve the type of the prop's value - const typeChecker = request.services.program.getTypeChecker(); - const valueType = getAttributeValueType(typeChecker, attribute); - if (valueType === undefined) { - continue; - } - - // Widen literals such as `false` to their primitives such as `boolean` - const type = typeChecker.getBaseTypeOfLiteralType(valueType); - - // Add the type underneath the attribute name - const name = ts.isJsxNamespacedName(attribute.name) ? attribute.name.getText(request.sourceFile) : attribute.name.text; - const types = attributeTypes.get(name); - if (types === undefined) { - attributeTypes.set(name, [type]); - } else { - types.push(type); - } - - // Remember the attribute name in all attributes, and in this usage (element) - allAttributeNames.add(name); - usedAttributeNames.push(name); - } - - allAttributeNameUses.push(new Set(usedAttributeNames)); - } - - // Mark only the attributes that appear in every usage as required - const requiredAttributeNames = new Set( - Array.from(allAttributeNames).filter((attributeName) => - allAttributeNameUses.every((attributeNameUses) => attributeNameUses.has(attributeName)), - ), - ); - - return { attributeTypes, requiredAttributeNames }; +const collectComponentAttributeTypes = ( + request: FileMutationsRequest, + node: ReactComponentNode, +) => { + // Find all references to the node, if there are more than just the node itself + const references = request.fileInfoCache.getNodeReferencesAsNodes( + node.parent.kind === ts.SyntaxKind.VariableDeclaration ? node.parent : node, + ); + if (references === undefined || references.length === 0) { + return undefined; + } + + const allAttributeNames = new Set(); + const allAttributeNameUses: Set[] = []; + const attributeTypes = new Map(); + + // For each reference, try to collect attribute type from its usage... + for (const reference of references) { + // ...assuming the reference is a JSX element used with attributes + const attributesElement = getAttributesElement(reference); + if (attributesElement === undefined) { + continue; + } + + // Keep track of attribute names that are used, so later we can figure out which are optional + const usedAttributeNames: string[] = []; + + for (const attribute of attributesElement.attributes.properties) { + // Only look at JSX attributes, like prop={value} and prop + if (!ts.isJsxAttribute(attribute)) { + continue; + } + + // Attempt to retrieve the type of the prop's value + const typeChecker = request.services.program.getTypeChecker(); + const valueType = getAttributeValueType(typeChecker, attribute); + if (valueType === undefined) { + continue; + } + + // Widen literals such as `false` to their primitives such as `boolean` + const type = typeChecker.getBaseTypeOfLiteralType(valueType); + + // Add the type underneath the attribute name + const name = ts.isJsxNamespacedName(attribute.name) + ? attribute.name.getText(request.sourceFile) + : attribute.name.text; + const types = attributeTypes.get(name); + if (types === undefined) { + attributeTypes.set(name, [type]); + } else { + types.push(type); + } + + // Remember the attribute name in all attributes, and in this usage (element) + allAttributeNames.add(name); + usedAttributeNames.push(name); + } + + allAttributeNameUses.push(new Set(usedAttributeNames)); + } + + // Mark only the attributes that appear in every usage as required + const requiredAttributeNames = new Set( + Array.from(allAttributeNames).filter((attributeName) => + allAttributeNameUses.every((attributeNameUses) => + attributeNameUses.has(attributeName), + ), + ), + ); + + return { attributeTypes, requiredAttributeNames }; }; const getAttributesElement = (reference: ts.Node) => { - if (!ts.isIdentifier(reference)) { - return undefined; - } + if (!ts.isIdentifier(reference)) { + return undefined; + } - const { parent } = reference; + const { parent } = reference; - if (ts.isJsxElement(parent)) { - return parent.openingElement; - } + if (ts.isJsxElement(parent)) { + return parent.openingElement; + } - if (ts.isJsxSelfClosingElement(parent)) { - return parent; - } + if (ts.isJsxSelfClosingElement(parent)) { + return parent; + } - return undefined; + return undefined; }; -const getAttributeValueType = (typeChecker: ts.TypeChecker, attribute: ts.JsxAttribute) => { - if (attribute.initializer) { - if (ts.isStringLiteral(attribute.initializer)) { - return typeChecker.getTypeAtLocation(attribute); - } - - return ts.isJsxExpression(attribute.initializer) && attribute.initializer.expression - ? typeChecker.getTypeAtLocation(attribute.initializer.expression) - : undefined; - } - - return typeChecker.getTypeAtLocation(attribute.name); +const getAttributeValueType = ( + typeChecker: ts.TypeChecker, + attribute: ts.JsxAttribute, +) => { + if (attribute.initializer) { + if (ts.isStringLiteral(attribute.initializer)) { + return typeChecker.getTypeAtLocation(attribute); + } + + return ts.isJsxExpression(attribute.initializer) && + attribute.initializer.expression + ? typeChecker.getTypeAtLocation(attribute.initializer.expression) + : undefined; + } + + return typeChecker.getTypeAtLocation(attribute.name); }; interface AttributeTypesAndRequirements { - attributeTypes: Map; - requiredAttributeNames: Set; + attributeTypes: Map; + requiredAttributeNames: Set; } const createPropsTypeCreationMutation = ( - request: FileMutationsRequest, - node: ReactComponentNode, - interfaceName: string, - { attributeTypes, requiredAttributeNames }: AttributeTypesAndRequirements, + request: FileMutationsRequest, + node: ReactComponentNode, + interfaceName: string, + { attributeTypes, requiredAttributeNames }: AttributeTypesAndRequirements, ) => { - const endline = printNewLine(request.options.compilerOptions); - - return { - insertion: [ - endline, - `interface ${interfaceName} {`, - ...Array.from(attributeTypes).map( - ([name, type]) => `${name}${requiredAttributeNames.has(name) ? "" : "?"}: ${request.services.printers.type(type)};`, - ), - `}`, - ].join(endline), - range: { - begin: ts.isClassDeclaration(node) - ? node.pos - : ts.isVariableDeclaration(node.parent) - ? node.parent.parent.pos - : node.parent.pos, - }, - type: "text-insert", - }; + const endline = printNewLine(request.options.compilerOptions); + + return { + insertion: [ + endline, + `interface ${interfaceName} {`, + ...Array.from(attributeTypes).map( + ([name, type]) => + `${name}${requiredAttributeNames.has(name) ? "" : "?"}: ${request.services.printers.type(type)};`, + ), + `}`, + ].join(endline), + range: { + begin: ts.isClassDeclaration(node) + ? node.pos + : ts.isVariableDeclaration(node.parent) + ? node.parent.parent.pos + : node.parent.pos, + }, + type: "text-insert", + }; }; -const createPropsTypeUsageMutation = (node: ReactComponentNode, interfaceName: string) => { - return ts.isFunctionLike(node) - ? { - insertion: `: ${interfaceName}`, - range: { - begin: node.parameters[0].end, - }, - type: "text-insert", - } - : { - insertion: `<${interfaceName}>`, - range: { - begin: node.heritageClauses[0].end, - }, - type: "text-insert", - }; +const createPropsTypeUsageMutation = ( + node: ReactComponentNode, + interfaceName: string, +) => { + return ts.isFunctionLike(node) + ? { + insertion: `: ${interfaceName}`, + range: { + begin: node.parameters[0].end, + }, + type: "text-insert", + } + : { + insertion: `<${interfaceName}>`, + range: { + begin: node.heritageClauses[0].end, + }, + type: "text-insert", + }; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getApparentNameOfComponent.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getApparentNameOfComponent.ts index b81c80609..1b5b0be65 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getApparentNameOfComponent.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getApparentNameOfComponent.ts @@ -1,28 +1,39 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { getFriendlyFileName } from "../../../../shared/fileNames"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; -import { ReactComponentNode } from "./reactFiltering/isReactComponentNode"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { getFriendlyFileName } from "../../../../shared/fileNames.js"; +import { ReactComponentNode } from "./reactFiltering/isReactComponentNode.js"; /** * @returns The name of a class or function component, if determinable. */ -export const getApparentNameOfComponent = (request: FileMutationsRequest, node: ReactComponentNode) => { - // If the node itself has a name, great! - if (node.name !== undefined) { - return node.name.text; - } +export const getApparentNameOfComponent = ( + request: FileMutationsRequest, + node: ReactComponentNode, +) => { + // If the node itself has a name, great! + if (node.name !== undefined) { + return node.name.text; + } - // If the node in a single named variable declaration, use that - if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) { - return node.parent.name.text; - } + // If the node in a single named variable declaration, use that + if ( + ts.isVariableDeclaration(node.parent) && + ts.isIdentifier(node.parent.name) + ) { + return node.parent.name.text; + } - // If the node is the default export of its file, use the file's name - if (tsutils.includesModifier(node.modifiers as ts.NodeArray, ts.SyntaxKind.DefaultKeyword)) { - return getFriendlyFileName(request.sourceFile.fileName); - } + // If the node is the default export of its file, use the file's name + if ( + tsutils.includesModifier( + node.modifiers as ts.NodeArray, + ts.SyntaxKind.DefaultKeyword, + ) + ) { + return getFriendlyFileName(request.sourceFile.fileName); + } - return "AnonymousComponent"; + return "AnonymousComponent"; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getComponentPropsNode.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getComponentPropsNode.ts index e4675bad7..a3e4df7a6 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getComponentPropsNode.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getComponentPropsNode.ts @@ -1,71 +1,92 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { getClassExtendsType } from "../../../../shared/nodes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { getClassExtendsType } from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; import { - ReactClassComponentNode, - ReactComponentNode, - ReactFunctionalComponentNode as ReactFunctionComponentNode, -} from "./reactFiltering/isReactComponentNode"; + ReactClassComponentNode, + ReactComponentNode, + ReactFunctionalComponentNode as ReactFunctionComponentNode, +} from "./reactFiltering/isReactComponentNode.js"; -export type ReactComponentPropsNode = ts.InterfaceDeclaration | ts.TypeLiteralNode; +export type ReactComponentPropsNode = + | ts.InterfaceDeclaration + | ts.TypeLiteralNode; /** * Finds the corresponding interface or type literal that declares a component's props type, if it exists. */ -export const getComponentPropsNode = (request: FileMutationsRequest, node: ReactComponentNode): ReactComponentPropsNode | undefined => { - return ts.isClassDeclaration(node) || ts.isClassExpression(node) - ? getClassComponentPropsNode(request, node) - : getFunctionComponentPropsNode(request, node); +export const getComponentPropsNode = ( + request: FileMutationsRequest, + node: ReactComponentNode, +): ReactComponentPropsNode | undefined => { + return ts.isClassDeclaration(node) || ts.isClassExpression(node) + ? getClassComponentPropsNode(request, node) + : getFunctionComponentPropsNode(request, node); }; -const getClassComponentPropsNode = (request: FileMutationsRequest, node: ReactClassComponentNode): ReactComponentPropsNode | undefined => { - const extendsType = getClassExtendsType(node); - if (extendsType?.typeArguments === undefined || extendsType.typeArguments.length === 0) { - return undefined; - } +const getClassComponentPropsNode = ( + request: FileMutationsRequest, + node: ReactClassComponentNode, +): ReactComponentPropsNode | undefined => { + const extendsType = getClassExtendsType(node); + if ( + extendsType?.typeArguments === undefined || + extendsType.typeArguments.length === 0 + ) { + return undefined; + } - const [rawPropsNode] = extendsType.typeArguments; - const propsNodeType = getTypeAtLocationIfNotError(request, rawPropsNode); - const propsNodeSymbol = propsNodeType?.getSymbol(); - if (propsNodeSymbol === undefined) { - return undefined; - } + const [rawPropsNode] = extendsType.typeArguments; + const propsNodeType = getTypeAtLocationIfNotError(request, rawPropsNode); + const propsNodeSymbol = propsNodeType?.getSymbol(); + if (propsNodeSymbol === undefined) { + return undefined; + } - const symbolDeclarations = propsNodeSymbol.getDeclarations(); - const declaration = symbolDeclarations === undefined || symbolDeclarations.length === 0 ? undefined : symbolDeclarations[0]; + const symbolDeclarations = propsNodeSymbol.getDeclarations(); + const declaration = + symbolDeclarations === undefined || symbolDeclarations.length === 0 + ? undefined + : symbolDeclarations[0]; - return declaration !== undefined && isReactComponentPropsNode(declaration) ? declaration : undefined; + return declaration !== undefined && isReactComponentPropsNode(declaration) + ? declaration + : undefined; }; const getFunctionComponentPropsNode = ( - request: FileMutationsRequest, - node: ReactFunctionComponentNode, + request: FileMutationsRequest, + node: ReactFunctionComponentNode, ): ReactComponentPropsNode | undefined => { - // If the node takes multiple parameters, we assume it's not an FC - // TODO: this might not hold true for refs or other fancy things... - const { parameters } = node; - if (parameters.length !== 1) { - return undefined; - } + // If the node takes multiple parameters, we assume it's not an FC + // TODO: this might not hold true for refs or other fancy things... + const { parameters } = node; + if (parameters.length !== 1) { + return undefined; + } - // Try to get the first backing type declaration for the single parameter - const [parameter] = parameters; - const symbol = getTypeAtLocationIfNotError(request, parameter)?.getSymbol(); - if (!symbol?.declarations?.length) { - return undefined; - } + // Try to get the first backing type declaration for the single parameter + const [parameter] = parameters; + const symbol = getTypeAtLocationIfNotError(request, parameter)?.getSymbol(); + if (!symbol?.declarations?.length) { + return undefined; + } - const [declaration] = symbol.declarations; - // If the declaration is in another file... well, let's assume it's unrelated. - // TODO: We'll eventually need to handle shared props types. - if (isReactComponentPropsNode(declaration) && declaration.getSourceFile() === request.sourceFile) { - return declaration; - } + const [declaration] = symbol.declarations; + // If the declaration is in another file... well, let's assume it's unrelated. + // TODO: We'll eventually need to handle shared props types. + if ( + isReactComponentPropsNode(declaration) && + declaration.getSourceFile() === request.sourceFile + ) { + return declaration; + } - return undefined; + return undefined; }; -const isReactComponentPropsNode = (node: ts.Node): node is ReactComponentPropsNode => - ts.isInterfaceDeclaration(node) || ts.isTypeLiteralNode(node); +const isReactComponentPropsNode = ( + node: ts.Node, +): node is ReactComponentPropsNode => + ts.isInterfaceDeclaration(node) || ts.isTypeLiteralNode(node); diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getPropNodeFromReference.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getPropNodeFromReference.ts index 7c62b562f..25ddfefa7 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getPropNodeFromReference.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/getPropNodeFromReference.ts @@ -1,6 +1,10 @@ -import * as ts from "typescript"; +import ts from "typescript"; -export const getPropNodeFromReference = (reference: ts.Expression): ts.Expression => { - // Case: class-style (e.g. 'this.props.key') or object style 'props.key' - return ts.isPropertyAccessExpression(reference.parent) ? reference.parent : reference; +export const getPropNodeFromReference = ( + reference: ts.Expression, +): ts.Expression => { + // Case: class-style (e.g. 'this.props.key') or object style 'props.key' + return ts.isPropertyAccessExpression(reference.parent) + ? reference.parent + : reference; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/index.ts index 1f04ef8bf..8196468c3 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/index.ts @@ -1,25 +1,24 @@ -import { findFirstMutations } from "../../../../shared/runtime"; -import { FileMutationsRequest } from "../../../../shared/fileMutator"; - -import { fixReactPropsFromLaterAssignments } from "./fixReactPropsFromLaterAssignments"; -import { fixReactPropsFromUses } from "./fixReactPropsFromUses"; -import { fixReactPropsFromPropTypes } from "./fixReactPropsFromPropTypes"; -import { fixReactPropFunctionsFromCalls } from "./fixReactPropFunctionsFromCalls"; -import { fixReactPropsMissing } from "./fixReactPropsMissing"; +import { FileMutationsRequest } from "../../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../../shared/runtime.js"; +import { fixReactPropFunctionsFromCalls } from "./fixReactPropFunctionsFromCalls/index.js"; +import { fixReactPropsFromLaterAssignments } from "./fixReactPropsFromLaterAssignments/index.js"; +import { fixReactPropsFromPropTypes } from "./fixReactPropsFromPropTypes/index.js"; +import { fixReactPropsFromUses } from "./fixReactPropsFromUses/index.js"; +import { fixReactPropsMissing } from "./fixReactPropsMissing.js"; export const fixIncompleteReactTypes = (request: FileMutationsRequest) => - findFirstMutations(request, [ - // Intentionally look at internal uses before later assignments, - // as they're less likely to contain misleading type information - ["fixReactPropsFromUses", fixReactPropsFromUses], - ["fixReactPropsFromLaterAssignments", fixReactPropsFromLaterAssignments], + findFirstMutations(request, [ + // Intentionally look at internal uses before later assignments, + // as they're less likely to contain misleading type information + ["fixReactPropsFromUses", fixReactPropsFromUses], + ["fixReactPropsFromLaterAssignments", fixReactPropsFromLaterAssignments], - ["fixReactPropFunctionsFromCalls", fixReactPropFunctionsFromCalls], + ["fixReactPropFunctionsFromCalls", fixReactPropFunctionsFromCalls], - // Use propTypes with lower priority than uses, assignments, and calls - // In practical code they are often wrong - ["fixReactPropsFromPropTypes", fixReactPropsFromPropTypes], + // Use propTypes with lower priority than uses, assignments, and calls + // In practical code they are often wrong + ["fixReactPropsFromPropTypes", fixReactPropsFromPropTypes], - // Lastly, if the component is missing a props type altogether, create one from scratch - ["fixReactPropsMissing", fixReactPropsMissing], - ]); + // Lastly, if the component is missing a props type altogether, create one from scratch + ["fixReactPropsMissing", fixReactPropsMissing], + ]); diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/getReactComponentNode.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/getReactComponentNode.ts index dd9676f10..b6465147d 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/getReactComponentNode.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/getReactComponentNode.ts @@ -1,15 +1,19 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { isReactComponentNode } from "./isReactComponentNode"; +import { isReactComponentNode } from "./isReactComponentNode.js"; export const getReactComponentNode = (node: ts.Node) => { - if (isReactComponentNode(node)) { - return node; - } + if (isReactComponentNode(node)) { + return node; + } - if (ts.isVariableDeclaration(node) && node.initializer !== undefined && isReactComponentNode(node.initializer)) { - return node.initializer; - } + if ( + ts.isVariableDeclaration(node) && + node.initializer !== undefined && + isReactComponentNode(node.initializer) + ) { + return node.initializer; + } - return undefined; + return undefined; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/isReactComponentNode.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/isReactComponentNode.ts index 33628ca57..acfc25d35 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/isReactComponentNode.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReactTypes/reactFiltering/isReactComponentNode.ts @@ -1,36 +1,55 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { getClassExtendsType } from "../../../../../shared/nodes"; +import { getClassExtendsType } from "../../../../../shared/nodes.js"; -export type ReactComponentNode = ReactClassComponentNode | ReactFunctionalComponentNode; +export type ReactComponentNode = + | ReactClassComponentNode + | ReactFunctionalComponentNode; -export type ReactClassComponentNode = (ts.ClassDeclaration | ts.ClassExpression) & { - heritageClauses: ts.NodeArray; +export type ReactClassComponentNode = ( + | ts.ClassDeclaration + | ts.ClassExpression +) & { + heritageClauses: ts.NodeArray; }; -export type ReactFunctionalComponentNode = ts.ArrowFunction | ts.FunctionDeclaration | ts.FunctionExpression; +export type ReactFunctionalComponentNode = + | ts.ArrowFunction + | ts.FunctionDeclaration + | ts.FunctionExpression; /** * @returns Whether the node is able to be a React component node. */ -export const isReactComponentNode = (node: ts.Node): node is ReactComponentNode => { - // Functions can generally be React components if they have 0 or 1 parameters - if (ts.isArrowFunction(node) || ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node)) { - return node.parameters.length <= 1; - } - - // Otherwise, we only look at class declarations and class expressions - if (!ts.isClassLike(node)) { - return false; - } - - const extendsType = getClassExtendsType(node); - - return extendsType !== undefined && extensionExpressionIsReactComponent(extendsType); +export const isReactComponentNode = ( + node: ts.Node, +): node is ReactComponentNode => { + // Functions can generally be React components if they have 0 or 1 parameters + if ( + ts.isArrowFunction(node) || + ts.isFunctionDeclaration(node) || + ts.isFunctionExpression(node) + ) { + return node.parameters.length <= 1; + } + + // Otherwise, we only look at class declarations and class expressions + if (!ts.isClassLike(node)) { + return false; + } + + const extendsType = getClassExtendsType(node); + + return ( + extendsType !== undefined && + extensionExpressionIsReactComponent(extendsType) + ); }; -const extensionExpressionIsReactComponent = (node: ts.ExpressionWithTypeArguments): boolean => { - // Todo: actually check the type for this - // See https://github.com/JoshuaKGoldberg/TypeStat/issues/135 - return node.getText().includes("Component"); +const extensionExpressionIsReactComponent = ( + node: ts.ExpressionWithTypeArguments, +): boolean => { + // Todo: actually check the type for this + // See https://github.com/JoshuaKGoldberg/TypeStat/issues/135 + return node.getText().includes("Component"); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReturnTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReturnTypes/index.ts index ecce49d95..ba468437b 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReturnTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteReturnTypes/index.ts @@ -1,35 +1,55 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { createTypeAdditionMutation } from "../../../../mutations/creators"; -import { isNotUndefined } from "../../../../shared/arrays"; -import { FunctionLikeDeclarationWithType, isNodeWithType } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; -import { collectReturningNodeExpressions } from "../../fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions"; +import { createTypeAdditionMutation } from "../../../../mutations/creators.js"; +import { isNotUndefined } from "../../../../shared/arrays.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { + FunctionLikeDeclarationWithType, + isNodeWithType, +} from "../../../../shared/nodeTypes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; +import { collectReturningNodeExpressions } from "../../fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions.js"; -export const fixIncompleteReturnTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isNodeVisitableFunctionLikeDeclaration, visitFunctionWithBody); +export const fixIncompleteReturnTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isNodeVisitableFunctionLikeDeclaration, + visitFunctionWithBody, + ); -const isNodeVisitableFunctionLikeDeclaration = (node: ts.Node): node is FunctionLikeDeclarationWithType => - ts.isFunctionLike(node) && - // If the node has an implicit return type, we don't need to change anything - isNodeWithType(node); +const isNodeVisitableFunctionLikeDeclaration = ( + node: ts.Node, +): node is FunctionLikeDeclarationWithType => + ts.isFunctionLike(node) && + // If the node has an implicit return type, we don't need to change anything + isNodeWithType(node); -const visitFunctionWithBody = (node: FunctionLikeDeclarationWithType, request: FileMutationsRequest) => { - // Collect the type initially declared as returned - const declaredType = getTypeAtLocationIfNotError(request, node.type); - if (declaredType === undefined || tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { - return undefined; - } +const visitFunctionWithBody = ( + node: FunctionLikeDeclarationWithType, + request: FileMutationsRequest, +) => { + // Collect the type initially declared as returned + const declaredType = getTypeAtLocationIfNotError(request, node.type); + if ( + declaredType === undefined || + tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any) + ) { + return undefined; + } - // Collect types of nodes returned by the function - const returnedTypes = collectReturningNodeExpressions(node) - .map((node) => getTypeAtLocationIfNotError(request, node)) - .filter(isNotUndefined); + // Collect types of nodes returned by the function + const returnedTypes = collectReturningNodeExpressions(node) + .map((node) => getTypeAtLocationIfNotError(request, node)) + .filter(isNotUndefined); - // Add later-returned types to the node's type declaration if necessary - return createTypeAdditionMutation(request, node, declaredType, returnedTypes); + // Add later-returned types to the node's type declaration if necessary + return createTypeAdditionMutation(request, node, declaredType, returnedTypes); }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteVariableTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteVariableTypes/index.ts index d881c3c3a..ed76f224b 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteVariableTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/fixIncompleteVariableTypes/index.ts @@ -1,94 +1,132 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; - -import { createTypeAdditionMutation, createTypeCreationMutation } from "../../../../mutations/creators"; -import { isNodeWithType, NodeWithType } from "../../../../shared/nodeTypes"; -import { isNodeFilteredOut } from "../../../../shared/references"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; - -export const fixIncompleteVariableTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isNodeVariableDeclarationWithType, visitVariableDeclaration); - -const isNodeVariableDeclarationWithType = (node: ts.Node): node is ts.VariableDeclaration & NodeWithType => - ts.isVariableDeclaration(node) && isNodeWithType(node); - -const visitVariableDeclaration = (node: ts.VariableDeclaration, request: FileMutationsRequest): Mutation | undefined => { - // Collect types later assigned to the variable, and types initially declared by or inferred on the variable - const assignedTypes = collectVariableAssignedTypes(node, request); - if (assignedTypes.some((type) => tsutils.isTypeFlagSet(type, ts.TypeFlags.Any))) { - return undefined; - } - - const declaredType = getTypeAtLocationIfNotError(request, node); - if (declaredType === undefined || tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { - return undefined; - } - - // If the variable already has a declared type, add assigned types to it if necessary - if (isNodeWithType(node)) { - return createTypeAdditionMutation(request, node, declaredType, assignedTypes); - } - - // Since the node's missing type isn't inferrable, try our best to give it one - return createTypeCreationMutation(request, node, declaredType, assignedTypes); +import ts from "typescript"; + +import { + createTypeAdditionMutation, + createTypeCreationMutation, +} from "../../../../mutations/creators.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { NodeWithType, isNodeWithType } from "../../../../shared/nodeTypes.js"; +import { isNodeFilteredOut } from "../../../../shared/references.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; + +export const fixIncompleteVariableTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isNodeVariableDeclarationWithType, + visitVariableDeclaration, + ); + +const isNodeVariableDeclarationWithType = ( + node: ts.Node, +): node is ts.VariableDeclaration & NodeWithType => + ts.isVariableDeclaration(node) && isNodeWithType(node); + +const visitVariableDeclaration = ( + node: ts.VariableDeclaration, + request: FileMutationsRequest, +): Mutation | undefined => { + // Collect types later assigned to the variable, and types initially declared by or inferred on the variable + const assignedTypes = collectVariableAssignedTypes(node, request); + if ( + assignedTypes.some((type) => tsutils.isTypeFlagSet(type, ts.TypeFlags.Any)) + ) { + return undefined; + } + + const declaredType = getTypeAtLocationIfNotError(request, node); + if ( + declaredType === undefined || + tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any) + ) { + return undefined; + } + + // If the variable already has a declared type, add assigned types to it if necessary + if (isNodeWithType(node)) { + return createTypeAdditionMutation( + request, + node, + declaredType, + assignedTypes, + ); + } + + // Since the node's missing type isn't inferrable, try our best to give it one + return createTypeCreationMutation(request, node, declaredType, assignedTypes); }; /** * Finds types later assigned to a variable declaration. - * * @param node Node to collect types from. * @param request Metadata and settings to collect mutations in a file. * @returns Types assigned to the node in the file. */ -const collectVariableAssignedTypes = (node: ts.VariableDeclaration, request: FileMutationsRequest): ReadonlyArray => { - const assignedTypes: ts.Type[] = []; - - // If the variable has an initial value, consider that an assignment - if (node.initializer !== undefined) { - const initializerType = getTypeAtLocationIfNotError(request, node.initializer); - if (initializerType !== undefined) { - assignedTypes.push(initializerType); - } - } - - // If the variable is anonymous or marked as readonly, don't bother checking for more types - if (!ts.isIdentifier(node.name) || tsutils.isModifierFlagSet(node, ts.ModifierFlags.Readonly)) { - return assignedTypes; - } - - // Collect all places in the file where the variable is later referenced - const variableInfo = request.fileInfoCache.getVariableUsage().get(node.name); - if (variableInfo === undefined) { - return assignedTypes; - } - - for (const use of variableInfo.uses) { - const useIdentifier = use.location; - const useExpression = useIdentifier.parent; - - // Ignore the node usage if it's inside an ignored node - if (isNodeFilteredOut(request.filteredNodes, use.location)) { - continue; - } - - // We only care about binary expressions that assign a type to the variable - if ( - !ts.isBinaryExpression(useExpression) || - useExpression.operatorToken.getText(request.sourceFile) !== "=" || - useExpression.left !== useIdentifier - ) { - continue; - } - - // Grab the new type being assigned to the node - const assignmentType = getTypeAtLocationIfNotError(request, useExpression.right); - if (assignmentType !== undefined) { - assignedTypes.push(assignmentType); - } - } - - return assignedTypes; +const collectVariableAssignedTypes = ( + node: ts.VariableDeclaration, + request: FileMutationsRequest, +): readonly ts.Type[] => { + const assignedTypes: ts.Type[] = []; + + // If the variable has an initial value, consider that an assignment + if (node.initializer !== undefined) { + const initializerType = getTypeAtLocationIfNotError( + request, + node.initializer, + ); + if (initializerType !== undefined) { + assignedTypes.push(initializerType); + } + } + + // If the variable is anonymous or marked as readonly, don't bother checking for more types + if ( + !ts.isIdentifier(node.name) || + tsutils.isModifierFlagSet(node, ts.ModifierFlags.Readonly) + ) { + return assignedTypes; + } + + // Collect all places in the file where the variable is later referenced + const variableInfo = request.fileInfoCache.getVariableUsage().get(node.name); + if (variableInfo === undefined) { + return assignedTypes; + } + + for (const use of variableInfo.uses) { + const useIdentifier = use.location; + const useExpression = useIdentifier.parent; + + // Ignore the node usage if it's inside an ignored node + if (isNodeFilteredOut(request.filteredNodes, use.location)) { + continue; + } + + // We only care about binary expressions that assign a type to the variable + if ( + !ts.isBinaryExpression(useExpression) || + useExpression.operatorToken.getText(request.sourceFile) !== "=" || + useExpression.left !== useIdentifier + ) { + continue; + } + + // Grab the new type being assigned to the node + const assignmentType = getTypeAtLocationIfNotError( + request, + useExpression.right, + ); + if (assignmentType !== undefined) { + assignedTypes.push(assignmentType); + } + } + + return assignedTypes; }; diff --git a/src/mutators/builtIn/fixIncompleteTypes/index.ts b/src/mutators/builtIn/fixIncompleteTypes/index.ts index ec25a2874..fc982e2a3 100644 --- a/src/mutators/builtIn/fixIncompleteTypes/index.ts +++ b/src/mutators/builtIn/fixIncompleteTypes/index.ts @@ -1,23 +1,28 @@ -import { findFirstMutations } from "../../../shared/runtime"; -import { FileMutationsRequest } from "../../../shared/fileMutator"; - -import { fixIncompleteImplicitGenerics } from "./fixIncompleteImplicitGenerics"; -import { fixIncompleteInterfaceOrTypeLiteralGenerics } from "./fixIncompleteInterfaceOrTypeLiteralGenerics"; -import { fixIncompleteParameterTypes } from "./fixIncompleteParameterTypes"; -import { fixIncompletePropertyDeclarationTypes } from "./fixIncompletePropertyDeclarationTypes"; -import { fixIncompleteReactTypes } from "./fixIncompleteReactTypes"; -import { fixIncompleteReturnTypes } from "./fixIncompleteReturnTypes"; -import { fixIncompleteVariableTypes } from "./fixIncompleteVariableTypes"; +import { FileMutationsRequest } from "../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../shared/runtime.js"; +import { fixIncompleteImplicitGenerics } from "./fixIncompleteImplicitGenerics/index.js"; +import { fixIncompleteInterfaceOrTypeLiteralGenerics } from "./fixIncompleteInterfaceOrTypeLiteralGenerics/index.js"; +import { fixIncompleteParameterTypes } from "./fixIncompleteParameterTypes/index.js"; +import { fixIncompletePropertyDeclarationTypes } from "./fixIncompletePropertyDeclarationTypes/index.js"; +import { fixIncompleteReactTypes } from "./fixIncompleteReactTypes/index.js"; +import { fixIncompleteReturnTypes } from "./fixIncompleteReturnTypes/index.js"; +import { fixIncompleteVariableTypes } from "./fixIncompleteVariableTypes/index.js"; export const fixIncompleteTypes = (request: FileMutationsRequest) => - request.options.fixes.incompleteTypes - ? findFirstMutations(request, [ - ["fixIncompleteImplicitGenerics", fixIncompleteImplicitGenerics], - ["fixIncompleteInterfaceOrTypeLiteralGenerics", fixIncompleteInterfaceOrTypeLiteralGenerics], - ["fixIncompleteParameterTypes", fixIncompleteParameterTypes], - ["fixIncompletePropertyDeclarationTypes", fixIncompletePropertyDeclarationTypes], - ["fixIncompleteReactTypes", fixIncompleteReactTypes], - ["fixIncompleteReturnTypes", fixIncompleteReturnTypes], - ["fixIncompleteVariableTypes", fixIncompleteVariableTypes], - ]) - : undefined; + request.options.fixes.incompleteTypes + ? findFirstMutations(request, [ + ["fixIncompleteImplicitGenerics", fixIncompleteImplicitGenerics], + [ + "fixIncompleteInterfaceOrTypeLiteralGenerics", + fixIncompleteInterfaceOrTypeLiteralGenerics, + ], + ["fixIncompleteParameterTypes", fixIncompleteParameterTypes], + [ + "fixIncompletePropertyDeclarationTypes", + fixIncompletePropertyDeclarationTypes, + ], + ["fixIncompleteReactTypes", fixIncompleteReactTypes], + ["fixIncompleteReturnTypes", fixIncompleteReturnTypes], + ["fixIncompleteVariableTypes", fixIncompleteVariableTypes], + ]) + : undefined; diff --git a/src/mutators/builtIn/fixMissingProperties/README.md b/src/mutators/builtIn/fixMissingProperties/README.md index 982dca9c4..ca8b90471 100644 --- a/src/mutators/builtIn/fixMissingProperties/README.md +++ b/src/mutators/builtIn/fixMissingProperties/README.md @@ -6,15 +6,15 @@ This entirely relies on TypeScript's suggested fixes to infer types from usage. ## Use Cases -* You're converting from JavaScript to TypeScript and have classes that contain properties +- You're converting from JavaScript to TypeScript and have classes that contain properties ## Configuration ```json { - "fixes": { - "missingProperties": true - } + "fixes": { + "missingProperties": true + } } ``` diff --git a/src/mutators/builtIn/fixMissingProperties/fixMissingPropertyAccesses/index.ts b/src/mutators/builtIn/fixMissingProperties/fixMissingPropertyAccesses/index.ts index c784b8953..2ca9fcc76 100644 --- a/src/mutators/builtIn/fixMissingProperties/fixMissingPropertyAccesses/index.ts +++ b/src/mutators/builtIn/fixMissingProperties/fixMissingPropertyAccesses/index.ts @@ -1,40 +1,54 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { getMissingPropertyMutations } from "../../../../mutations/codeFixes/addMissingProperty"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { getMissingPropertyMutations } from "../../../../mutations/codeFixes/addMissingProperty.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixMissingPropertyAccesses: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - // If an undeclared property is referenced multiple times, TypeScript will suggest adding it in each time - // We therefore only suggest each property name once per wave - // In theory, we could also respect each node name per class, but that's hard, and it's rare to have many classes per file - const suggestedMissingProperties = new Set(); +export const fixMissingPropertyAccesses: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + // If an undeclared property is referenced multiple times, TypeScript will suggest adding it in each time + // We therefore only suggest each property name once per wave + // In theory, we could also respect each node name per class, but that's hard, and it's rare to have many classes per file + const suggestedMissingProperties = new Set(); - const visitPropertyAccessExpression = (node: ts.PropertyAccessExpression): Mutation | undefined => { - // If the access should create a missing property, go for that - const missingPropertyFix = getMissingPropertyMutations(request, node); - if (missingPropertyFix === undefined) { - return undefined; - } + const visitPropertyAccessExpression = ( + node: ts.PropertyAccessExpression, + ): Mutation | undefined => { + // If the access should create a missing property, go for that + const missingPropertyFix = getMissingPropertyMutations(request, node); + if (missingPropertyFix === undefined) { + return undefined; + } - // Don't suggest this missing property if a node of this name was already added - if (suggestedMissingProperties.has(node.name.text)) { - return undefined; - } + // Don't suggest this missing property if a node of this name was already added + if (suggestedMissingProperties.has(node.name.text)) { + return undefined; + } - // Additionally, for some reason, the language service seems suggest the same fixes repeatedly sometimes... - // To get around this, we ignore any fixes for nodes that already exist on the parent class - // https://github.com/JoshuaKGoldberg/TypeStat/issues/756 - const assigneeClassType = getTypeAtLocationIfNotError(request, node.expression); - if (assigneeClassType?.getProperty(node.name.text) !== undefined) { - return undefined; - } + // Additionally, for some reason, the language service seems suggest the same fixes repeatedly sometimes... + // To get around this, we ignore any fixes for nodes that already exist on the parent class + // https://github.com/JoshuaKGoldberg/TypeStat/issues/756 + const assigneeClassType = getTypeAtLocationIfNotError( + request, + node.expression, + ); + if (assigneeClassType?.getProperty(node.name.text) !== undefined) { + return undefined; + } - suggestedMissingProperties.add(node.name.text); - return missingPropertyFix; - }; + suggestedMissingProperties.add(node.name.text); + return missingPropertyFix; + }; - return collectMutationsFromNodes(request, ts.isPropertyAccessExpression, visitPropertyAccessExpression); + return collectMutationsFromNodes( + request, + ts.isPropertyAccessExpression, + visitPropertyAccessExpression, + ); }; diff --git a/src/mutators/builtIn/fixMissingProperties/index.ts b/src/mutators/builtIn/fixMissingProperties/index.ts index 4da680f1c..6a86303a9 100644 --- a/src/mutators/builtIn/fixMissingProperties/index.ts +++ b/src/mutators/builtIn/fixMissingProperties/index.ts @@ -1,9 +1,10 @@ -import { findFirstMutations } from "../../../shared/runtime"; -import { FileMutationsRequest } from "../../../shared/fileMutator"; - -import { fixMissingPropertyAccesses } from "./fixMissingPropertyAccesses"; +import { FileMutationsRequest } from "../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../shared/runtime.js"; +import { fixMissingPropertyAccesses } from "./fixMissingPropertyAccesses/index.js"; export const fixMissingProperties = (request: FileMutationsRequest) => - request.options.fixes.missingProperties - ? findFirstMutations(request, [["fixMissingPropertyAccesses", fixMissingPropertyAccesses]]) - : undefined; + request.options.fixes.missingProperties + ? findFirstMutations(request, [ + ["fixMissingPropertyAccesses", fixMissingPropertyAccesses], + ]) + : undefined; diff --git a/src/mutators/builtIn/fixNoImplicitAny/README.md b/src/mutators/builtIn/fixNoImplicitAny/README.md index 5137855e4..1847c3db2 100644 --- a/src/mutators/builtIn/fixNoImplicitAny/README.md +++ b/src/mutators/builtIn/fixNoImplicitAny/README.md @@ -6,8 +6,8 @@ This entirely relies on TypeScript's suggested fixes to infer types from usage. ## Use Cases -* You're converting from JavaScript to TypeScript and want type coverage where possible -* You'd like to enable [`--noImplicitAny`](https://basarat.gitbooks.io/typescript/docs/options/noImplicitAny.html) but have a lot of existing violations +- You're converting from JavaScript to TypeScript and want type coverage where possible +- You'd like to enable [`--noImplicitAny`](https://basarat.gitbooks.io/typescript/docs/options/noImplicitAny.html) but have a lot of existing violations Places that don't need added types (i.e. would violate [`no-inferrable-types`](https://typescript-eslint.io/rules/no-inferrable-types)) won't have them added. @@ -16,9 +16,9 @@ won't have them added. ```json { - "fixes": { - "noImplicitAny": true - } + "fixes": { + "noImplicitAny": true + } } ``` @@ -47,7 +47,7 @@ If a class property is declared without a type, this will add one. #### Examples: `noImplicitAny` Property Declarations -When a class property is declared without a type but is later assigned `number`, TypeScript can infer the type from its usage: +When a class property is declared without a type but is later assigned `number`, TypeScript can infer the type from its usage: ```diff class Person { diff --git a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyParameters/index.ts b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyParameters/index.ts index 691b7a608..c4d125850 100644 --- a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyParameters/index.ts +++ b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyParameters/index.ts @@ -1,16 +1,27 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; import { - canNodeBeFixedForNoImplicitAny, - getNoImplicitAnyMutations, - NoImplictAnyNodeToBeFixed, -} from "../../../../mutations/codeFixes/noImplicitAny"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; + NoImplicitAnyNodeToBeFixed, + canNodeBeFixedForNoImplicitAny, + getNoImplicitAnyMutations, +} from "../../../../mutations/codeFixes/noImplicitAny.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixNoImplicitAnyParameters: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isNodeNoImplicitAnyFixableParameter, getNoImplicitAnyMutations); +export const fixNoImplicitAnyParameters: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isNodeNoImplicitAnyFixableParameter, + getNoImplicitAnyMutations, + ); -const isNodeNoImplicitAnyFixableParameter = (node: ts.Node): node is ts.ParameterDeclaration & NoImplictAnyNodeToBeFixed => - ts.isParameter(node) && canNodeBeFixedForNoImplicitAny(node); +const isNodeNoImplicitAnyFixableParameter = ( + node: ts.Node, +): node is ts.ParameterDeclaration & NoImplicitAnyNodeToBeFixed => + ts.isParameter(node) && canNodeBeFixedForNoImplicitAny(node); diff --git a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyPropertyDeclarations/index.ts b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyPropertyDeclarations/index.ts index 14969bd76..08db82963 100644 --- a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyPropertyDeclarations/index.ts +++ b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyPropertyDeclarations/index.ts @@ -1,16 +1,27 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; import { - canNodeBeFixedForNoImplicitAny, - getNoImplicitAnyMutations, - NoImplictAnyNodeToBeFixed, -} from "../../../../mutations/codeFixes/noImplicitAny"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; + NoImplicitAnyNodeToBeFixed, + canNodeBeFixedForNoImplicitAny, + getNoImplicitAnyMutations, +} from "../../../../mutations/codeFixes/noImplicitAny.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixNoImplicitAnyPropertyDeclarations: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isNodeNoImplicitAnyFixablePropertyDeclaration, getNoImplicitAnyMutations); +export const fixNoImplicitAnyPropertyDeclarations: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isNodeNoImplicitAnyFixablePropertyDeclaration, + getNoImplicitAnyMutations, + ); -const isNodeNoImplicitAnyFixablePropertyDeclaration = (node: ts.Node): node is ts.PropertyDeclaration & NoImplictAnyNodeToBeFixed => - ts.isPropertyDeclaration(node) && canNodeBeFixedForNoImplicitAny(node); +const isNodeNoImplicitAnyFixablePropertyDeclaration = ( + node: ts.Node, +): node is ts.PropertyDeclaration & NoImplicitAnyNodeToBeFixed => + ts.isPropertyDeclaration(node) && canNodeBeFixedForNoImplicitAny(node); diff --git a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyVariableDeclarations/index.ts b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyVariableDeclarations/index.ts index 700a08f43..e00f0a5a4 100644 --- a/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyVariableDeclarations/index.ts +++ b/src/mutators/builtIn/fixNoImplicitAny/fixNoImplicitAnyVariableDeclarations/index.ts @@ -1,33 +1,52 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { canNodeBeFixedForNoImplicitAny, getNoImplicitAnyMutations } from "../../../../mutations/codeFixes/noImplicitAny"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { + canNodeBeFixedForNoImplicitAny, + getNoImplicitAnyMutations, +} from "../../../../mutations/codeFixes/noImplicitAny.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixNoImplicitAnyVariableDeclarations: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - // This mutator fixes only for --noImplicitAny - if (!request.options.fixes.noImplicitAny) { - return []; - } +export const fixNoImplicitAnyVariableDeclarations: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + // This mutator fixes only for --noImplicitAny + if (!request.options.fixes.noImplicitAny) { + return []; + } - return collectMutationsFromNodes(request, isNodeVisitableVariableDeclaration, visitVariableDeclaration); + return collectMutationsFromNodes( + request, + isNodeVisitableVariableDeclaration, + visitVariableDeclaration, + ); }; -const isNodeVisitableVariableDeclaration = (node: ts.Node): node is ts.VariableDeclaration => - ts.isVariableDeclaration(node) && - !node.type && - // Binding patterns are all implicitly typed, so ignore them - !(ts.isArrayBindingPattern(node.name) || ts.isObjectBindingPattern(node.name)) && - // For-in and for-of loop varibles cannot have types, so don't bother trying to add them - !ts.isForInStatement(node.parent.parent) && - !ts.isForOfStatement(node.parent.parent); +const isNodeVisitableVariableDeclaration = ( + node: ts.Node, +): node is ts.VariableDeclaration => + ts.isVariableDeclaration(node) && + !node.type && + // Binding patterns are all implicitly typed, so ignore them + !( + ts.isArrayBindingPattern(node.name) || ts.isObjectBindingPattern(node.name) + ) && + // For-in and for-of loop variables cannot have types, so don't bother trying to add them + !ts.isForInStatement(node.parent.parent) && + !ts.isForOfStatement(node.parent.parent); -const visitVariableDeclaration = (node: ts.VariableDeclaration, request: FileMutationsRequest): Mutation | undefined => { - // If the variable violates --noImplicitAny (has no type or initializer), this can only be a --noImplicitAny fix - if (canNodeBeFixedForNoImplicitAny(node)) { - return getNoImplicitAnyMutations(node, request); - } +const visitVariableDeclaration = ( + node: ts.VariableDeclaration, + request: FileMutationsRequest, +): Mutation | undefined => { + // If the variable violates --noImplicitAny (has no type or initializer), this can only be a --noImplicitAny fix + if (canNodeBeFixedForNoImplicitAny(node)) { + return getNoImplicitAnyMutations(node, request); + } - return undefined; + return undefined; }; diff --git a/src/mutators/builtIn/fixNoImplicitAny/index.ts b/src/mutators/builtIn/fixNoImplicitAny/index.ts index 42a58b309..f8d633a85 100644 --- a/src/mutators/builtIn/fixNoImplicitAny/index.ts +++ b/src/mutators/builtIn/fixNoImplicitAny/index.ts @@ -1,15 +1,20 @@ -import { findFirstMutations } from "../../../shared/runtime"; -import { FileMutationsRequest } from "../../../shared/fileMutator"; - -import { fixNoImplicitAnyParameters } from "./fixNoImplicitAnyParameters"; -import { fixNoImplicitAnyPropertyDeclarations } from "./fixNoImplicitAnyPropertyDeclarations"; -import { fixNoImplicitAnyVariableDeclarations } from "./fixNoImplicitAnyVariableDeclarations"; +import { FileMutationsRequest } from "../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../shared/runtime.js"; +import { fixNoImplicitAnyParameters } from "./fixNoImplicitAnyParameters/index.js"; +import { fixNoImplicitAnyPropertyDeclarations } from "./fixNoImplicitAnyPropertyDeclarations/index.js"; +import { fixNoImplicitAnyVariableDeclarations } from "./fixNoImplicitAnyVariableDeclarations/index.js"; export const fixNoImplicitAny = (request: FileMutationsRequest) => - request.options.fixes.noImplicitAny - ? findFirstMutations(request, [ - ["fixNoImplicitAnyPropertyDeclarations", fixNoImplicitAnyPropertyDeclarations], - ["fixNoImplicitAnyParameters", fixNoImplicitAnyParameters], - ["fixNoImplicitAnyVariableDeclarations", fixNoImplicitAnyVariableDeclarations], - ]) - : undefined; + request.options.fixes.noImplicitAny + ? findFirstMutations(request, [ + [ + "fixNoImplicitAnyPropertyDeclarations", + fixNoImplicitAnyPropertyDeclarations, + ], + ["fixNoImplicitAnyParameters", fixNoImplicitAnyParameters], + [ + "fixNoImplicitAnyVariableDeclarations", + fixNoImplicitAnyVariableDeclarations, + ], + ]) + : undefined; diff --git a/src/mutators/builtIn/fixNoImplicitThis/README.md b/src/mutators/builtIn/fixNoImplicitThis/README.md index 629fdc0b8..c3d91bacd 100644 --- a/src/mutators/builtIn/fixNoImplicitThis/README.md +++ b/src/mutators/builtIn/fixNoImplicitThis/README.md @@ -6,8 +6,8 @@ This entirely relies on TypeScript's suggested fixes to infer types from usage. ## Use Cases -* You're converting from JavaScript to TypeScript and want type coverage where possible -* You'd like to enable [`--noImplicitThis`](https://basarat.gitbooks.io/typescript/docs/options/noImplicitThis.html) but have a lot of existing violations +- You're converting from JavaScript to TypeScript and want type coverage where possible +- You'd like to enable [`--noImplicitThis`](https://basarat.gitbooks.io/typescript/docs/options/noImplicitThis.html) but have a lot of existing violations Functions that already have a known scope or don't refer to `this` won't have them added. @@ -15,9 +15,9 @@ Functions that already have a known scope or don't refer to `this` won't have th ```json { - "fixes": { - "noImplicitThis": true - } + "fixes": { + "noImplicitThis": true + } } ``` diff --git a/src/mutators/builtIn/fixNoImplicitThis/index.ts b/src/mutators/builtIn/fixNoImplicitThis/index.ts index 49de6066e..5ee4e25fc 100644 --- a/src/mutators/builtIn/fixNoImplicitThis/index.ts +++ b/src/mutators/builtIn/fixNoImplicitThis/index.ts @@ -1,10 +1,22 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { getNoImplicitThisMutations } from "../../../mutations/codeFixes/noImplicitThis"; -import { collectMutationsFromNodes } from "../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../shared/fileMutator"; +import { getNoImplicitThisMutations } from "../../../mutations/codeFixes/noImplicitThis.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../shared/fileMutator.js"; +import { collectMutationsFromNodes } from "../../collectMutationsFromNodes.js"; -export const fixNoImplicitThis: FileMutator = (request: FileMutationsRequest) => - request.options.fixes.noImplicitThis ? collectMutationsFromNodes(request, isThisExpression, getNoImplicitThisMutations) : undefined; +export const fixNoImplicitThis: FileMutator = ( + request: FileMutationsRequest, +) => + request.options.fixes.noImplicitThis + ? collectMutationsFromNodes( + request, + isThisExpression, + getNoImplicitThisMutations, + ) + : undefined; -const isThisExpression = (node: ts.Node): node is ts.ThisExpression => node.kind === ts.SyntaxKind.ThisKeyword; +const isThisExpression = (node: ts.Node): node is ts.ThisExpression => + node.kind === ts.SyntaxKind.ThisKeyword; diff --git a/src/mutators/builtIn/fixNoInferableTypes/README.md b/src/mutators/builtIn/fixNoInferableTypes/README.md index 53b109eeb..cc7035c1f 100644 --- a/src/mutators/builtIn/fixNoInferableTypes/README.md +++ b/src/mutators/builtIn/fixNoInferableTypes/README.md @@ -2,18 +2,18 @@ Whether to remove type annotations that don't change the meaning of code. -# Use Cases +## Use Cases -* Your code was recently converted from JavaScript to TypeScript and previously useful type declarations are now visual clutter -* You used to always add type declarations, but have since realized doing so unnecessary is a futile and wasteful act +- Your code was recently converted from JavaScript to TypeScript and previously useful type declarations are now visual clutter +- You used to always add type declarations, but have since realized doing so unnecessary is a futile and wasteful act ## Configuration ```json { - "fixes": { - "noInferableTypes": true - } + "fixes": { + "noInferableTypes": true + } } ``` @@ -30,7 +30,7 @@ When a parameter is declared with a `: number` type declaration and a numeric in ```diff - function receivesNumber(value: number = 0) { + function receivesNumber(value = 0) { - return value * 2; + return value * 2; } ``` diff --git a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesParameters/index.ts b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesParameters/index.ts index 8f458a4dd..afac10215 100644 --- a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesParameters/index.ts +++ b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesParameters/index.ts @@ -1,44 +1,67 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { createTypeRemovalMutation } from "../../../../mutations/removals"; -import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons"; -import { ParameterDeclarationWithType, isNodeWithType } from "../../../../shared/nodeTypes"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { createTypeRemovalMutation } from "../../../../mutations/removals.js"; +import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { + ParameterDeclarationWithType, + isNodeWithType, +} from "../../../../shared/nodeTypes.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixNoInferableTypesParameters: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isInferableTypeCapableParameter, getNoInferableTypeParameterMutation); +export const fixNoInferableTypesParameters: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isInferableTypeCapableParameter, + getNoInferableTypeParameterMutation, + ); -const isInferableTypeCapableParameter = (node: ts.Node): node is ParameterDeclarationWithType => - ts.isParameter(node) && isNodeWithType(node) && node.modifiers === undefined; +const isInferableTypeCapableParameter = ( + node: ts.Node, +): node is ParameterDeclarationWithType => + ts.isParameter(node) && isNodeWithType(node) && node.modifiers === undefined; -const getNoInferableTypeParameterMutation = (node: ParameterDeclarationWithType, request: FileMutationsRequest) => { - if (!parameterTypeIsInferable(request, node)) { - return undefined; - } +const getNoInferableTypeParameterMutation = ( + node: ParameterDeclarationWithType, + request: FileMutationsRequest, +) => { + if (!parameterTypeIsInferable(request, node)) { + return undefined; + } - return createTypeRemovalMutation(request, node); + return createTypeRemovalMutation(request, node); }; const parameterTypeIsInferable = ( - request: FileMutationsRequest, - node: ParameterDeclarationWithType, + request: FileMutationsRequest, + node: ParameterDeclarationWithType, ): node is ParameterDeclarationWithType => { - // If the parameter has an initializer (default value), that might invalidate its type - if (node.initializer) { - if (declaredInitializedTypeNodeIsRedundant(request, node.type, node.initializer)) { - return true; - } - } - - // Eventually, it'd be nice to check for parameters whose values are inferable from - // their parent function's declarations, e.g. - // ```ts - // type TakesString = (input: string) => void; - // const takesString: TakesString = (input: string) => {}; - // ``` - // See https://github.com/microsoft/TypeScript/issues/35691 - - return false; + // If the parameter has an initializer (default value), that might invalidate its type + if (node.initializer) { + if ( + declaredInitializedTypeNodeIsRedundant( + request, + node.type, + node.initializer, + ) + ) { + return true; + } + } + + // Eventually, it'd be nice to check for parameters whose values are inferable from + // their parent function's declarations, e.g. + // ```ts + // type TakesString = (input: string) => void; + // const takesString: TakesString = (input: string) => {}; + // ``` + // See https://github.com/microsoft/TypeScript/issues/35691 + + return false; }; diff --git a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesPropertyDeclarations/index.ts b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesPropertyDeclarations/index.ts index bd7b6aa37..7daf53683 100644 --- a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesPropertyDeclarations/index.ts +++ b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesPropertyDeclarations/index.ts @@ -1,24 +1,48 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { createTypeRemovalMutation } from "../../../../mutations/removals"; -import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons"; -import { isNodeWithType, NodeWithType } from "../../../../shared/nodeTypes"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { createTypeRemovalMutation } from "../../../../mutations/removals.js"; +import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { NodeWithType, isNodeWithType } from "../../../../shared/nodeTypes.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -type InferablePropertyDeclaration = ts.PropertyDeclaration & NodeWithType & Required>; +type InferablePropertyDeclaration = ts.PropertyDeclaration & + NodeWithType & + Required>; -export const fixNoInferableTypesPropertyDeclarations: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isInferableTypeCapablePropertyDeclaration, getNoInferableTypePropertyDeclarationMutation); +export const fixNoInferableTypesPropertyDeclarations: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isInferableTypeCapablePropertyDeclaration, + getNoInferableTypePropertyDeclarationMutation, + ); -const isInferableTypeCapablePropertyDeclaration = (node: ts.Node): node is InferablePropertyDeclaration => - ts.isPropertyDeclaration(node) && isNodeWithType(node) && node.initializer !== undefined; +const isInferableTypeCapablePropertyDeclaration = ( + node: ts.Node, +): node is InferablePropertyDeclaration => + ts.isPropertyDeclaration(node) && + isNodeWithType(node) && + node.initializer !== undefined; -const getNoInferableTypePropertyDeclarationMutation = (node: InferablePropertyDeclaration, request: FileMutationsRequest) => { - if (!declaredInitializedTypeNodeIsRedundant(request, node.type, node.initializer)) { - return undefined; - } +const getNoInferableTypePropertyDeclarationMutation = ( + node: InferablePropertyDeclaration, + request: FileMutationsRequest, +) => { + if ( + !declaredInitializedTypeNodeIsRedundant( + request, + node.type, + node.initializer, + ) + ) { + return undefined; + } - return createTypeRemovalMutation(request, node); + return createTypeRemovalMutation(request, node); }; diff --git a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesVariableDeclarations/index.ts b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesVariableDeclarations/index.ts index 1ae0de38b..7f15fb288 100644 --- a/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesVariableDeclarations/index.ts +++ b/src/mutators/builtIn/fixNoInferableTypes/fixNoInferableTypesVariableDeclarations/index.ts @@ -1,34 +1,51 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { createTypeRemovalMutation } from "../../../../mutations/removals"; -import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons"; -import { isNodeWithType, NodeWithType } from "../../../../shared/nodeTypes"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { createTypeRemovalMutation } from "../../../../mutations/removals.js"; +import { declaredInitializedTypeNodeIsRedundant } from "../../../../shared/comparisons.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { NodeWithType, isNodeWithType } from "../../../../shared/nodeTypes.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; type InferableVariableDeclaration = ts.VariableDeclaration & - NodeWithType & - Required> & { - parent: ts.VariableDeclarationList; - }; + NodeWithType & + Required> & { + parent: ts.VariableDeclarationList; + }; -export const fixNoInferableTypesVariableDeclarations: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isInferableTypeCapableVariableDeclaration, getNoInferableTypeVariableDeclarationMutation); +export const fixNoInferableTypesVariableDeclarations: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isInferableTypeCapableVariableDeclaration, + getNoInferableTypeVariableDeclarationMutation, + ); -const isInferableTypeCapableVariableDeclaration = (node: ts.Node): node is InferableVariableDeclaration => - ts.isVariableDeclaration(node) && isNodeWithType(node) && node.initializer !== undefined && ts.isVariableDeclarationList(node.parent); +const isInferableTypeCapableVariableDeclaration = ( + node: ts.Node, +): node is InferableVariableDeclaration => + ts.isVariableDeclaration(node) && + isNodeWithType(node) && + node.initializer !== undefined && + ts.isVariableDeclarationList(node.parent); -const getNoInferableTypeVariableDeclarationMutation = (node: InferableVariableDeclaration, request: FileMutationsRequest) => { - if ( - // `const` variables should always have their declarations removed - tsutils.isNodeFlagSet(node.parent, ts.NodeFlags.Const) || - // `let` variables should have only uninformative declarations removed - declaredInitializedTypeNodeIsRedundant(request, node.type, node.initializer) - ) { - return createTypeRemovalMutation(request, node); - } +const getNoInferableTypeVariableDeclarationMutation = ( + node: InferableVariableDeclaration, + request: FileMutationsRequest, +) => { + if ( + // `const` variables should always have their declarations removed + tsutils.isNodeFlagSet(node.parent, ts.NodeFlags.Const) || + // `let` variables should have only uninformative declarations removed + declaredInitializedTypeNodeIsRedundant(request, node.type, node.initializer) + ) { + return createTypeRemovalMutation(request, node); + } - return undefined; + return undefined; }; diff --git a/src/mutators/builtIn/fixNoInferableTypes/index.ts b/src/mutators/builtIn/fixNoInferableTypes/index.ts index cb6e1b793..c6b9f7758 100644 --- a/src/mutators/builtIn/fixNoInferableTypes/index.ts +++ b/src/mutators/builtIn/fixNoInferableTypes/index.ts @@ -1,15 +1,20 @@ -import { findFirstMutations } from "../../../shared/runtime"; -import { FileMutationsRequest } from "../../../shared/fileMutator"; - -import { fixNoInferableTypesParameters } from "./fixNoInferableTypesParameters"; -import { fixNoInferableTypesPropertyDeclarations } from "./fixNoInferableTypesPropertyDeclarations"; -import { fixNoInferableTypesVariableDeclarations } from "./fixNoInferableTypesVariableDeclarations"; +import { FileMutationsRequest } from "../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../shared/runtime.js"; +import { fixNoInferableTypesParameters } from "./fixNoInferableTypesParameters/index.js"; +import { fixNoInferableTypesPropertyDeclarations } from "./fixNoInferableTypesPropertyDeclarations/index.js"; +import { fixNoInferableTypesVariableDeclarations } from "./fixNoInferableTypesVariableDeclarations/index.js"; export const fixNoInferableTypes = (request: FileMutationsRequest) => - request.options.fixes.noInferableTypes - ? findFirstMutations(request, [ - ["fixNoInferableTypesParameters", fixNoInferableTypesParameters], - ["fixNoInferableTypesPropertyDeclarations", fixNoInferableTypesPropertyDeclarations], - ["fixNoInferableTypesVariableDeclarations", fixNoInferableTypesVariableDeclarations], - ]) - : undefined; + request.options.fixes.noInferableTypes + ? findFirstMutations(request, [ + ["fixNoInferableTypesParameters", fixNoInferableTypesParameters], + [ + "fixNoInferableTypesPropertyDeclarations", + fixNoInferableTypesPropertyDeclarations, + ], + [ + "fixNoInferableTypesVariableDeclarations", + fixNoInferableTypesVariableDeclarations, + ], + ]) + : undefined; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/README.md b/src/mutators/builtIn/fixStrictNonNullAssertions/README.md index ae51e3f34..60202cdc2 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/README.md +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/README.md @@ -6,8 +6,8 @@ Whether to add missing non-null assertions. You'd like to enable [`--strictNullChecks`](https://basarat.gitbooks.io/typescript/docs/options/strictNullChecks.html) but: -* You'd like to enable the setting now and clean up existing violations later -* Your tests pass nullable values in places that otherwise shouldn't accept them +- You'd like to enable the setting now and clean up existing violations later +- Your tests pass nullable values in places that otherwise shouldn't accept them Note that `strictNullChecks` must be enabled in your `tsconfig.json` and/or TypeStat configuration file. @@ -15,9 +15,9 @@ Note that `strictNullChecks` must be enabled in your `tsconfig.json` and/or Type ```json { - "fixes": { - "strictNonNullAssertions": true - } + "fixes": { + "strictNonNullAssertions": true + } } ``` diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionBinaryExpressions/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionBinaryExpressions/index.ts index e758be5d1..07ee9206b 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionBinaryExpressions/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionBinaryExpressions/index.ts @@ -1,37 +1,54 @@ import { Mutation } from "automutate"; import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags"; -import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion"; -import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags.js"; +import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { isNodeAssigningBinaryExpression } from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixStrictNonNullAssertionBinaryExpressions: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - return collectMutationsFromNodes(request, isNodeAssigningBinaryExpression, visitBinaryExpression); +export const fixStrictNonNullAssertionBinaryExpressions: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + return collectMutationsFromNodes( + request, + isNodeAssigningBinaryExpression, + visitBinaryExpression, + ); }; -const visitBinaryExpression = (node: ts.BinaryExpression, request: FileMutationsRequest): Mutation | undefined => { - // Grab the types of the declared and assigned nodes - const assignedType = getTypeAtLocationIfNotError(request, node.right); - if (assignedType === undefined) { - return undefined; - } +const visitBinaryExpression = ( + node: ts.BinaryExpression, + request: FileMutationsRequest, +): Mutation | undefined => { + // Grab the types of the declared and assigned nodes + const assignedType = getTypeAtLocationIfNotError(request, node.right); + if (assignedType === undefined) { + return undefined; + } - const declaredType = getTypeAtLocationIfNotError(request, node.left); - if (declaredType === undefined || tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any)) { - return undefined; - } + const declaredType = getTypeAtLocationIfNotError(request, node.left); + if ( + declaredType === undefined || + tsutils.isTypeFlagSet(declaredType, ts.TypeFlags.Any) + ) { + return undefined; + } - // We only care if the assigned type contains a strict flag the declared type doesn't - if ( - (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Null) || !isTypeFlagSetRecursively(assignedType, ts.TypeFlags.Null)) && - (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Undefined) || !isTypeFlagSetRecursively(assignedType, ts.TypeFlags.Undefined)) - ) { - return undefined; - } + // We only care if the assigned type contains a strict flag the declared type doesn't + if ( + (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Null) || + !isTypeFlagSetRecursively(assignedType, ts.TypeFlags.Null)) && + (isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Undefined) || + !isTypeFlagSetRecursively(assignedType, ts.TypeFlags.Undefined)) + ) { + return undefined; + } - return createNonNullAssertion(request, node.right); + return createNonNullAssertion(request, node.right); }; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionCallExpressions/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionCallExpressions/index.ts index 80cb09034..25278b652 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionCallExpressions/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionCallExpressions/index.ts @@ -1,88 +1,135 @@ -import { combineMutations, MultipleMutations, Mutation } from "automutate"; -import * as ts from "typescript"; -import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags"; +import { MultipleMutations, Mutation, combineMutations } from "automutate"; +import ts from "typescript"; -import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion"; -import { getValueDeclarationOfFunction } from "../../../../shared/functionTypes"; -import { getParentOfKind, getVariableInitializerForExpression } from "../../../../shared/nodes"; -import { isNullOrUndefinedMissingBetween } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags.js"; +import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { getValueDeclarationOfFunction } from "../../../../shared/functionTypes.js"; +import { isNullOrUndefinedMissingBetween } from "../../../../shared/nodeTypes.js"; +import { + getParentOfKind, + getVariableInitializerForExpression, +} from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixStrictNonNullAssertionCallExpressions: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - return collectMutationsFromNodes(request, isVisitableCallExpression, visitCallExpression); +export const fixStrictNonNullAssertionCallExpressions: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + return collectMutationsFromNodes( + request, + isVisitableCallExpression, + visitCallExpression, + ); }; const isVisitableCallExpression = (node: ts.Node): node is ts.CallExpression => - ts.isCallExpression(node) && - // We can quickly ignore any calls without arguments - node.arguments.length !== 0; + ts.isCallExpression(node) && + // We can quickly ignore any calls without arguments + node.arguments.length !== 0; -const visitCallExpression = (node: ts.CallExpression, request: FileMutationsRequest): MultipleMutations | undefined => { - // Collect the declared type of the function-like being called - const functionLikeValueDeclaration = getValueDeclarationOfFunction(request, node.expression); - if (functionLikeValueDeclaration === undefined) { - return undefined; - } - // Collect mutations for each argument as needed - const argumentMutations = collectArgumentMutations(request, node, functionLikeValueDeclaration); - if (argumentMutations.length === 0) { - return undefined; - } +const visitCallExpression = ( + node: ts.CallExpression, + request: FileMutationsRequest, +): MultipleMutations | undefined => { + // Collect the declared type of the function-like being called + const functionLikeValueDeclaration = getValueDeclarationOfFunction( + request, + node.expression, + ); + if (functionLikeValueDeclaration === undefined) { + return undefined; + } - return combineMutations(...argumentMutations); + // Collect mutations for each argument as needed + const argumentMutations = collectArgumentMutations( + request, + node, + functionLikeValueDeclaration, + ); + if (argumentMutations.length === 0) { + return undefined; + } + + return combineMutations(...argumentMutations); }; const collectArgumentMutations = ( - request: FileMutationsRequest, - callingNode: ts.CallExpression, - functionLikeValueDeclaration: ts.SignatureDeclaration, -): ReadonlyArray => { - const mutations: Mutation[] = []; - const visitableArguments = Math.min(callingNode.arguments.length, functionLikeValueDeclaration.parameters.length); + request: FileMutationsRequest, + callingNode: ts.CallExpression, + functionLikeValueDeclaration: ts.SignatureDeclaration, +): readonly Mutation[] => { + const mutations: Mutation[] = []; + const visitableArguments = Math.min( + callingNode.arguments.length, + functionLikeValueDeclaration.parameters.length, + ); - // Check the types of each argument being passed in against the declared parameter type - for (let i = 0; i < visitableArguments; i += 1) { - // We can ignore parameters that are 'any' - const typeOfParameter = getTypeAtLocationIfNotError(request, functionLikeValueDeclaration.parameters[i]); - if (typeOfParameter === undefined || isTypeFlagSetRecursively(typeOfParameter, ts.TypeFlags.Any)) { - continue; - } + // Check the types of each argument being passed in against the declared parameter type + for (let i = 0; i < visitableArguments; i += 1) { + // We can ignore parameters that are 'any' + const typeOfParameter = getTypeAtLocationIfNotError( + request, + functionLikeValueDeclaration.parameters[i], + ); + if ( + typeOfParameter === undefined || + isTypeFlagSetRecursively(typeOfParameter, ts.TypeFlags.Any) + ) { + continue; + } - const typeOfArgument = getTypeAtLocationIfNotError(request, callingNode.arguments[i]); + const typeOfArgument = getTypeAtLocationIfNotError( + request, + callingNode.arguments[i], + ); - // If either null or undefined is missing in the argument, we'll need a ! mutation - if (typeOfArgument !== undefined && isNullOrUndefinedMissingBetween(typeOfArgument, typeOfParameter)) { - const argumentMutation = collectArgumentMutation(request, callingNode.arguments[i]); - if (argumentMutation !== undefined) { - mutations.push(argumentMutation); - } - } - } + // If either null or undefined is missing in the argument, we'll need a ! mutation + if ( + typeOfArgument !== undefined && + isNullOrUndefinedMissingBetween(typeOfArgument, typeOfParameter) + ) { + const argumentMutation = collectArgumentMutation( + request, + callingNode.arguments[i], + ); + if (argumentMutation !== undefined) { + mutations.push(argumentMutation); + } + } + } - return mutations; + return mutations; }; -const collectArgumentMutation = (request: FileMutationsRequest, callingArgument: ts.Expression) => { - // If the argument is a variable declared in the parent function, add the ! to the variable... - if (ts.isIdentifier(callingArgument)) { - const declaringVariableInitializer = getVariableInitializerForExpression( - request, - callingArgument, - getParentOfKind(callingArgument, isFunctionBodyOrBlock), - ); - if (declaringVariableInitializer !== undefined) { - // ...if the variable doesn't already have a ! after its initial value - return declaringVariableInitializer.kind === ts.SyntaxKind.NonNullExpression - ? undefined - : createNonNullAssertion(request, declaringVariableInitializer); - } - } +const collectArgumentMutation = ( + request: FileMutationsRequest, + callingArgument: ts.Expression, +) => { + // If the argument is a variable declared in the parent function, add the ! to the variable... + if (ts.isIdentifier(callingArgument)) { + const declaringVariableInitializer = getVariableInitializerForExpression( + request, + callingArgument, + getParentOfKind(callingArgument, isFunctionBodyOrBlock), + ); + if (declaringVariableInitializer !== undefined) { + // ...if the variable doesn't already have a ! after its initial value + return declaringVariableInitializer.kind === + ts.SyntaxKind.NonNullExpression + ? undefined + : createNonNullAssertion(request, declaringVariableInitializer); + } + } - // Otherwise add the ! at the calling site's argument - return createNonNullAssertion(request, callingArgument); + // Otherwise add the ! at the calling site's argument + return createNonNullAssertion(request, callingArgument); }; -const isFunctionBodyOrBlock = (node: ts.Node): node is ts.Block | ts.FunctionLikeDeclaration | ts.SourceFile => - ts.isFunctionLike(node) || ts.isBlock(node) || ts.isSourceFile(node); +const isFunctionBodyOrBlock = ( + node: ts.Node, +): node is ts.Block | ts.FunctionLikeDeclaration | ts.SourceFile => + ts.isFunctionLike(node) || ts.isBlock(node) || ts.isSourceFile(node); diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionObjectLiterals/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionObjectLiterals/index.ts index 50b10b883..8b63eb100 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionObjectLiterals/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionObjectLiterals/index.ts @@ -1,56 +1,74 @@ import { Mutation, combineMutations } from "automutate"; -import * as ts from "typescript"; - -import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; -import { getManuallyAssignedTypeOfNode } from "../../../../shared/assignments"; -import { getStaticNameOfProperty } from "../../../../shared/names"; -import { isNullOrUndefinedMissingBetween } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; - -export const fixStrictNonNullAssertionObjectLiterals: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - const visitObjectLiteralExpression = (node: ts.ObjectLiteralExpression): Mutation | undefined => { - return getStrictPropertyFix(request, node); - }; - - return collectMutationsFromNodes(request, ts.isObjectLiteralExpression, visitObjectLiteralExpression); +import ts from "typescript"; + +import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion.js"; +import { getManuallyAssignedTypeOfNode } from "../../../../shared/assignments.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { getStaticNameOfProperty } from "../../../../shared/names.js"; +import { isNullOrUndefinedMissingBetween } from "../../../../shared/nodeTypes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; + +export const fixStrictNonNullAssertionObjectLiterals: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + const visitObjectLiteralExpression = ( + node: ts.ObjectLiteralExpression, + ): Mutation | undefined => { + return getStrictPropertyFix(request, node); + }; + + return collectMutationsFromNodes( + request, + ts.isObjectLiteralExpression, + visitObjectLiteralExpression, + ); }; -const getStrictPropertyFix = (request: FileMutationsRequest, node: ts.ObjectLiteralExpression): Mutation | undefined => { - // Find the object type the node's properties are being assigned into - const assignedType = getManuallyAssignedTypeOfNode(request, node); - if (assignedType === undefined) { - return undefined; - } - - const propertyMutations = node.properties - // Find all properties with a nullable value being passed into a non-nullable type - .filter((property) => { - // Ignore any property with a name that's not immediately convertable to a string - const propertyName = getStaticNameOfProperty(property.name); - if (propertyName === undefined) { - return false; - } - - // Also ignore any properties not declared in the assigned type - const assignedProperty = assignedType.getProperty(propertyName); - if (!assignedProperty) { - return false; - } - - // We'll mutate properties that are declared as non-nullable but assigned a nullable value - const propertyType = getTypeAtLocationIfNotError(request, property); - return ( - propertyType !== undefined && - isNullOrUndefinedMissingBetween( - propertyType, - request.services.program.getTypeChecker().getDeclaredTypeOfSymbol(assignedProperty), - ) - ); - }) - // Convert each of those properties into an assertion mutation - .map((property) => createNonNullAssertion(request, property)); - - return propertyMutations.length === 0 ? undefined : combineMutations(...propertyMutations); +const getStrictPropertyFix = ( + request: FileMutationsRequest, + node: ts.ObjectLiteralExpression, +): Mutation | undefined => { + // Find the object type the node's properties are being assigned into + const assignedType = getManuallyAssignedTypeOfNode(request, node); + if (assignedType === undefined) { + return undefined; + } + + const propertyMutations = node.properties + // Find all properties with a nullable value being passed into a non-nullable type + .filter((property) => { + // Ignore any property with a name that's not immediately convertible to a string + const propertyName = getStaticNameOfProperty(property.name); + if (propertyName === undefined) { + return false; + } + + // Also ignore any properties not declared in the assigned type + const assignedProperty = assignedType.getProperty(propertyName); + if (!assignedProperty) { + return false; + } + + // We'll mutate properties that are declared as non-nullable but assigned a nullable value + const propertyType = getTypeAtLocationIfNotError(request, property); + return ( + propertyType !== undefined && + isNullOrUndefinedMissingBetween( + propertyType, + request.services.program + .getTypeChecker() + .getDeclaredTypeOfSymbol(assignedProperty), + ) + ); + }) + // Convert each of those properties into an assertion mutation + .map((property) => createNonNullAssertion(request, property)); + + return propertyMutations.length === 0 + ? undefined + : combineMutations(...propertyMutations); }; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionPropertyAccesses/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionPropertyAccesses/index.ts index 9f13779de..d574b6b94 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionPropertyAccesses/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionPropertyAccesses/index.ts @@ -1,34 +1,58 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags"; -import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags.js"; +import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; -export const fixStrictNonNullAssertionPropertyAccesses: FileMutator = (request: FileMutationsRequest): ReadonlyArray => { - const visitPropertyAccessExpression = (node: ts.PropertyAccessExpression): Mutation | undefined => { - return getStrictPropertyAccessFix(request, node); - }; +export const fixStrictNonNullAssertionPropertyAccesses: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => { + const visitPropertyAccessExpression = ( + node: ts.PropertyAccessExpression, + ): Mutation | undefined => { + return getStrictPropertyAccessFix(request, node); + }; - return collectMutationsFromNodes(request, ts.isPropertyAccessExpression, visitPropertyAccessExpression); + return collectMutationsFromNodes( + request, + ts.isPropertyAccessExpression, + visitPropertyAccessExpression, + ); }; -const getStrictPropertyAccessFix = (request: FileMutationsRequest, node: ts.PropertyAccessExpression): Mutation | undefined => { - // Early on skip checking for "!" needs if there already is one or it's a ?. - if (ts.isAssertionExpression(node.parent) || ts.isNonNullExpression(node.parent) || node.questionDotToken) { - return undefined; - } +const getStrictPropertyAccessFix = ( + request: FileMutationsRequest, + node: ts.PropertyAccessExpression, +): Mutation | undefined => { + // Early on skip checking for "!" needs if there already is one or it's a ?. + if ( + ts.isAssertionExpression(node.parent) || + ts.isNonNullExpression(node.parent) || + node.questionDotToken + ) { + return undefined; + } - // Grab the type of the property being accessed by name - const expressionType = getTypeAtLocationIfNotError(request, node.expression); + // Grab the type of the property being accessed by name + const expressionType = getTypeAtLocationIfNotError(request, node.expression); - // If the property's type cannot be null or undefined, rejoice! Nothing to do. - if (expressionType === undefined || !isTypeFlagSetRecursively(expressionType, ts.TypeFlags.Null | ts.TypeFlags.Undefined)) { - return undefined; - } + // If the property's type cannot be null or undefined, rejoice! Nothing to do. + if ( + expressionType === undefined || + !isTypeFlagSetRecursively( + expressionType, + ts.TypeFlags.Null | ts.TypeFlags.Undefined, + ) + ) { + return undefined; + } - // Add a mutation to insert a "!" before the access - return createNonNullAssertion(request, node.expression); + // Add a mutation to insert a "!" before the access + return createNonNullAssertion(request, node.expression); }; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions.ts index 31d521268..39fb0c891 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/collectReturningNodeExpressions.ts @@ -1,30 +1,31 @@ -import * as ts from "typescript"; +import ts from "typescript"; /** * Finds any nodes returned by a function-like. - * - * @param functionLikeDeclaration Returning function-like declaration. + * @param functionLikeDeclaration Returning function-like declaration to collect within. * @returns Expression nodes returned from the function-like. */ -export const collectReturningNodeExpressions = (functionLikeDeclaration: ts.FunctionLikeDeclaration): ReadonlyArray => { - const returnedTypes: ts.Expression[] = []; +export const collectReturningNodeExpressions = ( + functionLikeDeclaration: ts.FunctionLikeDeclaration, +): readonly ts.Expression[] => { + const returnedTypes: ts.Expression[] = []; - // Search through nodes within the function-like to find all its return statements - const visitNode = (node: ts.Node): void => { - // Don't look at returns within a nested function-like signature: they return for that function - if (ts.isFunctionLike(node)) { - return; - } + // Search through nodes within the function-like to find all its return statements + const visitNode = (node: ts.Node): void => { + // Don't look at returns within a nested function-like signature: they return for that function + if (ts.isFunctionLike(node)) { + return; + } - // Add new returning nodes as needed when we find any 'return' statement with a value (expression) returned - if (ts.isReturnStatement(node) && node.expression !== undefined) { - returnedTypes.push(node.expression); - } + // Add new returning nodes as needed when we find any 'return' statement with a value (expression) returned + if (ts.isReturnStatement(node) && node.expression !== undefined) { + returnedTypes.push(node.expression); + } - ts.forEachChild(node, visitNode); - }; + ts.forEachChild(node, visitNode); + }; - ts.forEachChild(functionLikeDeclaration, visitNode); + ts.forEachChild(functionLikeDeclaration, visitNode); - return returnedTypes; + return returnedTypes; }; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/index.ts index f70ed54a8..b9e411b39 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/fixStrictNonNullAssertionReturnTypes/index.ts @@ -1,78 +1,118 @@ -import { combineMutations, Mutation } from "automutate"; -import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import { Mutation, combineMutations } from "automutate"; +import ts from "typescript"; -import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags"; -import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion"; -import { getVariableInitializerForExpression } from "../../../../shared/nodes"; -import { FunctionLikeDeclarationWithType, isNodeWithType } from "../../../../shared/nodeTypes"; -import { getTypeAtLocationIfNotError } from "../../../../shared/types"; -import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes"; -import { FileMutationsRequest, FileMutator } from "../../../../shared/fileMutator"; +import { isTypeFlagSetRecursively } from "../../../../mutations/collecting/flags.js"; +import { createNonNullAssertion } from "../../../../mutations/typeMutating/createNonNullAssertion.js"; +import { + FileMutationsRequest, + FileMutator, +} from "../../../../shared/fileMutator.js"; +import { + FunctionLikeDeclarationWithType, + isNodeWithType, +} from "../../../../shared/nodeTypes.js"; +import { getVariableInitializerForExpression } from "../../../../shared/nodes.js"; +import { getTypeAtLocationIfNotError } from "../../../../shared/types.js"; +import { collectMutationsFromNodes } from "../../../collectMutationsFromNodes.js"; +import { collectReturningNodeExpressions } from "./collectReturningNodeExpressions.js"; -import { collectReturningNodeExpressions } from "./collectReturningNodeExpressions"; +export const fixStrictNonNullAssertionReturnTypes: FileMutator = ( + request: FileMutationsRequest, +): readonly Mutation[] => + collectMutationsFromNodes( + request, + isNodeVisitableFunctionLikeDeclaration, + visitFunctionWithBody, + ); -export const fixStrictNonNullAssertionReturnTypes: FileMutator = (request: FileMutationsRequest): ReadonlyArray => - collectMutationsFromNodes(request, isNodeVisitableFunctionLikeDeclaration, visitFunctionWithBody); +const isNodeVisitableFunctionLikeDeclaration = ( + node: ts.Node, +): node is FunctionLikeDeclarationWithType => + ts.isFunctionLike(node) && + // If the node has an implicit return type, we don't need to change anything + isNodeWithType(node); -const isNodeVisitableFunctionLikeDeclaration = (node: ts.Node): node is FunctionLikeDeclarationWithType => - ts.isFunctionLike(node) && - // If the node has an implicit return type, we don't need to change anything - isNodeWithType(node); +const visitFunctionWithBody = ( + node: FunctionLikeDeclarationWithType, + request: FileMutationsRequest, +): Mutation | undefined => { + // Collect the type initially declared as returned and whether it contains null and/or undefined + const declaredType = getTypeAtLocationIfNotError(request, node.type); -const visitFunctionWithBody = (node: FunctionLikeDeclarationWithType, request: FileMutationsRequest): Mutation | undefined => { - // Collect the type initially declared as returned and whether it contains null and/or undefined - const declaredType = getTypeAtLocationIfNotError(request, node.type); + // If the node's explicit return type contains 'any', we can't infer anything + if ( + declaredType === undefined || + isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Any) + ) { + return undefined; + } - // If the node's explicit return type contains 'any', we can't infer anything - if (declaredType === undefined || isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Any)) { - return undefined; - } + // If the type already has both null or undefined, all is well; rejoice! + const returningNull = isTypeFlagSetRecursively( + declaredType, + ts.TypeFlags.Null, + ); + const returningUndefined = isTypeFlagSetRecursively( + declaredType, + ts.TypeFlags.Undefined, + ); + if (returningNull && returningUndefined) { + return undefined; + } - // If the type already has both null or undefined, all is well; rejoice! - const returningNull = isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Null); - const returningUndefined = isTypeFlagSetRecursively(declaredType, ts.TypeFlags.Undefined); - if (returningNull && returningUndefined) { - return undefined; - } + // From now on, we only care about the two types of strict values that could be returned + const missingReturnTypes = + (returningNull ? 0 : ts.TypeFlags.Null) | + (returningUndefined ? 0 : ts.TypeFlags.Undefined); - // From now on, we only care about the two types of strict values that could be returned - const missingReturnTypes = (returningNull ? 0 : ts.TypeFlags.Null) | (returningUndefined ? 0 : ts.TypeFlags.Undefined); + // Collect ! additions for the return types of nodes in the function + const returningNodeExpressions = collectReturningNodeExpressions(node); + const mutations = collectNonNullMutations( + request, + node, + missingReturnTypes, + returningNodeExpressions, + ); - // Collect ! additions for the return types of nodes in the function - const returningNodeExpressions = collectReturningNodeExpressions(node); - const mutations = collectNonNullMutations(request, node, missingReturnTypes, returningNodeExpressions); - - return mutations.length === 0 ? undefined : combineMutations(...mutations); + return mutations.length === 0 ? undefined : combineMutations(...mutations); }; const collectNonNullMutations = ( - request: FileMutationsRequest, - functionLike: FunctionLikeDeclarationWithType, - missingReturnTypes: ts.TypeFlags, - expressions: ReadonlyArray, -): ReadonlyArray => { - const mutations: Mutation[] = []; + request: FileMutationsRequest, + functionLike: FunctionLikeDeclarationWithType, + missingReturnTypes: ts.TypeFlags, + expressions: readonly ts.Expression[], +): readonly Mutation[] => { + const mutations: Mutation[] = []; - for (const expression of expressions) { - // If the expression doesn't return a type missing from the return, it's already safe - const expressionType = getTypeAtLocationIfNotError(request, expression); - if (expressionType === undefined || !isTypeFlagSetRecursively(expressionType, missingReturnTypes)) { - continue; - } + for (const expression of expressions) { + // If the expression doesn't return a type missing from the return, it's already safe + const expressionType = getTypeAtLocationIfNotError(request, expression); + if ( + expressionType === undefined || + !isTypeFlagSetRecursively(expressionType, missingReturnTypes) + ) { + continue; + } - // If the expression is an variable declared in the parent function, add the ! to the variable - if (ts.isIdentifier(expression)) { - const declaringVariableInitializer = getVariableInitializerForExpression(request, expression, functionLike); - if (declaringVariableInitializer !== undefined) { - mutations.push(createNonNullAssertion(request, declaringVariableInitializer)); - continue; - } - } + // If the expression is an variable declared in the parent function, add the ! to the variable + if (ts.isIdentifier(expression)) { + const declaringVariableInitializer = getVariableInitializerForExpression( + request, + expression, + functionLike, + ); + if (declaringVariableInitializer !== undefined) { + mutations.push( + createNonNullAssertion(request, declaringVariableInitializer), + ); + continue; + } + } - // Otherwise, add it at the end of the expression - mutations.push(createNonNullAssertion(request, expression)); - } + // Otherwise, add it at the end of the expression + mutations.push(createNonNullAssertion(request, expression)); + } - return mutations; + return mutations; }; diff --git a/src/mutators/builtIn/fixStrictNonNullAssertions/index.ts b/src/mutators/builtIn/fixStrictNonNullAssertions/index.ts index fae3a142d..301474838 100644 --- a/src/mutators/builtIn/fixStrictNonNullAssertions/index.ts +++ b/src/mutators/builtIn/fixStrictNonNullAssertions/index.ts @@ -1,19 +1,33 @@ -import { findFirstMutations } from "../../../shared/runtime"; -import { FileMutationsRequest } from "../../../shared/fileMutator"; - -import { fixStrictNonNullAssertionBinaryExpressions } from "./fixStrictNonNullAssertionBinaryExpressions"; -import { fixStrictNonNullAssertionCallExpressions } from "./fixStrictNonNullAssertionCallExpressions"; -import { fixStrictNonNullAssertionObjectLiterals } from "./fixStrictNonNullAssertionObjectLiterals"; -import { fixStrictNonNullAssertionPropertyAccesses } from "./fixStrictNonNullAssertionPropertyAccesses"; -import { fixStrictNonNullAssertionReturnTypes } from "./fixStrictNonNullAssertionReturnTypes"; +import { FileMutationsRequest } from "../../../shared/fileMutator.js"; +import { findFirstMutations } from "../../../shared/runtime.js"; +import { fixStrictNonNullAssertionBinaryExpressions } from "./fixStrictNonNullAssertionBinaryExpressions/index.js"; +import { fixStrictNonNullAssertionCallExpressions } from "./fixStrictNonNullAssertionCallExpressions/index.js"; +import { fixStrictNonNullAssertionObjectLiterals } from "./fixStrictNonNullAssertionObjectLiterals/index.js"; +import { fixStrictNonNullAssertionPropertyAccesses } from "./fixStrictNonNullAssertionPropertyAccesses/index.js"; +import { fixStrictNonNullAssertionReturnTypes } from "./fixStrictNonNullAssertionReturnTypes/index.js"; export const fixStrictNonNullAssertions = (request: FileMutationsRequest) => - request.options.fixes.strictNonNullAssertions - ? findFirstMutations(request, [ - ["fixStrictNonNullAssertionBinaryExpressions", fixStrictNonNullAssertionBinaryExpressions], - ["fixStrictNonNullAssertionCallExpressions", fixStrictNonNullAssertionCallExpressions], - ["fixStrictNonNullAssertionObjectLiterals", fixStrictNonNullAssertionObjectLiterals], - ["fixStrictNonNullAssertionPropertyAccesses", fixStrictNonNullAssertionPropertyAccesses], - ["fixStrictNonNullAssertionReturnTypes", fixStrictNonNullAssertionReturnTypes], - ]) - : undefined; + request.options.fixes.strictNonNullAssertions + ? findFirstMutations(request, [ + [ + "fixStrictNonNullAssertionBinaryExpressions", + fixStrictNonNullAssertionBinaryExpressions, + ], + [ + "fixStrictNonNullAssertionCallExpressions", + fixStrictNonNullAssertionCallExpressions, + ], + [ + "fixStrictNonNullAssertionObjectLiterals", + fixStrictNonNullAssertionObjectLiterals, + ], + [ + "fixStrictNonNullAssertionPropertyAccesses", + fixStrictNonNullAssertionPropertyAccesses, + ], + [ + "fixStrictNonNullAssertionReturnTypes", + fixStrictNonNullAssertionReturnTypes, + ], + ]) + : undefined; diff --git a/src/mutators/builtIn/index.ts b/src/mutators/builtIn/index.ts index f1d2b8166..0f03b1806 100644 --- a/src/mutators/builtIn/index.ts +++ b/src/mutators/builtIn/index.ts @@ -1,19 +1,18 @@ -import { FileMutator } from "../../shared/fileMutator"; +import { FileMutator } from "../../shared/fileMutator.js"; +import { fixImportExtensions } from "./fixImportExtensions/index.js"; +import { fixIncompleteTypes } from "./fixIncompleteTypes/index.js"; +import { fixMissingProperties } from "./fixMissingProperties/index.js"; +import { fixNoImplicitAny } from "./fixNoImplicitAny/index.js"; +import { fixNoImplicitThis } from "./fixNoImplicitThis/index.js"; +import { fixNoInferableTypes } from "./fixNoInferableTypes/index.js"; +import { fixStrictNonNullAssertions } from "./fixStrictNonNullAssertions/index.js"; -import { fixImportExtensions } from "./fixImportExtensions"; -import { fixIncompleteTypes } from "./fixIncompleteTypes"; -import { fixMissingProperties } from "./fixMissingProperties"; -import { fixNoImplicitAny } from "./fixNoImplicitAny"; -import { fixNoImplicitThis } from "./fixNoImplicitThis"; -import { fixNoInferableTypes } from "./fixNoInferableTypes"; -import { fixStrictNonNullAssertions } from "./fixStrictNonNullAssertions"; - -export const builtInFileMutators: ReadonlyArray<[string, FileMutator]> = [ - ["fixImportExtensions", fixImportExtensions], - ["fixIncompleteTypes", fixIncompleteTypes], - ["fixMissingProperties", fixMissingProperties], - ["fixNoImplicitAny", fixNoImplicitAny], - ["fixNoImplicitThis", fixNoImplicitThis], - ["fixNoInferableTypes", fixNoInferableTypes], - ["fixStrictNonNullAssertions", fixStrictNonNullAssertions], +export const builtInFileMutators: readonly [string, FileMutator][] = [ + ["fixImportExtensions", fixImportExtensions], + ["fixIncompleteTypes", fixIncompleteTypes], + ["fixMissingProperties", fixMissingProperties], + ["fixNoImplicitAny", fixNoImplicitAny], + ["fixNoImplicitThis", fixNoImplicitThis], + ["fixNoInferableTypes", fixNoInferableTypes], + ["fixStrictNonNullAssertions", fixStrictNonNullAssertions], ]; diff --git a/src/mutators/collectMutationsFromNodes.ts b/src/mutators/collectMutationsFromNodes.ts index 883fc69ce..d6080620c 100644 --- a/src/mutators/collectMutationsFromNodes.ts +++ b/src/mutators/collectMutationsFromNodes.ts @@ -1,52 +1,58 @@ import { Mutation } from "automutate"; import { EOL } from "os"; -import * as ts from "typescript"; +import ts from "typescript"; -import { getQuickErrorSummary } from "../shared/errors"; -import { NodeSelector } from "../shared/nodeTypes"; +import { getQuickErrorSummary } from "../shared/errors.js"; +import { FileMutationsRequest } from "../shared/fileMutator.js"; +import { NodeSelector } from "../shared/nodeTypes.js"; -import { FileMutationsRequest } from "../shared/fileMutator"; - -export type NodeVisitor = (node: TNode, request: FileMutationsRequest) => Readonly | undefined; +export type NodeVisitor = ( + node: TNode, + request: FileMutationsRequest, +) => Readonly | undefined; export const collectMutationsFromNodes = ( - request: FileMutationsRequest, - selector: NodeSelector, - visitor: NodeVisitor, + request: FileMutationsRequest, + selector: NodeSelector, + visitor: NodeVisitor, ) => { - const mutations: Mutation[] = []; + const mutations: Mutation[] = []; - const visitNode = (node: ts.Node) => { - if (request.filteredNodes.has(node)) { - return; - } + const visitNode = (node: ts.Node) => { + if (request.filteredNodes.has(node)) { + return; + } - if (selector(node)) { - const mutation = tryGetMutation(request, node, visitor); + if (selector(node)) { + const mutation = tryGetMutation(request, node, visitor); - if (mutation !== undefined) { - mutations.push(mutation); - } - } + if (mutation !== undefined) { + mutations.push(mutation); + } + } - ts.forEachChild(node, visitNode); - }; + ts.forEachChild(node, visitNode); + }; - ts.forEachChild(request.sourceFile, visitNode); + ts.forEachChild(request.sourceFile, visitNode); - return mutations; + return mutations; }; -const tryGetMutation = (request: FileMutationsRequest, node: TNode, visitor: NodeVisitor) => { - try { - return visitor(node, request); - } catch (error) { - request.options.output.stderr( - `${EOL}Error in ${request.sourceFile.fileName} at node '${node.getText(request.sourceFile)}' (position ${node.pos}):`, - ); - request.options.output.stderr(`\t${getQuickErrorSummary(error)}`); - request.options.output.stderr(EOL); - } - - return undefined; +const tryGetMutation = ( + request: FileMutationsRequest, + node: TNode, + visitor: NodeVisitor, +) => { + try { + return visitor(node, request); + } catch (error) { + request.options.output.stderr( + `${EOL}Error in ${request.sourceFile.fileName} at node '${node.getText(request.sourceFile)}' (position ${node.pos}):`, + ); + request.options.output.stderr(`\t${getQuickErrorSummary(error)}`); + request.options.output.stderr(EOL); + } + + return undefined; }; diff --git a/src/mutators/complaint.ts b/src/mutators/complaint.ts index f8ace8314..5cc54e3d8 100644 --- a/src/mutators/complaint.ts +++ b/src/mutators/complaint.ts @@ -2,9 +2,18 @@ * Error and nested mutation path from a runtime failure. */ export class MutationsComplaint { - public constructor(public readonly error: Error, public readonly mutatorPath: readonly string[]) {} + public constructor( + public readonly error: Error, + public readonly mutatorPath: readonly string[], + ) {} - public static wrapping(mutatorName: string, subComplaint: MutationsComplaint) { - return new MutationsComplaint(subComplaint.error, [mutatorName, ...subComplaint.mutatorPath]); - } + public static wrapping( + mutatorName: string, + subComplaint: MutationsComplaint, + ) { + return new MutationsComplaint(subComplaint.error, [ + mutatorName, + ...subComplaint.mutatorPath, + ]); + } } diff --git a/src/options/enums.ts b/src/options/enums.ts index a9227f606..4040d2ba9 100644 --- a/src/options/enums.ts +++ b/src/options/enums.ts @@ -2,38 +2,38 @@ * Whether to use components' propTypes for inferences. */ export enum ReactPropTypesHint { - /** - * Always factor in all propTypes. - */ - Always = "always", + /** + * Always factor in all propTypes. + */ + Always = "always", - /** - * Don't factor in propTypes at all. - */ - Ignore = "ignore", + /** + * Don't factor in propTypes at all. + */ + Ignore = "ignore", - /** - * Only factor in nodes that are make as .required. - */ - WhenRequired = "whenRequired", + /** + * Only factor in nodes that are make as .required. + */ + WhenRequired = "whenRequired", } /** * Whether to make propType inferences optional and/or required. */ export enum ReactPropTypesOptionality { - /** - * Always make the added props optional. - */ - AlwaysOptional = "alwaysOptional", + /** + * Always make the added props optional. + */ + AlwaysOptional = "alwaysOptional", - /** - * Always make the added props required. - */ - AlwaysRequired = "alwaysRequired", + /** + * Always make the added props required. + */ + AlwaysRequired = "alwaysRequired", - /** - * Respect whether the original code has .isRequired. - */ - AsWritten = "asWritten", + /** + * Respect whether the original code has .isRequired. + */ + AsWritten = "asWritten", } diff --git a/src/options/fillOutRawOptions.ts b/src/options/fillOutRawOptions.ts index 2aca8ed39..6fc796100 100644 --- a/src/options/fillOutRawOptions.ts +++ b/src/options/fillOutRawOptions.ts @@ -1,87 +1,93 @@ -import { TypeStatArgv } from "../index"; -import { ProcessOutput } from "../output/types"; -import { collectOptionals } from "../shared/arrays"; -import { ReactPropTypesHint, ReactPropTypesOptionality } from "./enums"; -import { ParsedCompilerOptions } from "./parseRawCompilerOptions"; - -import { collectAddedMutators } from "./parsing/collectAddedMutators"; -import { collectFileOptions } from "./parsing/collectFileOptions"; -import { collectNoImplicitAny } from "./parsing/collectNoImplicitAny"; -import { collectNoImplicitThis } from "./parsing/collectNoImplicitThis"; -import { collectPackageOptions } from "./parsing/collectPackageOptions"; -import { collectStrictNullChecks } from "./parsing/collectStrictNullChecks"; -import { PendingTypeStatOptions, RawTypeStatOptions } from "./types"; +import { TypeStatArgv } from "../index.js"; +import { ProcessOutput } from "../output/types.js"; +import { collectOptionals } from "../shared/arrays.js"; +import { ReactPropTypesHint, ReactPropTypesOptionality } from "./enums.js"; +import { ParsedCompilerOptions } from "./parseRawCompilerOptions.js"; +import { collectAddedMutators } from "./parsing/collectAddedMutators.js"; +import { collectFileOptions } from "./parsing/collectFileOptions.js"; +import { collectNoImplicitAny } from "./parsing/collectNoImplicitAny.js"; +import { collectNoImplicitThis } from "./parsing/collectNoImplicitThis.js"; +import { collectPackageOptions } from "./parsing/collectPackageOptions.js"; +import { collectStrictNullChecks } from "./parsing/collectStrictNullChecks.js"; +import { PendingTypeStatOptions, RawTypeStatOptions } from "./types.js"; export interface OptionsFromRawOptionsSettings { - argv: TypeStatArgv; - compilerOptions: Readonly; - cwd: string; - output: ProcessOutput; - projectPath: string; - rawOptions: RawTypeStatOptions; + argv: TypeStatArgv; + compilerOptions: Readonly; + cwd: string; + output: ProcessOutput; + projectPath: string; + rawOptions: RawTypeStatOptions; } /** * Combines Node and CLi argument options with project and file metadata into pending TypeStat options. - * * @returns Parsed TypeStat options, or a string for an error complaint. */ export const fillOutRawOptions = ({ - compilerOptions, - cwd, - output, - projectPath, - rawOptions, + compilerOptions, + cwd, + output, + projectPath, + rawOptions, }: OptionsFromRawOptionsSettings): PendingTypeStatOptions => { - const rawOptionTypes = rawOptions.types ?? {}; - const noImplicitAny = collectNoImplicitAny(compilerOptions, rawOptions); - const noImplicitThis = collectNoImplicitThis(compilerOptions, rawOptions); - const { compilerStrictNullChecks, typeStrictNullChecks } = collectStrictNullChecks(compilerOptions, rawOptionTypes); + const rawOptionTypes = rawOptions.types ?? {}; + const noImplicitAny = collectNoImplicitAny(compilerOptions, rawOptions); + const noImplicitThis = collectNoImplicitThis(compilerOptions, rawOptions); + const { compilerStrictNullChecks, typeStrictNullChecks } = + collectStrictNullChecks(compilerOptions, rawOptionTypes); - const packageOptions = collectPackageOptions(cwd, rawOptions); + const packageOptions = collectPackageOptions(cwd, rawOptions); - const shell: (readonly string[])[] = []; - if (rawOptions.postProcess?.shell !== undefined) { - shell.push(...rawOptions.postProcess.shell); - } + const shell: (readonly string[])[] = []; + if (rawOptions.postProcess?.shell !== undefined) { + shell.push(...rawOptions.postProcess.shell); + } - return { - compilerOptions: { - ...compilerOptions, - noImplicitAny, - noImplicitThis, - strictNullChecks: compilerStrictNullChecks, - }, - files: collectFileOptions(rawOptions), - filters: collectOptionals(rawOptions.filters), - fixes: { - importExtensions: false, - incompleteTypes: false, - missingProperties: false, - noImplicitAny: false, - noImplicitThis: false, - noInferableTypes: false, - strictNonNullAssertions: false, - ...rawOptions.fixes, - }, - hints: { - react: { - propTypes: rawOptions.hints?.react?.propTypes ?? ReactPropTypesHint.WhenRequired, - propTypesOptionality: rawOptions.hints?.react?.propTypesOptionality ?? ReactPropTypesOptionality.AsWritten, - }, - }, - include: rawOptions.include ?? compilerOptions.include, - mutators: collectAddedMutators(rawOptions, packageOptions.directory, output), - output, - package: packageOptions, - postProcess: { shell }, - projectPath, - cleanups: { - suppressTypeErrors: false, - ...rawOptions.cleanups, - }, - types: { - strictNullChecks: typeStrictNullChecks, - }, - }; + return { + cleanups: { + suppressTypeErrors: false, + ...rawOptions.cleanups, + }, + compilerOptions: { + ...compilerOptions, + noImplicitAny, + noImplicitThis, + strictNullChecks: compilerStrictNullChecks, + }, + files: collectFileOptions(rawOptions), + filters: collectOptionals(rawOptions.filters), + fixes: { + importExtensions: false, + incompleteTypes: false, + missingProperties: false, + noImplicitAny: false, + noImplicitThis: false, + noInferableTypes: false, + strictNonNullAssertions: false, + ...rawOptions.fixes, + }, + hints: { + react: { + propTypes: + rawOptions.hints?.react?.propTypes ?? ReactPropTypesHint.WhenRequired, + propTypesOptionality: + rawOptions.hints?.react?.propTypesOptionality ?? + ReactPropTypesOptionality.AsWritten, + }, + }, + include: rawOptions.include ?? compilerOptions.include, + mutators: collectAddedMutators( + rawOptions, + packageOptions.directory, + output, + ), + output, + package: packageOptions, + postProcess: { shell }, + projectPath, + types: { + strictNullChecks: typeStrictNullChecks, + }, + }; }; diff --git a/src/options/findRawOptions.ts b/src/options/findRawOptions.ts index 41a7d5092..733d0e616 100644 --- a/src/options/findRawOptions.ts +++ b/src/options/findRawOptions.ts @@ -1,61 +1,71 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ -import * as path from "path"; +import * as path from "node:path"; -import { RawTypeStatOptions } from "./types"; +import { RawTypeStatOptions } from "./types.js"; /** * Results from searching for a raw TypeStat configuration file. */ export interface FoundRawOptions { - /** - * Raw configuration options to run in order. - */ - allRawOptions: RawTypeStatOptions[]; - - /** - * Found file path result, if a file on disk was found. - */ - filePath?: string; + /** + * Raw configuration options to run in order. + */ + allRawOptions: RawTypeStatOptions[]; + + /** + * Found file path result, if a file on disk was found. + */ + filePath?: string; } /** * Parses raw options from a configuration file. - * * @param cwd Base directory to resolve paths from. * @param configPath Suggested path to load from, instead of searching. * @returns Parsed raw options from a configuration file, or an error string. */ -export const findRawOptions = (cwd: string, configPath: string): FoundRawOptions | string => { - const resolutionPath = path.join(cwd, configPath); +export const findRawOptions = ( + cwd: string, + configPath: string, +): FoundRawOptions | string => { + const resolutionPath = path.join(cwd, configPath); - let filePath: string; - try { - filePath = require.resolve(resolutionPath); - } catch { - return configPath === resolutionPath - ? `Could not find config file at '${configPath}'.` - : `Could not find config file at '${configPath}' (resolved to '${resolutionPath}').`; - } + let filePath: string; + try { + filePath = require.resolve(resolutionPath); + } catch { + return configPath === resolutionPath + ? `Could not find config file at '${configPath}'.` + : `Could not find config file at '${configPath}' (resolved to '${resolutionPath}').`; + } - const allRawOptions = extractConfigAsRelative(filePath, require(filePath) as RawTypeStatOptions | RawTypeStatOptions[]); + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-var-requires + const allRawOptions = extractConfigAsRelative(filePath, require(filePath)); - return { filePath, allRawOptions }; + return { allRawOptions, filePath }; }; -const extractConfigAsRelative = (filePath: string, config: RawTypeStatOptions | RawTypeStatOptions[]): RawTypeStatOptions[] => { - return config instanceof Array ? config.map((config) => relativizeConfig(filePath, config)) : [relativizeConfig(filePath, config)]; +const extractConfigAsRelative = ( + filePath: string, + config: RawTypeStatOptions | RawTypeStatOptions[], +): RawTypeStatOptions[] => { + return config instanceof Array + ? config.map((config) => relativizeConfig(filePath, config)) + : [relativizeConfig(filePath, config)]; }; const relativizeConfig = (filePath: string, config: RawTypeStatOptions) => { - if (config.package?.directory !== undefined && !path.isAbsolute(config.package.directory)) { - config = { - ...config, - package: { - ...config.package, - directory: path.join(filePath, config.package.directory), - }, - }; - } - - return config; + if ( + config.package?.directory !== undefined && + !path.isAbsolute(config.package.directory) + ) { + config = { + ...config, + package: { + ...config.package, + directory: path.join(filePath, config.package.directory), + }, + }; + } + + return config; }; diff --git a/src/options/loadPendingOptions.ts b/src/options/loadPendingOptions.ts index e6c3ae402..aee74384e 100644 --- a/src/options/loadPendingOptions.ts +++ b/src/options/loadPendingOptions.ts @@ -1,61 +1,75 @@ -import * as path from "path"; +import * as path from "node:path"; -import { TypeStatArgv } from "../index"; -import { ProcessOutput } from "../output/types"; -import { normalizeAndSlashify } from "../shared/paths"; - -import { fillOutRawOptions } from "./fillOutRawOptions"; -import { findRawOptions } from "./findRawOptions"; -import { findComplaintForOptions } from "./optionVerification"; -import { parseRawCompilerOptions } from "./parseRawCompilerOptions"; -import { PendingTypeStatOptions, RawTypeStatOptions } from "./types"; +import { TypeStatArgv } from "../index.js"; +import { ProcessOutput } from "../output/types.js"; +import { normalizeAndSlashify } from "../shared/paths.js"; +import { fillOutRawOptions } from "./fillOutRawOptions.js"; +import { findRawOptions } from "./findRawOptions.js"; +import { findComplaintForOptions } from "./optionVerification.js"; +import { parseRawCompilerOptions } from "./parseRawCompilerOptions.js"; +import { PendingTypeStatOptions, RawTypeStatOptions } from "./types.js"; /** * Reads pre-file-rename TypeStat options using a config path. - * * @param argv Root arguments passed to TypeStat. * @param output Wraps process and logfile output. * @returns Promise for filled-out TypeStat options, or a string complaint from failing to make them. */ -export const loadPendingOptions = async (argv: TypeStatArgv, output: ProcessOutput): Promise => { - if (argv.config === undefined) { - return "-c/--config file must be provided."; - } - - const cwd = process.cwd(); - const foundRawOptions = findRawOptions(cwd, argv.config); - if (typeof foundRawOptions === "string") { - return foundRawOptions; - } - - const { allRawOptions, filePath } = foundRawOptions; - const results: PendingTypeStatOptions[] = []; - - // Fill out each option in the config with its own separate settings - // (or return the first failure string describing which one is incorrect) - for (let i = 0; i < allRawOptions.length; i += 1) { - const rawOptions = allRawOptions[i]; - const projectPath = getProjectPath(cwd, filePath, rawOptions); - const compilerOptions = await parseRawCompilerOptions(cwd, projectPath); - - const filledOutOptions = fillOutRawOptions({ argv, compilerOptions, cwd, output, projectPath, rawOptions }); - const complaint = findComplaintForOptions(filledOutOptions); - if (complaint) { - return `Invalid options at index ${i}: ${complaint}`; - } - - results.push(filledOutOptions); - } - - return results; +export const loadPendingOptions = async ( + argv: TypeStatArgv, + output: ProcessOutput, +): Promise => { + if (argv.config === undefined) { + return "-c/--config file must be provided."; + } + + const cwd = process.cwd(); + const foundRawOptions = findRawOptions(cwd, argv.config); + if (typeof foundRawOptions === "string") { + return foundRawOptions; + } + + const { allRawOptions, filePath } = foundRawOptions; + const results: PendingTypeStatOptions[] = []; + + // Fill out each option in the config with its own separate settings + // (or return the first failure string describing which one is incorrect) + for (let i = 0; i < allRawOptions.length; i += 1) { + const rawOptions = allRawOptions[i]; + const projectPath = getProjectPath(cwd, filePath, rawOptions); + const compilerOptions = await parseRawCompilerOptions(cwd, projectPath); + + const filledOutOptions = fillOutRawOptions({ + argv, + compilerOptions, + cwd, + output, + projectPath, + rawOptions, + }); + const complaint = findComplaintForOptions(filledOutOptions); + if (complaint) { + return `Invalid options at index ${i}: ${complaint}`; + } + + results.push(filledOutOptions); + } + + return results; }; -const getProjectPath = (cwd: string, filePath: string | undefined, rawOptions: RawTypeStatOptions): string => { - // If the TypeStat configuration file has a projectPath field, use that relative to the file - if (filePath !== undefined && rawOptions.projectPath !== undefined) { - return normalizeAndSlashify(path.join(path.dirname(filePath), rawOptions.projectPath)); - } +const getProjectPath = ( + cwd: string, + filePath: string | undefined, + rawOptions: RawTypeStatOptions, +): string => { + // If the TypeStat configuration file has a projectPath field, use that relative to the file + if (filePath !== undefined && rawOptions.projectPath !== undefined) { + return normalizeAndSlashify( + path.join(path.dirname(filePath), rawOptions.projectPath), + ); + } - // Otherwise give up and try a ./tsconfig.json relative to the package directory - return normalizeAndSlashify(path.join(cwd, "tsconfig.json")); + // Otherwise give up and try a ./tsconfig.json relative to the package directory + return normalizeAndSlashify(path.join(cwd, "tsconfig.json")); }; diff --git a/src/options/optionVerification.ts b/src/options/optionVerification.ts index 2e9cc10ff..79b73c30a 100644 --- a/src/options/optionVerification.ts +++ b/src/options/optionVerification.ts @@ -1,27 +1,31 @@ -import { PendingTypeStatOptions } from "./types"; +import { PendingTypeStatOptions } from "./types.js"; -export const findComplaintForOptions = (options: PendingTypeStatOptions | string): string | undefined => { - if (typeof options === "string") { - return options; - } +export const findComplaintForOptions = ( + options: PendingTypeStatOptions | string, +): string | undefined => { + if (typeof options === "string") { + return options; + } - if (noFixesSpecified(options)) { - return "No fixes or custom mutators specified. Consider enabling fixes.noImplicitAny (see http://github.com/joshuakgoldberg/typestat#cli)."; - } + if (noFixesSpecified(options)) { + return "No fixes or custom mutators specified. Consider enabling fixes.noImplicitAny (see http://github.com/joshuakgoldberg/typestat#cli)."; + } - if (strictNonNullAssertionsInNonStrictMode(options)) { - return "fixes.strictNonNullAssertions specified but not strictNullChecks. Consider enabling types.strictNullChecks (see http://github.com/joshuakgoldberg/typestat/blob/main/docs/Fixes.md)."; - } + if (strictNonNullAssertionsInNonStrictMode(options)) { + return "fixes.strictNonNullAssertions specified but not strictNullChecks. Consider enabling types.strictNullChecks (see http://github.com/joshuakgoldberg/typestat/blob/main/docs/Fixes.md)."; + } - return undefined; + return undefined; }; const noFixesSpecified = (options: PendingTypeStatOptions): boolean => - options.mutators.length === 0 && - !options.fixes.incompleteTypes && - !options.fixes.missingProperties && - !options.fixes.noImplicitAny && - !options.fixes.strictNonNullAssertions; + options.mutators.length === 0 && + !options.fixes.incompleteTypes && + !options.fixes.missingProperties && + !options.fixes.noImplicitAny && + !options.fixes.strictNonNullAssertions; -const strictNonNullAssertionsInNonStrictMode = (options: PendingTypeStatOptions): boolean => - options.fixes.strictNonNullAssertions && !options.types.strictNullChecks; +const strictNonNullAssertionsInNonStrictMode = ( + options: PendingTypeStatOptions, +): boolean => + options.fixes.strictNonNullAssertions && !options.types.strictNullChecks; diff --git a/src/options/parseRawCompilerOptions.ts b/src/options/parseRawCompilerOptions.ts index 6507f9c28..dd2bc99da 100644 --- a/src/options/parseRawCompilerOptions.ts +++ b/src/options/parseRawCompilerOptions.ts @@ -1,44 +1,49 @@ -import minimatch from "minimatch"; import { glob } from "glob"; -import * as fs from "mz/fs"; -import * as path from "path"; -import * as ts from "typescript"; -import { stringifyDiagnosticMessageText } from "../shared/diagnostics"; +import { minimatch } from "minimatch"; +import * as fs from "node:fs"; +import * as fsp from "node:fs/promises"; +import * as path from "node:path"; +import ts from "typescript"; + +import { stringifyDiagnosticMessageText } from "../shared/diagnostics.js"; export interface ParsedCompilerOptions extends ts.CompilerOptions { - include?: string[]; + include?: string[]; } -export const parseRawCompilerOptions = async (cwd: string, projectPath: string): Promise => { - const configRaw = (await fs.readFile(projectPath)).toString(); - const compilerOptions = ts.parseConfigFileTextToJson(projectPath, configRaw); - if (compilerOptions.error !== undefined) { - throw new Error(`Could not parse compiler options from '${projectPath}': ${stringifyDiagnosticMessageText(compilerOptions.error)}`); - } +export const parseRawCompilerOptions = async ( + cwd: string, + projectPath: string, +): Promise => { + const configRaw = (await fsp.readFile(projectPath)).toString(); + const compilerOptions = ts.parseConfigFileTextToJson(projectPath, configRaw); + if (compilerOptions.error !== undefined) { + throw new Error( + `Could not parse compiler options from '${projectPath}': ${stringifyDiagnosticMessageText(compilerOptions.error)}`, + ); + } - const config = compilerOptions.config as ParsedCompilerOptions; + const config = compilerOptions.config as ParsedCompilerOptions; - // TSConfig includes often come in a glob form like ["src"] - if (config.include) { - config.include = ts.parseJsonConfigFileContent( - compilerOptions.config, - { - useCaseSensitiveFileNames: true, - readDirectory: (rootDir, extensions, excludes, includes) => - includes - .flatMap((include) => glob.sync(path.join(rootDir, include))) - .filter( - (filePath) => - !excludes?.some((exclude) => minimatch(filePath, exclude)) && - extensions.some((extension) => filePath.endsWith(extension)), - ) - .map((filePath) => path.relative(rootDir, filePath)), - fileExists: (filePath) => fs.statSync(filePath).isFile(), - readFile: (filePath) => fs.readFileSync(filePath).toString(), - }, - cwd, - ).fileNames; - } + // TSConfig includes often come in a glob form like ["src"] + config.include &&= ts.parseJsonConfigFileContent( + compilerOptions.config, + { + fileExists: (filePath) => fs.statSync(filePath).isFile(), + readDirectory: (rootDir, extensions, excludes, includes) => + includes + .flatMap((include) => glob.sync(path.join(rootDir, include))) + .filter( + (filePath) => + !excludes?.some((exclude) => minimatch(filePath, exclude)) && + extensions.some((extension) => filePath.endsWith(extension)), + ) + .map((filePath) => path.relative(rootDir, filePath)), + readFile: (filePath) => fs.readFileSync(filePath).toString(), + useCaseSensitiveFileNames: true, + }, + cwd, + ).fileNames; - return config; + return config; }; diff --git a/src/options/parsing/collectAddedMutators.ts b/src/options/parsing/collectAddedMutators.ts index 2e4a16244..9ad287db2 100644 --- a/src/options/parsing/collectAddedMutators.ts +++ b/src/options/parsing/collectAddedMutators.ts @@ -1,81 +1,104 @@ -import * as path from "path"; +import Module from "node:module"; +import * as path from "node:path"; -import { ProcessOutput } from "../../output/types"; -import { builtInFileMutators } from "../../mutators/builtIn"; -import { FileMutator } from "../../shared/fileMutator"; -import { collectOptionals } from "../../shared/arrays"; -import { getQuickErrorSummary } from "../../shared/errors"; -import { RawTypeStatOptions } from "../types"; +import { builtInFileMutators } from "../../mutators/builtIn/index.js"; +import { ProcessOutput } from "../../output/types.js"; +import { collectOptionals } from "../../shared/arrays.js"; +import { getQuickErrorSummary } from "../../shared/errors.js"; +import { FileMutator } from "../../shared/fileMutator.js"; +import { RawTypeStatOptions } from "../types.js"; + +const require = Module.createRequire(import.meta.url); interface ImportedFileMutator { - fileMutator: FileMutator; + fileMutator: FileMutator; } /** * Finds mutators to use in runtime, as either the built-in mutators or custom mutators specified by the user. - * * @param rawOptions Options listed as JSON in a typestat configuration file. * @param packageDirectory Base directory to resolve paths from. * @param output Wraps process.stderr and process.stdout. * @returns Mutators to run with their friendly names. */ export const collectAddedMutators = ( - rawOptions: RawTypeStatOptions, - packageDirectory: string, - output: ProcessOutput, -): ReadonlyArray<[string, FileMutator]> => { - const addedMutators = collectOptionals(rawOptions.mutators); - if (addedMutators.length === 0) { - return builtInFileMutators; - } + rawOptions: RawTypeStatOptions, + packageDirectory: string, + output: ProcessOutput, +): readonly [string, FileMutator][] => { + const addedMutators = collectOptionals(rawOptions.mutators); + if (addedMutators.length === 0) { + return builtInFileMutators; + } - const additions: [string, FileMutator][] = []; - for (const rawAddedMutator of addedMutators) { - try { - const addedMutator = collectAddedMutator(packageDirectory, rawAddedMutator, output); + const additions: [string, FileMutator][] = []; + for (const rawAddedMutator of addedMutators) { + try { + const addedMutator = collectAddedMutator( + packageDirectory, + rawAddedMutator, + output, + ); - if (addedMutator !== undefined) { - additions.push([rawAddedMutator, addedMutator]); - } - } catch (error) { - output.stderr(`Could not require ${rawAddedMutator} from ${packageDirectory}.`); - output.stderr(getQuickErrorSummary(error)); - } - } + if (addedMutator !== undefined) { + additions.push([rawAddedMutator, addedMutator]); + } + } catch (error) { + output.stderr( + `Could not require ${rawAddedMutator} from ${packageDirectory}.`, + ); + output.stderr(getQuickErrorSummary(error)); + } + } - return additions; + return additions; }; -const collectAddedMutator = (packageDirectory: string, rawAddedMutator: string, output: ProcessOutput): FileMutator | undefined => { - const requiringPath = path.join(packageDirectory, rawAddedMutator); - const resolvedImport = tryRequireResolve(requiringPath); - if (resolvedImport === undefined) { - output.stderr(`Could not require ${rawAddedMutator} at ${requiringPath} from ${packageDirectory}.`); - output.stderr("It doesn't seem to exist? :("); - return undefined; - } +const collectAddedMutator = ( + packageDirectory: string, + rawAddedMutator: string, + output: ProcessOutput, +): FileMutator | undefined => { + const requiringPath = path.join(packageDirectory, rawAddedMutator); + const resolvedImport = tryRequireResolve(requiringPath); + if (resolvedImport === undefined) { + output.stderr( + `Could not require ${rawAddedMutator} at ${requiringPath} from ${packageDirectory}.`, + ); + output.stderr("It doesn't seem to exist? :("); + return undefined; + } - const result = require(requiringPath) as Partial; + const result = require(requiringPath) as + | ImportedFileMutator + | Record; - if (typeof result.fileMutator !== "function") { - output.stderr(`Could not require ${rawAddedMutator} from ${packageDirectory}.`); + if (typeof result.fileMutator !== "function") { + output.stderr( + `Could not require ${rawAddedMutator} from ${packageDirectory}.`, + ); - if (result.fileMutator === undefined) { - output.stderr(`It doesn't have an exported .fileMutator, which must be a function.`); - } else { - output.stderr(`Its exported .fileMutator is ${typeof result.fileMutator} intead of function.`); - } + if (result.fileMutator === undefined) { + output.stderr( + `It doesn't have an exported .fileMutator, which must be a function.`, + ); + } else { + output.stderr( + `Its exported .fileMutator is ${typeof result.fileMutator} instead of function.`, + ); + } - return undefined; - } + return undefined; + } - return result.fileMutator; + return (result as ImportedFileMutator).fileMutator; }; const tryRequireResolve = (requiringPath: string): string | undefined => { - try { - return require.resolve(requiringPath); - } catch (error) { - return undefined; - } + try { + return require.resolve(requiringPath); + } catch (error) { + console.warn(error); + return undefined; + } }; diff --git a/src/options/parsing/collectFileOptions.ts b/src/options/parsing/collectFileOptions.ts index e2c18267b..4b3dae5ef 100644 --- a/src/options/parsing/collectFileOptions.ts +++ b/src/options/parsing/collectFileOptions.ts @@ -1,11 +1,12 @@ -import { Files, RawTypeStatOptions } from "../types"; +import { Files, RawTypeStatOptions } from "../types.js"; export const collectFileOptions = (rawOptions: RawTypeStatOptions): Files => { - const files: Partial = rawOptions.files === undefined ? {} : { ...rawOptions.files }; + const files: Partial = + rawOptions.files === undefined ? {} : { ...rawOptions.files }; - return { - above: files.above === undefined ? "" : files.above, - below: files.below === undefined ? "" : files.below, - renameExtensions: files.renameExtensions === undefined ? false : files.renameExtensions, - }; + return { + above: files.above ?? "", + below: files.below ?? "", + renameExtensions: files.renameExtensions ?? false, + }; }; diff --git a/src/options/parsing/collectNoImplicitAny.ts b/src/options/parsing/collectNoImplicitAny.ts index bd043ae07..2641555f7 100644 --- a/src/options/parsing/collectNoImplicitAny.ts +++ b/src/options/parsing/collectNoImplicitAny.ts @@ -1,15 +1,18 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { RawTypeStatOptions } from "../types"; +import { RawTypeStatOptions } from "../types.js"; -export const collectNoImplicitAny = (compilerOptions: Readonly, rawOptions: RawTypeStatOptions): boolean => { - if (rawOptions.fixes !== undefined && rawOptions.fixes.noImplicitAny !== undefined) { - return rawOptions.fixes.noImplicitAny; - } +export const collectNoImplicitAny = ( + compilerOptions: Readonly, + rawOptions: RawTypeStatOptions, +): boolean => { + if (rawOptions.fixes?.noImplicitAny !== undefined) { + return rawOptions.fixes.noImplicitAny; + } - if (compilerOptions.noImplicitAny !== undefined) { - return compilerOptions.noImplicitAny; - } + if (compilerOptions.noImplicitAny !== undefined) { + return compilerOptions.noImplicitAny; + } - return false; + return false; }; diff --git a/src/options/parsing/collectNoImplicitThis.ts b/src/options/parsing/collectNoImplicitThis.ts index b29e3047e..f4b8ae25c 100644 --- a/src/options/parsing/collectNoImplicitThis.ts +++ b/src/options/parsing/collectNoImplicitThis.ts @@ -1,15 +1,18 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { RawTypeStatOptions } from "../types"; +import { RawTypeStatOptions } from "../types.js"; -export const collectNoImplicitThis = (compilerOptions: Readonly, rawOptions: RawTypeStatOptions): boolean => { - if (rawOptions.fixes !== undefined && rawOptions.fixes.noImplicitThis !== undefined) { - return rawOptions.fixes.noImplicitThis; - } +export const collectNoImplicitThis = ( + compilerOptions: Readonly, + rawOptions: RawTypeStatOptions, +): boolean => { + if (rawOptions.fixes?.noImplicitThis !== undefined) { + return rawOptions.fixes.noImplicitThis; + } - if (compilerOptions.noImplicitThis !== undefined) { - return compilerOptions.noImplicitThis; - } + if (compilerOptions.noImplicitThis !== undefined) { + return compilerOptions.noImplicitThis; + } - return false; + return false; }; diff --git a/src/options/parsing/collectPackageOptions.ts b/src/options/parsing/collectPackageOptions.ts index 5e7063452..3f6e943d1 100644 --- a/src/options/parsing/collectPackageOptions.ts +++ b/src/options/parsing/collectPackageOptions.ts @@ -1,29 +1,35 @@ -import * as path from "path"; +import * as path from "node:path"; -import { normalizeAndSlashify } from "../../shared/paths"; -import { Package, RawTypeStatOptions } from "../types"; +import { normalizeAndSlashify } from "../../shared/paths.js"; +import { Package, RawTypeStatOptions } from "../types.js"; -export const collectPackageOptions = (cwd: string, rawOptions: RawTypeStatOptions): Package => { - const rawPackageOptions = rawOptions.package === undefined ? {} : rawOptions.package; - const rawPackageFile = rawPackageOptions.file; +export const collectPackageOptions = ( + cwd: string, + rawOptions: RawTypeStatOptions, +): Package => { + const rawPackageOptions = rawOptions.package ?? {}; + const rawPackageFile = rawPackageOptions.file; - const file = collectRawPackageFile(cwd, rawPackageFile); + const file = collectRawPackageFile(cwd, rawPackageFile); - return { - directory: cwd, - file, - missingTypes: rawPackageOptions.missingTypes, - }; + return { + directory: cwd, + file, + missingTypes: rawPackageOptions.missingTypes, + }; }; -const collectRawPackageFile = (cwd: string, rawPackageFile: string | undefined) => { - if (rawPackageFile === undefined) { - return normalizeAndSlashify(path.join(cwd, "package.json")); - } +const collectRawPackageFile = ( + cwd: string, + rawPackageFile: string | undefined, +) => { + if (rawPackageFile === undefined) { + return normalizeAndSlashify(path.join(cwd, "package.json")); + } - if (path.isAbsolute(rawPackageFile)) { - return normalizeAndSlashify(rawPackageFile); - } + if (path.isAbsolute(rawPackageFile)) { + return normalizeAndSlashify(rawPackageFile); + } - return normalizeAndSlashify(path.join(cwd, rawPackageFile)); + return normalizeAndSlashify(path.join(cwd, rawPackageFile)); }; diff --git a/src/options/parsing/collectStrictNullChecks.ts b/src/options/parsing/collectStrictNullChecks.ts index 629fc356c..d7694e4b1 100644 --- a/src/options/parsing/collectStrictNullChecks.ts +++ b/src/options/parsing/collectStrictNullChecks.ts @@ -1,29 +1,35 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { RawTypeStatTypeOptions } from "../types"; +import { RawTypeStatTypeOptions } from "../types.js"; -export const collectStrictNullChecks = (compilerOptions: Readonly, rawOptionTypes: RawTypeStatTypeOptions) => { - const typeStrictNullChecks = rawOptionTypes.strictNullChecks; - const compilerStrictNullChecks = collectCompilerStrictNullChecks(compilerOptions, typeStrictNullChecks); +export const collectStrictNullChecks = ( + compilerOptions: Readonly, + rawOptionTypes: RawTypeStatTypeOptions, +) => { + const typeStrictNullChecks = rawOptionTypes.strictNullChecks; + const compilerStrictNullChecks = collectCompilerStrictNullChecks( + compilerOptions, + typeStrictNullChecks, + ); - return { compilerStrictNullChecks, typeStrictNullChecks }; + return { compilerStrictNullChecks, typeStrictNullChecks }; }; const collectCompilerStrictNullChecks = ( - compilerOptions: Readonly, - typeStrictNullChecks: boolean | undefined, + compilerOptions: Readonly, + typeStrictNullChecks: boolean | undefined, ): boolean => { - if (typeStrictNullChecks !== undefined) { - return typeStrictNullChecks; - } + if (typeStrictNullChecks !== undefined) { + return typeStrictNullChecks; + } - if (compilerOptions.strictNullChecks !== undefined) { - return compilerOptions.strictNullChecks; - } + if (compilerOptions.strictNullChecks !== undefined) { + return compilerOptions.strictNullChecks; + } - if (compilerOptions.strict !== undefined) { - return compilerOptions.strict; - } + if (compilerOptions.strict !== undefined) { + return compilerOptions.strict; + } - return false; + return false; }; diff --git a/src/options/types.ts b/src/options/types.ts index 811a2871a..9fdf22926 100644 --- a/src/options/types.ts +++ b/src/options/types.ts @@ -1,313 +1,311 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutator } from "../shared/fileMutator"; -import { ProcessOutput } from "../output/types"; -import { ReactPropTypesHint, ReactPropTypesOptionality } from "./enums"; +import { ProcessOutput } from "../output/types.js"; +import { FileMutator } from "../shared/fileMutator.js"; +import { ReactPropTypesHint, ReactPropTypesOptionality } from "./enums.js"; /** * Options listed as JSON in a typestat configuration file. - * - * @remarks These are read from disk and parsed into {@link PendingTypeStatOptions}. + * These are read from disk and parsed into {@link PendingTypeStatOptions}. */ export interface RawTypeStatOptions { - /** - * Directives for file-level changes. - */ - readonly files?: Readonly>; - - /** - * Any tsquery filters to exclude within files. - */ - readonly filters?: readonly string[]; - - /** - * Which fixes (type mutations) are enabled. - */ - readonly fixes?: Partial; - - /** - * Behavior requests around how to infer types. - */ - readonly hints?: Partial; - - /** - * Globs of files to run on, if not everything in the TypeScript project. - */ - readonly include?: readonly string[]; - - /** - * Any user-defined mutators to apply after the built-in mutators. - */ - readonly mutators?: readonly string[]; - - /** - * Directives for project-level changes. - */ - readonly package?: Readonly>; - - /** - * Hooks to run after mutations are complete. - */ - readonly postProcess?: Readonly>; - - /** - * Path to a TypeScript configuration file, if not "tsconfig.json". - */ - readonly projectPath?: string; - - /** - * Which post-run cleanups are enabled. - */ - readonly cleanups?: Partial; - - /** - * Options for which types to add under what aliases. - */ - readonly types?: RawTypeStatTypeOptions; + /** + * Which post-run cleanups are enabled. + */ + readonly cleanups?: Partial; + + /** + * Directives for file-level changes. + */ + readonly files?: Readonly>; + + /** + * Any tsquery filters to exclude within files. + */ + readonly filters?: readonly string[]; + + /** + * Which fixes (type mutations) are enabled. + */ + readonly fixes?: Partial; + + /** + * Behavior requests around how to infer types. + */ + readonly hints?: Partial; + + /** + * Globs of files to run on, if not everything in the TypeScript project. + */ + readonly include?: readonly string[]; + + /** + * Any user-defined mutators to apply after the built-in mutators. + */ + readonly mutators?: readonly string[]; + + /** + * Directives for project-level changes. + */ + readonly package?: Readonly>; + + /** + * Hooks to run after mutations are complete. + */ + readonly postProcess?: Readonly>; + + /** + * Path to a TypeScript configuration file, if not "tsconfig.json". + */ + readonly projectPath?: string; + + /** + * Options for which types to add under what aliases. + */ + readonly types?: RawTypeStatTypeOptions; } /** * Options for which types to add under what aliases. */ export interface RawTypeStatTypeOptions { - /** - * Whether to add `null` and `undefined` as per TypeScript's --strictNullChecks. - */ - strictNullChecks?: boolean; + /** + * Whether to add `null` and `undefined` as per TypeScript's --strictNullChecks. + */ + strictNullChecks?: boolean; } /** * Common parsed runtime options for TypeStat. */ export interface BaseTypeStatOptions { - /** - * Parsed TypeScript compiler options with relevant fields filled out. - */ - readonly compilerOptions: Readonly; - - /** - * Directives for file-level changes. - */ - readonly files: Readonly; - - /** - * Any tsquery filters to exclude within files. - */ - readonly filters?: readonly string[]; - - /** - * Whether each fix (type mutation) is enabled. - */ - readonly fixes: Readonly; - - /** - * Behavior requests around how to infer types. - */ - readonly hints: RuntimeHints; - - /** - * Mutators to run, as either the built-in mutators or custom mutators specified by the user. - */ - readonly mutators: readonly [string, FileMutator][]; - - /** - * Wraps process and logfile output. - */ - readonly output: ProcessOutput; - - /** - * Directives for project-level changes. - */ - readonly package: Readonly; - - /** - * Hooks to run after mutations are complete. - */ - readonly postProcess: Readonly; - - /** - * Path to a tsconfig.json file. - */ - readonly projectPath: string; - - /** - * Whether each post-run cleanup is enabled. - */ - readonly cleanups: Readonly; - - /** - * Options for which types to add under what aliases. - */ - readonly types: TypeStatTypeOptions; + /** + * Whether each post-run cleanup is enabled. + */ + readonly cleanups: Readonly; + + /** + * Parsed TypeScript compiler options with relevant fields filled out. + */ + readonly compilerOptions: Readonly; + + /** + * Directives for file-level changes. + */ + readonly files: Readonly; + + /** + * Any tsquery filters to exclude within files. + */ + readonly filters?: readonly string[]; + + /** + * Whether each fix (type mutation) is enabled. + */ + readonly fixes: Readonly; + + /** + * Behavior requests around how to infer types. + */ + readonly hints: RuntimeHints; + + /** + * Mutators to run, as either the built-in mutators or custom mutators specified by the user. + */ + readonly mutators: readonly [string, FileMutator][]; + + /** + * Wraps process and logfile output. + */ + readonly output: ProcessOutput; + + /** + * Directives for project-level changes. + */ + readonly package: Readonly; + + /** + * Hooks to run after mutations are complete. + */ + readonly postProcess: Readonly; + + /** + * Path to a tsconfig.json file. + */ + readonly projectPath: string; + + /** + * Options for which types to add under what aliases. + */ + readonly types: TypeStatTypeOptions; } /** * Parsed runtime options for TypeStat after file renames and before loading files. - * - * @remarks These have includes globbed from disks to turn into {@link TypeStatOptions}. + * These have includes globbed from disks to turn into {@link TypeStatOptions}. */ export interface PendingTypeStatOptions extends BaseTypeStatOptions { - /** - * Globs of files to run on, if not everything in the TypeScript project. - */ - readonly include?: readonly string[]; + /** + * Globs of files to run on, if not everything in the TypeScript project. + */ + readonly include?: readonly string[]; } /** * Parsed runtime options for TypeStat after file renames and loading files are done. */ export interface TypeStatOptions extends BaseTypeStatOptions { - /** - * File names to run on, as globbed by the include globs. - */ - readonly fileNames: readonly string[]; + /** + * File names to run on, as globbed by the include globs. + */ + readonly fileNames: readonly string[]; } /** * Parsed TypeScript compiler options with relevant fields filled out. */ export type TypeStatCompilerOptions = ts.CompilerOptions & { - noImplicitAny: boolean; - noImplicitThis: boolean; - strictNullChecks: boolean; + noImplicitAny: boolean; + noImplicitThis: boolean; + strictNullChecks: boolean; }; /** * Directives for file-level changes. */ export interface Files { - /** - * Comment to add above modified files, if any. - */ - above: string; - - /** - * Comment to add below modified files, if any. - */ - below: string; - - /** - * Whether to convert .js(x) files to .ts(x). - */ - renameExtensions: RenameExtensions; + /** + * Comment to add above modified files, if any. + */ + above: string; + + /** + * Comment to add below modified files, if any. + */ + below: string; + + /** + * Whether to convert .js(x) files to .ts(x). + */ + renameExtensions: RenameExtensions; } /** * Setting value for whether to convert .js(x) files to .ts(x). */ -export type RenameExtensions = boolean | "ts" | "tsx"; +export type RenameExtensions = "ts" | "tsx" | boolean; /** * Cross-file settings for forms of fixes. */ export interface Fixes { - /** - * Whether to add extensions to export and import declarations that refer to file paths without them. - */ - importExtensions: boolean; - - /** - * Whether to augment existing type annotations that cause errors when different types are used. - */ - incompleteTypes: boolean; - - /** - * Whether to fill in missing properties per TypeScript's code fixes. - */ - missingProperties: boolean; - - /** - * Whether to add type annotations to types that don't yet have them per TypeScript's --noImplicitAny. - */ - noImplicitAny: boolean; - - /** - * Whether to add type annotations to functions that don't yet have them per TypeScript's --noImplicitThis. - */ - noImplicitThis: boolean; - - /** - * Whether to remove type annotations that don't change the meaning of code. - */ - noInferableTypes: boolean; - - /** - * Whether to add missing non-null assertions in nullable property accesses, function-like calls, and return types. - */ - strictNonNullAssertions: boolean; + /** + * Whether to add extensions to export and import declarations that refer to file paths without them. + */ + importExtensions: boolean; + + /** + * Whether to augment existing type annotations that cause errors when different types are used. + */ + incompleteTypes: boolean; + + /** + * Whether to fill in missing properties per TypeScript's code fixes. + */ + missingProperties: boolean; + + /** + * Whether to add type annotations to types that don't yet have them per TypeScript's --noImplicitAny. + */ + noImplicitAny: boolean; + + /** + * Whether to add type annotations to functions that don't yet have them per TypeScript's --noImplicitThis. + */ + noImplicitThis: boolean; + + /** + * Whether to remove type annotations that don't change the meaning of code. + */ + noInferableTypes: boolean; + + /** + * Whether to add missing non-null assertions in nullable property accesses, function-like calls, and return types. + */ + strictNonNullAssertions: boolean; } /** * Behavior requests around how to infer types. */ export interface RuntimeHints { - /** - * Behavior requests around how to infer React types. - */ - react: RuntimeReactHints; + /** + * Behavior requests around how to infer React types. + */ + react: RuntimeReactHints; } /** * Behavior requests around how to infer React types. */ export interface RuntimeReactHints { - /** - * Whether and how to use components' propTypes for inferences. - */ - propTypes: ReactPropTypesHint; - - /** - * Whether to make propType inferences optional and/or required. - */ - propTypesOptionality: ReactPropTypesOptionality; + /** + * Whether and how to use components' propTypes for inferences. + */ + propTypes: ReactPropTypesHint; + + /** + * Whether to make propType inferences optional and/or required. + */ + propTypesOptionality: ReactPropTypesOptionality; } /** * Directives for package-level changes. */ export interface Package { - /** - * Working directory to base paths off of. - */ - directory: string; - - /** - * Path to a package.json to consider the project's package. - */ - file: string; - - /** - * Package manager to install missing types, if not `true` to auto-detect or `undefined` to not. - */ - missingTypes: true | "npm" | "yarn" | undefined; + /** + * Working directory to base paths off of. + */ + directory: string; + + /** + * Path to a package.json to consider the project's package. + */ + file: string; + + /** + * Package manager to install missing types, if not `true` to auto-detect or `undefined` to not. + */ + missingTypes: "npm" | "yarn" | true | undefined; } /** * Hooks to run after mutations are complete. */ export interface PostProcess { - /** - * Shell commands to execute in order after mutations on mutated file paths. - */ - shell: readonly (readonly string[])[]; + /** + * Shell commands to execute in order after mutations on mutated file paths. + */ + shell: readonly (readonly string[])[]; } /** * Cleanups to run after fixing is done. */ export interface Cleanups { - /** - * Whether to suppress TypeScript type errors with comment directives. - */ - suppressTypeErrors: boolean; + /** + * Whether to suppress TypeScript type errors with comment directives. + */ + suppressTypeErrors: boolean; } /** * Options for which types to add under what aliases. */ export interface TypeStatTypeOptions { - /** - * Whether to consider `null` and `undefined` as per TypeScript's --strictNullChecks. - */ - strictNullChecks?: boolean; + /** + * Whether to consider `null` and `undefined` as per TypeScript's --strictNullChecks. + */ + strictNullChecks?: boolean; } diff --git a/src/output/createProcessOutput.ts b/src/output/createProcessOutput.ts index 08f084cd6..344fc0bb2 100644 --- a/src/output/createProcessOutput.ts +++ b/src/output/createProcessOutput.ts @@ -1,33 +1,38 @@ -import stripAnsi from "strip-ansi"; -import { fs } from "mz"; +import * as fs from "node:fs"; import { EOL } from "os"; -import { ProcessOutput } from "./types"; +import stripAnsi from "strip-ansi"; + +import { ProcessOutput } from "./types.js"; export const createProcessOutput = (logFile?: string): ProcessOutput => { - const log = createLogfileOutput(logFile); + const log = createLogfileOutput(logFile); - const wrapStream = (prefix: string, stream: NodeJS.WriteStream) => { - return (line: string) => { - stream.write(line + EOL); - log?.(stripAnsi(`[${prefix}] ${line.replace(/^\r\n|\r|\n/g, "").replace(/\r\n|\r|\n$/g, "")}`)); - }; - }; + const wrapStream = (prefix: string, stream: NodeJS.WriteStream) => { + return (line: string) => { + stream.write(line + EOL); + log?.( + stripAnsi( + `[${prefix}] ${line.replace(/^\r\n|\r|\n/g, "").replace(/\r\n|\r|\n$/g, "")}`, + ), + ); + }; + }; - return { - log: (line: string) => log?.(`[log] ${line}`), - stderr: wrapStream("stderr", process.stderr), - stdout: wrapStream("stdout", process.stdout), - }; + return { + log: (line: string) => log?.(`[log] ${line}`), + stderr: wrapStream("stderr", process.stderr), + stdout: wrapStream("stdout", process.stdout), + }; }; const createLogfileOutput = (logFile?: string) => { - if (!logFile) { - return undefined; - } + if (!logFile) { + return undefined; + } - const file = fs.openSync(logFile, "w"); + const file = fs.openSync(logFile, "w"); - return (line: string) => { - fs.appendFileSync(file, line + EOL); - }; + return (line: string) => { + fs.appendFileSync(file, line + EOL); + }; }; diff --git a/src/output/pluralize.ts b/src/output/pluralize.ts index dbbcfd8d8..714703c85 100644 --- a/src/output/pluralize.ts +++ b/src/output/pluralize.ts @@ -1,3 +1,3 @@ export const pluralize = (count: number, word: string, suffix = "s") => { - return count === 1 ? word : `${word}${suffix}`; + return count === 1 ? word : `${word}${suffix}`; }; diff --git a/src/output/types.ts b/src/output/types.ts index 8dd47e781..7997f79ab 100644 --- a/src/output/types.ts +++ b/src/output/types.ts @@ -7,18 +7,18 @@ export type WriteLogLine = (line: string) => void; * Wraps process and logfile output. */ export interface ProcessOutput { - /** - * Logs only to the file system logfile, if one was requested. - */ - readonly log?: WriteLogLine; + /** + * Logs only to the file system logfile, if one was requested. + */ + readonly log?: WriteLogLine; - /** - * Standard CLI output for error logs. - */ - readonly stderr: WriteLogLine; + /** + * Standard CLI output for error logs. + */ + readonly stderr: WriteLogLine; - /** - * Standard CLI output for output logs. - */ - readonly stdout: WriteLogLine; + /** + * Standard CLI output for output logs. + */ + readonly stdout: WriteLogLine; } diff --git a/src/runtime/collectFilteredNodes.ts b/src/runtime/collectFilteredNodes.ts index f921c8c25..155b2fab3 100644 --- a/src/runtime/collectFilteredNodes.ts +++ b/src/runtime/collectFilteredNodes.ts @@ -1,20 +1,23 @@ import { tsquery } from "@phenomnomnominal/tsquery"; -import * as ts from "typescript"; +import ts from "typescript"; -import { TypeStatOptions } from "../options/types"; +import { TypeStatOptions } from "../options/types.js"; -export const collectFilteredNodes = (options: TypeStatOptions, sourceFile: ts.SourceFile) => { - const filteredNodes = new Set(); +export const collectFilteredNodes = ( + options: TypeStatOptions, + sourceFile: ts.SourceFile, +) => { + const filteredNodes = new Set(); - if (options.filters === undefined) { - return filteredNodes; - } + if (options.filters === undefined) { + return filteredNodes; + } - for (const filter of options.filters) { - for (const node of tsquery(sourceFile, filter)) { - filteredNodes.add(node); - } - } + for (const filter of options.filters) { + for (const node of tsquery(sourceFile, filter)) { + filteredNodes.add(node); + } + } - return filteredNodes; + return filteredNodes; }; diff --git a/src/runtime/createFileNamesAndServices.ts b/src/runtime/createFileNamesAndServices.ts index 57bd14a41..4807e277c 100644 --- a/src/runtime/createFileNamesAndServices.ts +++ b/src/runtime/createFileNamesAndServices.ts @@ -1,9 +1,9 @@ -import { TypeStatOptions } from "../options/types"; -import { createLanguageServices } from "../services/language"; +import { TypeStatOptions } from "../options/types.js"; +import { createLanguageServices } from "../services/language.js"; export const createFileNamesAndServices = (options: TypeStatOptions) => { - const services = createLanguageServices(options); - const fileNames = options.fileNames; + const services = createLanguageServices(options); + const fileNames = options.fileNames; - return { fileNames, services }; + return { fileNames, services }; }; diff --git a/src/runtime/createProviderFromProviders.ts b/src/runtime/createProviderFromProviders.ts index ec6d7fb87..2677408d2 100644 --- a/src/runtime/createProviderFromProviders.ts +++ b/src/runtime/createProviderFromProviders.ts @@ -1,47 +1,50 @@ import { MutationsWave } from "automutate"; -import { TypeStatOptions } from "../options/types"; -import { Provider, ProviderCreator } from "./types"; +import { TypeStatOptions } from "../options/types.js"; +import { Provider, ProviderCreator } from "./types.js"; /** * Creates a provider that runs through a series of providers. - * - * @param providers Providers to return changes from, in order. + * @param options Parsed runtime options for TypeStat. + * @param providerCreators Creators of providers to return changes from, in order. * @returns Single provider equivalent to the given providers, in order. */ -export const createProviderFromProviders = (options: TypeStatOptions, providerCreators: ProviderCreator[]) => { - let index = -1; - let provider: Provider | undefined; - - const multiProvider = async (): Promise => { - if (!provider) { - for (index += 1; index < providerCreators.length; index += 1) { - provider = providerCreators[index](options); - - if (provider) { - break; - } - } - - if (!provider) { - return { fileMutations: undefined }; - } - } - - const results = await provider(); - if (!results) { - provider = undefined; - return multiProvider(); - } - - options = results.newOptions ?? options; - - if (results.mutationsWave?.fileMutations === undefined) { - return { fileMutations: undefined }; - } - - return results.mutationsWave; - }; - - return multiProvider; +export const createProviderFromProviders = ( + options: TypeStatOptions, + providerCreators: ProviderCreator[], +) => { + let index = -1; + let provider: Provider | undefined; + + const multiProvider = async (): Promise => { + if (!provider) { + for (index += 1; index < providerCreators.length; index += 1) { + provider = providerCreators[index](options); + + if (provider) { + break; + } + } + + if (!provider) { + return { fileMutations: undefined }; + } + } + + const results = await provider(); + if (!results) { + provider = undefined; + return multiProvider(); + } + + options = results.newOptions ?? options; + + if (results.mutationsWave?.fileMutations === undefined) { + return { fileMutations: undefined }; + } + + return results.mutationsWave; + }; + + return multiProvider; }; diff --git a/src/runtime/createSingleUseProvider.ts b/src/runtime/createSingleUseProvider.ts index 38cccfd89..436964da9 100644 --- a/src/runtime/createSingleUseProvider.ts +++ b/src/runtime/createSingleUseProvider.ts @@ -1,36 +1,38 @@ import chalk from "chalk"; import { EOL } from "os"; -import { TypeStatOptions } from "../options/types"; -import { ProvidedMutationsWave, Provider, ProviderCreator } from "./types"; +import { TypeStatOptions } from "../options/types.js"; +import { ProvidedMutationsWave, Provider, ProviderCreator } from "./types.js"; /** * Creates a provider that will run exactly once. - * * @param message Message to log before and after running. - * @param provider Provider to wrap around. + * @param providerCreator Creates a provider to wrap around. * @returns Single-use equivalent of the provider. */ -export const createSingleUseProvider = (message: string, providerCreator: ProviderCreator) => { - return (options: TypeStatOptions): Provider | undefined => { - const provider = providerCreator(options); - if (!provider) { - return undefined; - } +export const createSingleUseProvider = ( + message: string, + providerCreator: ProviderCreator, +) => { + return (options: TypeStatOptions): Provider | undefined => { + const provider = providerCreator(options); + if (!provider) { + return undefined; + } - let provided = false; + let provided = false; - return async (): Promise => { - if (provided) { - return undefined; - } + return async (): Promise => { + if (provided) { + return undefined; + } - options.output.stdout(chalk.blue(`${message}...`)); - const result = await provider(); - options.output.stdout(chalk.blueBright(`Done.${EOL}`)); + options.output.stdout(chalk.blue(`${message}...`)); + const result = await provider(); + options.output.stdout(chalk.blueBright(`Done.${EOL}`)); - provided = true; - return result; - }; - }; + provided = true; + return result; + }; + }; }; diff --git a/src/runtime/createTypeStatProvider.ts b/src/runtime/createTypeStatProvider.ts index 0414a0a9b..757889080 100644 --- a/src/runtime/createTypeStatProvider.ts +++ b/src/runtime/createTypeStatProvider.ts @@ -1,31 +1,32 @@ import { MutationsProvider } from "automutate"; -import { TypeStatOptions } from "../options/types"; - -import { createProviderFromProviders } from "./createProviderFromProviders"; -import { createCoreMutationsProvider } from "./providers/createCoreMutationsProvider"; -import { createFileRenamesProvider } from "./providers/createFileRenamesProvider"; -import { createInstallMissingTypesProvider } from "./providers/createInstallMissingTypesProvider"; -import { createMarkFilesModifiedProvider } from "./providers/createMarkFilesModifiedProvider"; -import { createPostProcessingProvider } from "./providers/createPostProcessingProvider"; -import { createRequireRenameProvider } from "./providers/createRequireRenameProvider"; -import { createCleanupsProvider } from "./providers/createCleanupsProvider"; +import { TypeStatOptions } from "../options/types.js"; +import { createProviderFromProviders } from "./createProviderFromProviders.js"; +import { createCleanupsProvider } from "./providers/createCleanupsProvider.js"; +import { createCoreMutationsProvider } from "./providers/createCoreMutationsProvider.js"; +import { createFileRenamesProvider } from "./providers/createFileRenamesProvider/index.js"; +import { createInstallMissingTypesProvider } from "./providers/createInstallMissingTypesProvider.js"; +import { createMarkFilesModifiedProvider } from "./providers/createMarkFilesModifiedProvider.js"; +import { createPostProcessingProvider } from "./providers/createPostProcessingProvider.js"; +import { createRequireRenameProvider } from "./providers/createRequireRenameProvider.js"; /** * Creates a mutations provider that mutates files, then marks them as mutated. */ -export const createTypeStatProvider = (options: TypeStatOptions): MutationsProvider => { - const allModifiedFiles = new Set(); +export const createTypeStatProvider = ( + options: TypeStatOptions, +): MutationsProvider => { + const allModifiedFiles = new Set(); - return { - provide: createProviderFromProviders(options, [ - createFileRenamesProvider(allModifiedFiles), - createInstallMissingTypesProvider(), - createRequireRenameProvider(allModifiedFiles), - createCoreMutationsProvider(allModifiedFiles), - createCleanupsProvider(allModifiedFiles), - createMarkFilesModifiedProvider(allModifiedFiles), - createPostProcessingProvider(allModifiedFiles), - ]), - }; + return { + provide: createProviderFromProviders(options, [ + createFileRenamesProvider(allModifiedFiles), + createInstallMissingTypesProvider(), + createRequireRenameProvider(allModifiedFiles), + createCoreMutationsProvider(allModifiedFiles), + createCleanupsProvider(allModifiedFiles), + createMarkFilesModifiedProvider(allModifiedFiles), + createPostProcessingProvider(allModifiedFiles), + ]), + }; }; diff --git a/src/runtime/findMutationsInFile.ts b/src/runtime/findMutationsInFile.ts index d08af91b4..034a7a6bd 100644 --- a/src/runtime/findMutationsInFile.ts +++ b/src/runtime/findMutationsInFile.ts @@ -1,25 +1,25 @@ import { Mutation } from "automutate"; import { EOL } from "os"; -import { MutationsComplaint } from "../mutators/complaint"; -import { FileMutationsRequest, FileMutator } from "../shared/fileMutator"; -import { findFirstMutations } from "../shared/runtime"; +import { MutationsComplaint } from "../mutators/complaint.js"; +import { FileMutationsRequest, FileMutator } from "../shared/fileMutator.js"; +import { findFirstMutations } from "../shared/runtime.js"; /** * Collects all mutations that should apply to a file. */ export const findMutationsInFile = ( - request: FileMutationsRequest, - mutators: readonly [string, FileMutator][], + request: FileMutationsRequest, + mutators: readonly [string, FileMutator][], ): readonly Mutation[] | undefined => { - let mutations = findFirstMutations(request, mutators); - if (mutations instanceof MutationsComplaint) { - request.options.output.stderr( - `${EOL}Error in ${request.sourceFile.fileName} with ${mutations.mutatorPath.join(" > ")}: ${mutations.error.stack}${EOL}${EOL}`, - ); + let mutations = findFirstMutations(request, mutators); + if (mutations instanceof MutationsComplaint) { + request.options.output.stderr( + `${EOL}Error in ${request.sourceFile.fileName} with ${mutations.mutatorPath.join(" > ")}: ${mutations.error.stack}${EOL}${EOL}`, + ); - mutations = undefined; - } + mutations = undefined; + } - return mutations; + return mutations; }; diff --git a/src/runtime/providers/createCleanupsProvider.ts b/src/runtime/providers/createCleanupsProvider.ts index d16c99785..01cc66155 100644 --- a/src/runtime/providers/createCleanupsProvider.ts +++ b/src/runtime/providers/createCleanupsProvider.ts @@ -1,62 +1,70 @@ import { Mutation } from "automutate"; -import { convertMapToObject, Dictionary } from "../../shared/maps"; -import { createFileNamesAndServices } from "../createFileNamesAndServices"; -import { createSingleUseProvider } from "../createSingleUseProvider"; -import { suppressRemainingTypeIssues } from "../../cleanups/builtin/suppressTypeErrors"; -import { FileInfoCache } from "../../shared/FileInfoCache"; -import { collectFilteredNodes } from "../collectFilteredNodes"; -import { NameGenerator } from "../../shared/NameGenerator"; -import { findMutationsInFile } from "../findMutationsInFile"; +import { suppressRemainingTypeIssues } from "../../cleanups/builtin/suppressTypeErrors/index.js"; +import { FileInfoCache } from "../../shared/FileInfoCache.js"; +import { NameGenerator } from "../../shared/NameGenerator.js"; +import { Dictionary, convertMapToObject } from "../../shared/maps.js"; +import { collectFilteredNodes } from "../collectFilteredNodes.js"; +import { createFileNamesAndServices } from "../createFileNamesAndServices.js"; +import { createSingleUseProvider } from "../createSingleUseProvider.js"; +import { findMutationsInFile } from "../findMutationsInFile.js"; /** * Creates a mutations provider that applies post-fix cleanups. - * - * @param allModifiedFileNames Set to mark names of all files that were modified. + * @param allModifiedFiles Set to mark names of all files that were modified. * @returns Provider to apply post-fix cleanups, if needed. */ export const createCleanupsProvider = (allModifiedFiles: Set) => { - return createSingleUseProvider("Applying post-fix cleanups", (options) => { - if (!Object.values(options.cleanups).filter(Boolean).length) { - return undefined; - } - - return () => { - const fileMutations = new Map>(); - const { fileNames, services } = createFileNamesAndServices(options); - - for (const fileName of fileNames) { - const sourceFile = services.program.getSourceFile(fileName); - if (sourceFile === undefined) { - options.output.stderr(`Could not find TypeScript source file for '${fileName}'.`); - continue; - } - - const filteredNodes = collectFilteredNodes(options, sourceFile); - - const foundMutations = findMutationsInFile( - { - fileInfoCache: new FileInfoCache(filteredNodes, services, sourceFile), - filteredNodes, - nameGenerator: new NameGenerator(sourceFile.fileName), - options, - services, - sourceFile, - }, - [["suppressTypeIssues", suppressRemainingTypeIssues]], - ); - - if (foundMutations?.length) { - allModifiedFiles.add(fileName); - fileMutations.set(fileName, foundMutations); - } - } - - return { - mutationsWave: { - fileMutations: fileMutations.size === 0 ? undefined : (convertMapToObject(fileMutations) as Dictionary), - }, - }; - }; - }); + return createSingleUseProvider("Applying post-fix cleanups", (options) => { + if (!Object.values(options.cleanups).filter(Boolean).length) { + return undefined; + } + + return () => { + const fileMutations = new Map(); + const { fileNames, services } = createFileNamesAndServices(options); + + for (const fileName of fileNames) { + const sourceFile = services.program.getSourceFile(fileName); + if (sourceFile === undefined) { + options.output.stderr( + `Could not find TypeScript source file for '${fileName}'.`, + ); + continue; + } + + const filteredNodes = collectFilteredNodes(options, sourceFile); + + const foundMutations = findMutationsInFile( + { + fileInfoCache: new FileInfoCache( + filteredNodes, + services, + sourceFile, + ), + filteredNodes, + nameGenerator: new NameGenerator(sourceFile.fileName), + options, + services, + sourceFile, + }, + [["suppressTypeIssues", suppressRemainingTypeIssues]], + ); + + if (foundMutations?.length) { + allModifiedFiles.add(fileName); + fileMutations.set(fileName, foundMutations); + } + } + + return { + mutationsWave: { + fileMutations: + fileMutations.size === 0 + ? undefined + : (convertMapToObject(fileMutations) as Dictionary), + }, + }; + }; + }); }; diff --git a/src/runtime/providers/createCoreMutationsProvider.ts b/src/runtime/providers/createCoreMutationsProvider.ts index fc5e774d7..9c0291ae9 100644 --- a/src/runtime/providers/createCoreMutationsProvider.ts +++ b/src/runtime/providers/createCoreMutationsProvider.ts @@ -2,142 +2,189 @@ import { Mutation } from "automutate"; import chalk from "chalk"; import { EOL } from "os"; -import { TypeStatOptions } from "../../options/types"; -import { pluralize } from "../../output/pluralize"; -import { LazyCache } from "../../services/LazyCache"; -import { FileInfoCache } from "../../shared/FileInfoCache"; -import { convertMapToObject } from "../../shared/maps"; -import { NameGenerator } from "../../shared/NameGenerator"; -import { collectFilteredNodes } from "../collectFilteredNodes"; -import { createFileNamesAndServices } from "../createFileNamesAndServices"; -import { findMutationsInFile } from "../findMutationsInFile"; -import { Provider, ProviderCreator } from "../types"; -import { WaveTracker } from "./tracking/WaveTracker"; +import { TypeStatOptions } from "../../options/types.js"; +import { pluralize } from "../../output/pluralize.js"; +import { LazyCache } from "../../services/LazyCache.js"; +import { FileInfoCache } from "../../shared/FileInfoCache.js"; +import { NameGenerator } from "../../shared/NameGenerator.js"; +import { convertMapToObject } from "../../shared/maps.js"; +import { collectFilteredNodes } from "../collectFilteredNodes.js"; +import { createFileNamesAndServices } from "../createFileNamesAndServices.js"; +import { findMutationsInFile } from "../findMutationsInFile.js"; +import { Provider, ProviderCreator } from "../types.js"; +import { WaveTracker } from "./tracking/WaveTracker.js"; /** * Creates a mutations provider that runs the core mutations within TypeStat. - * - * @param allModifiedFileNames Set to mark names of all files that were modified. + * @param allModifiedFiles Set to mark names of all files that were modified. * @returns Provider to run the core mutations, if needed. */ -export const createCoreMutationsProvider = (allModifiedFiles: Set): ProviderCreator => { - return (options: TypeStatOptions): Provider | undefined => { - const enabledFixes = Object.keys(options.fixes).filter((key) => options.fixes[key as keyof typeof options.fixes]); - if (!enabledFixes) { - return undefined; - } - - const fileNamesAndServicesCache = createFileNamesAndServicesCache(options); - const waveTracker = new WaveTracker(); - let lastFileIndex = -1; - let waveIndex = 1; - - return () => { - const startTime = Date.now(); - const fileMutationsByFileName = new Map>(); - const { fileNames, services } = fileNamesAndServicesCache.get(); - const waveStartedFromBeginning = lastFileIndex <= 0; - let addedMutations = 0; - - if (waveIndex === 1) { - options.output.stdout( - [ - chalk.blueBright(`Starting the core mutation engine.`), - chalk.blue(` This terminal will log whenever a "wave" of mutations are written to files.`), - ].join(""), - ); - options.output.stdout(chalk.gray(`Core mutations will complete when two waves pass with no mutations.`)); - options.output.stdout(chalk.gray(`The following ${pluralize(enabledFixes.length, "fix", "es")} will be applied:`)); - - for (let i = 0; i < enabledFixes.length; i += 1) { - options.output.stdout(chalk.gray(`\t* ${enabledFixes[i]}${i === enabledFixes.length - 1 ? EOL : ""}`)); - } - } - - options.output.stdout(chalk.gray(`Starting wave ${waveIndex}...`)); - - for (lastFileIndex += 1; lastFileIndex < fileNames.length; lastFileIndex += 1) { - const fileName = fileNames[lastFileIndex]; - - const sourceFile = services.program.getSourceFile(fileName); - if (sourceFile === undefined) { - options.output.stderr(`Could not find TypeScript source file for '${fileName}'.`); - continue; - } - - const filteredNodes = collectFilteredNodes(options, sourceFile); - const foundMutations = findMutationsInFile( - { - fileInfoCache: new FileInfoCache(filteredNodes, services, sourceFile), - filteredNodes, - nameGenerator: new NameGenerator(sourceFile.fileName), - options, - services, - sourceFile, - }, - options.mutators, - ); - - if (foundMutations !== undefined && foundMutations.length !== 0) { - addedMutations += foundMutations.length; - fileMutationsByFileName.set(fileName, foundMutations); - } - - if (addedMutations > 100 || (addedMutations !== 0 && Date.now() - startTime > 10000)) { - break; - } - } - - if (lastFileIndex === fileNames.length) { - lastFileIndex = -1; - - // Only recreate the language service once we've visited every file - // This way we don't constantly re-scan many of the source files each wave - // Eventually it would be nice to support incremental updates - // See https://github.com/JoshuaKGoldberg/TypeStat/issues/36 - fileNamesAndServicesCache.clear(); - } - - for (const fileName of fileMutationsByFileName.keys()) { - allModifiedFiles.add(fileName); - } - - const fileMutations = - waveStartedFromBeginning && fileMutationsByFileName.size === 0 ? undefined : convertMapToObject(fileMutationsByFileName); - - const mutationsCount = fileMutations ? Object.keys(fileMutations).length : 0; - - options.output.stdout( - chalk.gray(`Completed wave ${waveIndex}. Wrote mutations to ${mutationsCount} ${pluralize(mutationsCount, "file")}.`), - ); - - if (!fileMutations) { - options.output.stdout(chalk.blueBright(`Done.${EOL}`)); - return undefined; - } - - waveIndex += 1; - - if (waveTracker.addAndCheck(fileMutations)) { - options.output.stdout(chalk.redBright(`It looks like TypeStat has ended up in an infinite loop.${EOL}`)); - options.output.stdout(chalk.red(`Bailing out of applying more mutations.${EOL}`)); - options.output.stdout(chalk.red(`Please file an issue to help us fix the bug for you:${EOL}`)); - options.output.stdout(chalk.redBright(`https://github.com/JoshuaKGoldberg/TypeStat${EOL}`)); - return undefined; - } - - return { mutationsWave: { fileMutations } }; - }; - }; +export const createCoreMutationsProvider = ( + allModifiedFiles: Set, +): ProviderCreator => { + return (options: TypeStatOptions): Provider | undefined => { + const enabledFixes = Object.keys(options.fixes).filter( + (key) => options.fixes[key as keyof typeof options.fixes], + ); + + const fileNamesAndServicesCache = createFileNamesAndServicesCache(options); + const waveTracker = new WaveTracker(); + let lastFileIndex = -1; + let waveIndex = 1; + + return () => { + const startTime = Date.now(); + const fileMutationsByFileName = new Map(); + const { fileNames, services } = fileNamesAndServicesCache.get(); + const waveStartedFromBeginning = lastFileIndex <= 0; + let addedMutations = 0; + + if (waveIndex === 1) { + options.output.stdout( + [ + chalk.blueBright(`Starting the core mutation engine.`), + chalk.blue( + ` This terminal will log whenever a "wave" of mutations are written to files.`, + ), + ].join(""), + ); + options.output.stdout( + chalk.gray( + `Core mutations will complete when two waves pass with no mutations.`, + ), + ); + options.output.stdout( + chalk.gray( + `The following ${pluralize(enabledFixes.length, "fix", "es")} will be applied:`, + ), + ); + + for (let i = 0; i < enabledFixes.length; i += 1) { + options.output.stdout( + chalk.gray( + `\t* ${enabledFixes[i]}${i === enabledFixes.length - 1 ? EOL : ""}`, + ), + ); + } + } + + options.output.stdout(chalk.gray(`Starting wave ${waveIndex}...`)); + + for ( + lastFileIndex += 1; + lastFileIndex < fileNames.length; + lastFileIndex += 1 + ) { + const fileName = fileNames[lastFileIndex]; + + const sourceFile = services.program.getSourceFile(fileName); + if (sourceFile === undefined) { + options.output.stderr( + `Could not find TypeScript source file for '${fileName}'.`, + ); + continue; + } + + const filteredNodes = collectFilteredNodes(options, sourceFile); + const foundMutations = findMutationsInFile( + { + fileInfoCache: new FileInfoCache( + filteredNodes, + services, + sourceFile, + ), + filteredNodes, + nameGenerator: new NameGenerator(sourceFile.fileName), + options, + services, + sourceFile, + }, + options.mutators, + ); + + if (foundMutations !== undefined && foundMutations.length !== 0) { + addedMutations += foundMutations.length; + fileMutationsByFileName.set(fileName, foundMutations); + } + + if ( + addedMutations > 100 || + (addedMutations !== 0 && Date.now() - startTime > 10000) + ) { + break; + } + } + + if (lastFileIndex === fileNames.length) { + lastFileIndex = -1; + + // Only recreate the language service once we've visited every file + // This way we don't constantly re-scan many of the source files each wave + // Eventually it would be nice to support incremental updates + // See https://github.com/JoshuaKGoldberg/TypeStat/issues/36 + fileNamesAndServicesCache.clear(); + } + + for (const fileName of fileMutationsByFileName.keys()) { + allModifiedFiles.add(fileName); + } + + const fileMutations = + waveStartedFromBeginning && fileMutationsByFileName.size === 0 + ? undefined + : convertMapToObject(fileMutationsByFileName); + + const mutationsCount = fileMutations + ? Object.keys(fileMutations).length + : 0; + + options.output.stdout( + chalk.gray( + `Completed wave ${waveIndex}. Wrote mutations to ${mutationsCount} ${pluralize(mutationsCount, "file")}.`, + ), + ); + + if (!fileMutations) { + options.output.stdout(chalk.blueBright(`Done.${EOL}`)); + return undefined; + } + + waveIndex += 1; + + if (waveTracker.addAndCheck(fileMutations)) { + options.output.stdout( + chalk.redBright( + `It looks like TypeStat has ended up in an infinite loop.${EOL}`, + ), + ); + options.output.stdout( + chalk.red(`Bailing out of applying more mutations.${EOL}`), + ); + options.output.stdout( + chalk.red( + `Please file an issue to help us fix the bug for you:${EOL}`, + ), + ); + options.output.stdout( + chalk.redBright(`https://github.com/JoshuaKGoldberg/TypeStat${EOL}`), + ); + return undefined; + } + + return { mutationsWave: { fileMutations } }; + }; + }; }; const createFileNamesAndServicesCache = (options: TypeStatOptions) => { - return new LazyCache(() => { - options.output.log?.("Preparing language services to visit files..."); + return new LazyCache(() => { + options.output.log?.("Preparing language services to visit files..."); - const { fileNames, services } = createFileNamesAndServices(options); - options.output.log?.(`Prepared language services for ${fileNames.length} files...`); + const { fileNames, services } = createFileNamesAndServices(options); + options.output.log?.( + `Prepared language services for ${fileNames.length} files...`, + ); - return { fileNames, services }; - }); + return { fileNames, services }; + }); }; diff --git a/src/runtime/providers/createFileRenamesProvider/getNewFileName.test.ts b/src/runtime/providers/createFileRenamesProvider/getNewFileName.test.ts index faa40ef2a..69b640168 100644 --- a/src/runtime/providers/createFileRenamesProvider/getNewFileName.test.ts +++ b/src/runtime/providers/createFileRenamesProvider/getNewFileName.test.ts @@ -1,33 +1,42 @@ -import { getNewFileName } from "./getNewFileName"; +import { describe, expect, it, vi } from "vitest"; -describe(getNewFileName, () => { - it("returns a .ts path when renameExtensions is ts", async () => { - const actual = await getNewFileName("ts", "path/name.js", jest.fn()); +import { getNewFileName } from "./getNewFileName.js"; - expect(actual).toBe("path/name.ts"); - }); +describe("getNewFileName", () => { + it("returns a .ts path when renameExtensions is ts", async () => { + const actual = await getNewFileName("ts", "path/name.js", vi.fn()); - it("returns a .tsx path when renameExtensions is tsx", async () => { - const actual = await getNewFileName("tsx", "path/name.js", jest.fn()); + expect(actual).toBe("path/name.ts"); + }); - expect(actual).toBe("path/name.tsx"); - }); + it("returns a .tsx path when renameExtensions is tsx", async () => { + const actual = await getNewFileName("tsx", "path/name.js", vi.fn()); - it.each([ - { extension: ".ts", name: "no closing tags", text: "<>" }, - { extension: ".tsx", name: "an intrinsic closing tag", text: "< /div >" }, - { extension: ".tsx", name: "a custom closing tag", text: "< /Custom.Tag >" }, - { extension: ".tsx", name: "a fragment closing tag", text: "" }, - { extension: ".tsx", name: "a self closing tag", text: "/>" }, - ])("returns a $extension path when renameExtensions is true and the file contains $name", async ({ extension, text }) => { - const actual = await getNewFileName( - true, - "path/name.js", - jest.fn().mockResolvedValue(` + expect(actual).toBe("path/name.tsx"); + }); + + it.each([ + { extension: ".ts", name: "no closing tags", text: "<>" }, + { extension: ".tsx", name: "an intrinsic closing tag", text: "< /div >" }, + { + extension: ".tsx", + name: "a custom closing tag", + text: "< /Custom.Tag >", + }, + { extension: ".tsx", name: "a fragment closing tag", text: "" }, + { extension: ".tsx", name: "a self closing tag", text: "/>" }, + ])( + "returns a $extension path when renameExtensions is true and the file contains $name", + async ({ extension, text }) => { + const actual = await getNewFileName( + true, + "path/name.js", + vi.fn().mockResolvedValue(` ${text} `), - ); + ); - expect(actual).toBe(`path/name${extension}`); - }); + expect(actual).toBe(`path/name${extension}`); + }, + ); }); diff --git a/src/runtime/providers/createFileRenamesProvider/getNewFileName.ts b/src/runtime/providers/createFileRenamesProvider/getNewFileName.ts index 6642b59f8..5152aebb5 100644 --- a/src/runtime/providers/createFileRenamesProvider/getNewFileName.ts +++ b/src/runtime/providers/createFileRenamesProvider/getNewFileName.ts @@ -1,23 +1,27 @@ -import { RenameExtensions } from "../../../options/types"; +import { RenameExtensions } from "../../../options/types.js"; export const getNewFileName = async ( - renameExtensions: RenameExtensions, - oldFileName: string, - readFile: (filePath: string) => Promise, + renameExtensions: RenameExtensions, + oldFileName: string, + readFile: (filePath: string) => Promise, ): Promise => { - const oldExtension = oldFileName.substring(oldFileName.lastIndexOf(".")); - const beforeExtension = oldFileName.substring(0, oldFileName.length - oldExtension.length); + const oldExtension = oldFileName.substring(oldFileName.lastIndexOf(".")); + const beforeExtension = oldFileName.substring( + 0, + oldFileName.length - oldExtension.length, + ); - if (typeof renameExtensions === "string") { - return `${beforeExtension}.${renameExtensions}`; - } + if (typeof renameExtensions === "string") { + return `${beforeExtension}.${renameExtensions}`; + } - const fileContents = (await readFile(oldFileName)).toString(); - const fileContentsJoined = fileContents.replace(/ /g, "").replace(/"/g, "'"); + const fileContents = (await readFile(oldFileName)).toString(); + const fileContentsJoined = fileContents.replace(/ /g, "").replace(/"/g, "'"); - if (/(<\s*\/\s*[A-z\.]*\s*>)|(\/\s*>)/.test(fileContentsJoined)) { - return `${beforeExtension}.tsx`; - } + // eslint-disable-next-line regexp/no-obscure-range + if (/<\s*\/\s*(?:[A-z.]+\s*)?>|\/\s*>/.test(fileContentsJoined)) { + return `${beforeExtension}.tsx`; + } - return `${beforeExtension}.ts`; + return `${beforeExtension}.ts`; }; diff --git a/src/runtime/providers/createFileRenamesProvider/index.ts b/src/runtime/providers/createFileRenamesProvider/index.ts index ec13449de..7c133ea1e 100644 --- a/src/runtime/providers/createFileRenamesProvider/index.ts +++ b/src/runtime/providers/createFileRenamesProvider/index.ts @@ -1,76 +1,84 @@ import chalk from "chalk"; -import { fs } from "mz"; -import { pluralize } from "../../../output/pluralize"; +import * as fs from "node:fs/promises"; -import { createSingleUseProvider } from "../../createSingleUseProvider"; -import { getNewFileName } from "./getNewFileName"; +import { pluralize } from "../../../output/pluralize.js"; +import { createSingleUseProvider } from "../../createSingleUseProvider.js"; +import { getNewFileName } from "./getNewFileName.js"; /** * Creates a mutations provider that renames files from JavaScript to TypeScript. - * - * @param allModifiedFileNames Set to mark names of all files that were modified. + * @param allModifiedFiles Set to mark names of all files that were modified. * @returns Provider to rename files from JavaScript to TypeScript, if needed. */ export const createFileRenamesProvider = (allModifiedFiles: Set) => { - return createSingleUseProvider("Renaming files from JavaScript to TypeScript", (options) => { - // If the options don't specify to rename extension, only make sure no JS files are included - if (!options.files.renameExtensions) { - const jsFileNames = options.fileNames.filter(fileNameIsJavaScript); - if (jsFileNames.length === 0) { - return undefined; - } + return createSingleUseProvider( + "Renaming files from JavaScript to TypeScript", + (options) => { + // If the options don't specify to rename extension, only make sure no JS files are included + if (!options.files.renameExtensions) { + const jsFileNames = options.fileNames.filter(fileNameIsJavaScript); + if (jsFileNames.length === 0) { + return undefined; + } - return async () => { - throw new Error( - [ - "The following JavaScript files were included in the project but files.renameExtensions is not enabled.", - "TypeStat does not yet support annotating JavaScript files.", - ...jsFileNames.map((fileName) => `\t${fileName}`), - "See https://github.com/JoshuaKGoldberg/TypeStat/blob/main/docs/Files.md for details.", - ].join("\n"), - ); - }; - } + return () => { + throw new Error( + [ + "The following JavaScript files were included in the project but files.renameExtensions is not enabled.", + "TypeStat does not yet support annotating JavaScript files.", + ...jsFileNames.map((fileName) => `\t${fileName}`), + "See https://github.com/JoshuaKGoldberg/TypeStat/blob/main/docs/Files.md for details.", + ].join("\n"), + ); + }; + } - return async () => { - const newFileNames = new Set(options.fileNames); + return async () => { + const newFileNames = new Set(options.fileNames); - const filesToRename = ( - await Promise.all( - options.fileNames.filter(fileNameIsJavaScript).map(async (fileName) => ({ - newFileName: await getNewFileName(options.files.renameExtensions, fileName, async (filePath: string) => - (await fs.readFile(filePath)).toString(), - ), - oldFileName: fileName, - })), - ) - ).filter(({ newFileName, oldFileName }) => newFileName !== oldFileName); + const filesToRename = ( + await Promise.all( + options.fileNames + .filter(fileNameIsJavaScript) + .map(async (fileName) => ({ + newFileName: await getNewFileName( + options.files.renameExtensions, + fileName, + async (filePath: string) => + (await fs.readFile(filePath)).toString(), + ), + oldFileName: fileName, + })), + ) + ).filter(({ newFileName, oldFileName }) => newFileName !== oldFileName); - if (filesToRename.length !== 0) { - for (const { oldFileName, newFileName } of filesToRename) { - await fs.rename(oldFileName, newFileName); + if (filesToRename.length !== 0) { + for (const { newFileName, oldFileName } of filesToRename) { + await fs.rename(oldFileName, newFileName); - newFileNames.delete(oldFileName); - newFileNames.add(newFileName); - allModifiedFiles.add(newFileName); - } - } + newFileNames.delete(oldFileName); + newFileNames.add(newFileName); + allModifiedFiles.add(newFileName); + } + } - const renamedFileNames = Array.from(newFileNames); + const renamedFileNames = Array.from(newFileNames); - options.output.stdout( - chalk.gray( - `Renamed ${renamedFileNames.length} ${pluralize(renamedFileNames.length, "file")} from JavaScript to TypeScript.`, - ), - ); + options.output.stdout( + chalk.gray( + `Renamed ${renamedFileNames.length} ${pluralize(renamedFileNames.length, "file")} from JavaScript to TypeScript.`, + ), + ); - return { - newOptions: { ...options, fileNames: renamedFileNames }, - }; - }; - }); + return { + newOptions: { ...options, fileNames: renamedFileNames }, + }; + }; + }, + ); }; -const javaScriptExtensionMatcher = /\.(c|m)?jsx?/i; +const javaScriptExtensionMatcher = /\.(?:c|m)?jsx?/i; -const fileNameIsJavaScript = (fileName: string) => javaScriptExtensionMatcher.test(fileName); +const fileNameIsJavaScript = (fileName: string) => + javaScriptExtensionMatcher.test(fileName); diff --git a/src/runtime/providers/createInstallMissingTypesProvider.ts b/src/runtime/providers/createInstallMissingTypesProvider.ts index 9105569ad..8e5624949 100644 --- a/src/runtime/providers/createInstallMissingTypesProvider.ts +++ b/src/runtime/providers/createInstallMissingTypesProvider.ts @@ -1,55 +1,69 @@ import builtinModules from "builtin-modules"; -import { setSubtract } from "../../shared/sets"; -import { createFileNamesAndServices } from "../createFileNamesAndServices"; -import { createSingleUseProvider } from "../createSingleUseProvider"; - -import { collectExistingTypingPackages } from "./missingTypes/collectExistingTypingPackages"; -import { collectPackageManagerRunner } from "./missingTypes/collectPackageManagerRunner"; -import { collectReferencedPackageNames } from "./missingTypes/collectReferencedPackageNames"; -import { filterTypedPackageNames } from "./missingTypes/filterTypedPackageNames"; +import { setSubtract } from "../../shared/sets.js"; +import { createFileNamesAndServices } from "../createFileNamesAndServices.js"; +import { createSingleUseProvider } from "../createSingleUseProvider.js"; +import { collectExistingTypingPackages } from "./missingTypes/collectExistingTypingPackages.js"; +import { collectPackageManagerRunner } from "./missingTypes/collectPackageManagerRunner.js"; +import { collectReferencedPackageNames } from "./missingTypes/collectReferencedPackageNames.js"; +import { filterTypedPackageNames } from "./missingTypes/filterTypedPackageNames.js"; const uniqueBuiltinModules = new Set(builtinModules); /** * Creates a mutations provider that installs missing types modules. - * * @returns Provider to install missing types modules, if needed. */ export const createInstallMissingTypesProvider = () => { - return createSingleUseProvider("Installing missing @types modules", (options) => { - const { missingTypes } = options.package; - if (missingTypes === undefined) { - return undefined; - } - - return async () => { - await (async () => { - // Collect package names already present in the package file - const existingPackageNames = await collectExistingTypingPackages(options, options.package.file); - if (existingPackageNames === undefined) { - return; - } - - // Collect every package name referenced by every file in the project - const { services } = createFileNamesAndServices(options); - const referencedPackageNames = collectReferencedPackageNames(services); - - // Ignore package names already referenced in package.json or that don't exist in DefinitelyTyped - const missingPackageNames = setSubtract(referencedPackageNames, new Set(existingPackageNames), uniqueBuiltinModules); - const missingTypedPackageNames = await filterTypedPackageNames(Array.from(missingPackageNames)); - if (missingTypedPackageNames.length === 0) { - return; - } - - // Run the installation command using the requested or detected package manager - const packageManagerRunner = await collectPackageManagerRunner(options, missingTypes); - await packageManagerRunner(options, missingTypedPackageNames); - })(); - - return { - mutationsWave: {}, - }; - }; - }); + return createSingleUseProvider( + "Installing missing @types modules", + (options) => { + const { missingTypes } = options.package; + if (missingTypes === undefined) { + return undefined; + } + + return async () => { + await (async () => { + // Collect package names already present in the package file + const existingPackageNames = await collectExistingTypingPackages( + options, + options.package.file, + ); + if (existingPackageNames === undefined) { + return; + } + + // Collect every package name referenced by every file in the project + const { services } = createFileNamesAndServices(options); + const referencedPackageNames = + collectReferencedPackageNames(services); + + // Ignore package names already referenced in package.json or that don't exist in DefinitelyTyped + const missingPackageNames = setSubtract( + referencedPackageNames, + new Set(existingPackageNames), + uniqueBuiltinModules, + ); + const missingTypedPackageNames = await filterTypedPackageNames( + Array.from(missingPackageNames), + ); + if (missingTypedPackageNames.length === 0) { + return; + } + + // Run the installation command using the requested or detected package manager + const packageManagerRunner = collectPackageManagerRunner( + options, + missingTypes, + ); + await packageManagerRunner(options, missingTypedPackageNames); + })(); + + return { + mutationsWave: {}, + }; + }; + }, + ); }; diff --git a/src/runtime/providers/createMarkFilesModifiedProvider.ts b/src/runtime/providers/createMarkFilesModifiedProvider.ts index eb984a4c8..60e0af289 100644 --- a/src/runtime/providers/createMarkFilesModifiedProvider.ts +++ b/src/runtime/providers/createMarkFilesModifiedProvider.ts @@ -1,89 +1,99 @@ import { FileMutations, TextInsertMutation } from "automutate"; -import * as fs from "mz/fs"; +import * as fs from "node:fs/promises"; -import { TypeStatOptions } from "../../options/types"; -import { printNewLine } from "../../shared/printing/newlines"; -import { createSingleUseProvider } from "../createSingleUseProvider"; +import { TypeStatOptions } from "../../options/types.js"; +import { printNewLine } from "../../shared/printing/newlines.js"; +import { createSingleUseProvider } from "../createSingleUseProvider.js"; /** * Creates a mutations provider to mark all previously mutated files as modified. - * * @returns Mutations provider to mark all mutated files as modified, if needed. */ -export const createMarkFilesModifiedProvider = (allModifiedFileNames: ReadonlySet) => { - return createSingleUseProvider("Marking files as modified", (options) => { - if (options.files.above === "" && options.files.below === "") { - return undefined; - } +export const createMarkFilesModifiedProvider = ( + allModifiedFileNames: ReadonlySet, +) => { + return createSingleUseProvider("Marking files as modified", (options) => { + if (options.files.above === "" && options.files.below === "") { + return undefined; + } - return async () => { - const fileMutations: FileMutations = {}; - let hadMutation = false; + return async () => { + const fileMutations: FileMutations = {}; + let hadMutation = false; - for (const fileName of allModifiedFileNames) { - const mutations = await createFileMutations(options, fileName); + for (const fileName of allModifiedFileNames) { + const mutations = await createFileMutations(options, fileName); - if (mutations.length !== 0) { - fileMutations[fileName] = mutations; - hadMutation = true; - } - } + if (mutations.length !== 0) { + fileMutations[fileName] = mutations; + hadMutation = true; + } + } - return { - mutationsWave: { - fileMutations: hadMutation ? fileMutations : undefined, - }, - }; - }; - }); + return { + mutationsWave: { + fileMutations: hadMutation ? fileMutations : undefined, + }, + }; + }; + }); }; -const createFileMutations = async (options: TypeStatOptions, fileName: string): Promise => { - const mutations: TextInsertMutation[] = []; - const fileContents = (await fs.readFile(fileName)).toString(); - const fileContentsTrimmed = fileContents.trim(); - const newLine = printNewLine(options.compilerOptions); +const createFileMutations = async ( + options: TypeStatOptions, + fileName: string, +): Promise => { + const mutations: TextInsertMutation[] = []; + const fileContents = (await fs.readFile(fileName)).toString(); + const fileContentsTrimmed = fileContents.trim(); + const newLine = printNewLine(options.compilerOptions); - if (options.files.above !== "" && !fileContentsTrimmed.startsWith(options.files.above)) { - mutations.push({ - insertion: `${options.files.above}${newLine}`, - range: { - begin: 0, - end: 0, - }, - type: "text-insert", - }); - } + if ( + options.files.above !== "" && + !fileContentsTrimmed.startsWith(options.files.above) + ) { + mutations.push({ + insertion: `${options.files.above}${newLine}`, + range: { + begin: 0, + end: 0, + }, + type: "text-insert", + }); + } - if (options.files.below !== "" && !fileContentsTrimmed.endsWith(options.files.below)) { - mutations.push({ - insertion: `${newLine}${options.files.below}`, - range: { - begin: getInsertionIndexBeforeLastEndline(fileContents), - }, - type: "text-insert", - }); - } + if ( + options.files.below !== "" && + !fileContentsTrimmed.endsWith(options.files.below) + ) { + mutations.push({ + insertion: `${newLine}${options.files.below}`, + range: { + begin: getInsertionIndexBeforeLastEndline(fileContents), + }, + type: "text-insert", + }); + } - return mutations; + return mutations; }; const getInsertionIndexBeforeLastEndline = (fileContents: string): number => { - if (fileContents.length === 0) { - return 0; - } + if (fileContents.length === 0) { + return 0; + } - let index = fileContents.length - 1; + let index = fileContents.length - 1; - for (const character of ["\n", "\r"]) { - if (fileContents[index] === character) { - index -= 1; + for (const character of ["\n", "\r"]) { + if (fileContents[index] === character) { + index -= 1; - if (index === 0) { - return 0; - } - } - } + if (index === 0) { + return 0; + } + } + } - return index + 1; + return index + 1; }; diff --git a/src/runtime/providers/createPostProcessingProvider.ts b/src/runtime/providers/createPostProcessingProvider.ts index c7f6b2ce2..db8408fe8 100644 --- a/src/runtime/providers/createPostProcessingProvider.ts +++ b/src/runtime/providers/createPostProcessingProvider.ts @@ -1,27 +1,33 @@ -import { createSingleUseProvider } from "../createSingleUseProvider"; - -import { runCommand } from "./missingTypes/runCommand"; +import { createSingleUseProvider } from "../createSingleUseProvider.js"; +import { runCommand } from "./missingTypes/runCommand.js"; /** * Creates a mutations provider to run any post-processing shell scripts. - * * @param allModifiedFilePaths Unique names of all files that were modified. * @returns Mutations provider to run post-processing shell scripts, if needed. */ -export const createPostProcessingProvider = (allModifiedFilePaths: ReadonlySet) => { - return createSingleUseProvider("Running post-processing scripts", (options) => { - if (options.postProcess.shell.length === 0) { - return undefined; - } +export const createPostProcessingProvider = ( + allModifiedFilePaths: ReadonlySet, +) => { + return createSingleUseProvider( + "Running post-processing scripts", + (options) => { + if (options.postProcess.shell.length === 0) { + return undefined; + } - return async () => { - for (const shellCommand of options.postProcess.shell) { - await runCommand(options, [...shellCommand, ...Array.from(allModifiedFilePaths)]); - } + return async () => { + for (const shellCommand of options.postProcess.shell) { + await runCommand(options, [ + ...shellCommand, + ...Array.from(allModifiedFilePaths), + ]); + } - return { - mutationsWave: {}, - }; - }; - }); + return { + mutationsWave: {}, + }; + }; + }, + ); }; diff --git a/src/runtime/providers/createRequireRenameProvider.ts b/src/runtime/providers/createRequireRenameProvider.ts index 5073fd55f..3f02b06d7 100644 --- a/src/runtime/providers/createRequireRenameProvider.ts +++ b/src/runtime/providers/createRequireRenameProvider.ts @@ -1,51 +1,58 @@ import { Mutation } from "automutate"; -import { findRequireRenameMutationsInFile } from "../../mutations/renames/findRequireRenameMutationsInFile"; -import { convertMapToObject, Dictionary } from "../../shared/maps"; -import { createFileNamesAndServices } from "../createFileNamesAndServices"; -import { createSingleUseProvider } from "../createSingleUseProvider"; +import { findRequireRenameMutationsInFile } from "../../mutations/renames/findRequireRenameMutationsInFile.js"; +import { Dictionary, convertMapToObject } from "../../shared/maps.js"; +import { createFileNamesAndServices } from "../createFileNamesAndServices.js"; +import { createSingleUseProvider } from "../createSingleUseProvider.js"; /** * Creates a mutations provider that transforms local require() calls in files. - * - * @param allModifiedFileNames Set to mark names of all files that were modified. + * @param allModifiedFiles Set to mark names of all files that were modified. * @returns Provider to transform local require() calls in files, if needed. */ export const createRequireRenameProvider = (allModifiedFiles: Set) => { - return createSingleUseProvider("Transforming local require() calls in files", (options) => { - if (!options.files.renameExtensions) { - return undefined; - } + return createSingleUseProvider( + "Transforming local require() calls in files", + (options) => { + if (!options.files.renameExtensions) { + return undefined; + } - return async () => { - const fileMutations = new Map>(); - const { fileNames, services } = createFileNamesAndServices(options); - const allFileNames = new Set(fileNames); + return () => { + const fileMutations = new Map(); + const { fileNames, services } = createFileNamesAndServices(options); + const allFileNames = new Set(fileNames); - for (const fileName of fileNames) { - const sourceFile = services.program.getSourceFile(fileName); - if (sourceFile === undefined) { - options.output.stderr(`Could not find TypeScript source file for '${fileName}'.`); - continue; - } + for (const fileName of fileNames) { + const sourceFile = services.program.getSourceFile(fileName); + if (sourceFile === undefined) { + options.output.stderr( + `Could not find TypeScript source file for '${fileName}'.`, + ); + continue; + } - const foundMutations = findRequireRenameMutationsInFile({ - allFileNames, - options, - sourceFile, - }); + const foundMutations = findRequireRenameMutationsInFile({ + allFileNames, + options, + sourceFile, + }); - if (foundMutations.length !== 0) { - allModifiedFiles.add(fileName); - fileMutations.set(fileName, foundMutations); - } - } + if (foundMutations.length !== 0) { + allModifiedFiles.add(fileName); + fileMutations.set(fileName, foundMutations); + } + } - return { - mutationsWave: { - fileMutations: fileMutations.size === 0 ? undefined : (convertMapToObject(fileMutations) as Dictionary), - }, - }; - }; - }); + return { + mutationsWave: { + fileMutations: + fileMutations.size === 0 + ? undefined + : (convertMapToObject(fileMutations) as Dictionary), + }, + }; + }; + }, + ); }; diff --git a/src/runtime/providers/missingTypes/collectExistingTypingPackages.ts b/src/runtime/providers/missingTypes/collectExistingTypingPackages.ts index 1e750d114..6d5667e1d 100644 --- a/src/runtime/providers/missingTypes/collectExistingTypingPackages.ts +++ b/src/runtime/providers/missingTypes/collectExistingTypingPackages.ts @@ -1,44 +1,56 @@ -import { fs } from "mz"; +import * as fs from "node:fs/promises"; import { EOL } from "os"; -import { TypeStatOptions } from "../../../options/types"; -import { getQuickErrorSummary } from "../../../shared/errors"; - -export const collectExistingTypingPackages = async (options: TypeStatOptions, packagePath: string) => { - const allDependencies = await tryCollectAllDependencies(packagePath); - if (typeof allDependencies === "string") { - options.output.stderr(`${EOL}Error trying to collect existing dependencies for --packageMissingTypes:`); - options.output.stderr(`\t${allDependencies}`); - options.output.stderr(EOL); - return undefined; - } - - return Array.from(allDependencies) - .filter((dependency) => dependency.startsWith("@types/")) - .map((dependency) => dependency.substring("@types/".length)); +import { TypeStatOptions } from "../../../options/types.js"; +import { getQuickErrorSummary } from "../../../shared/errors.js"; + +export const collectExistingTypingPackages = async ( + options: TypeStatOptions, + packagePath: string, +) => { + const allDependencies = await tryCollectAllDependencies(packagePath); + if (typeof allDependencies === "string") { + options.output.stderr( + `${EOL}Error trying to collect existing dependencies for --packageMissingTypes:`, + ); + options.output.stderr(`\t${allDependencies}`); + options.output.stderr(EOL); + return undefined; + } + + return Array.from(allDependencies) + .filter((dependency) => dependency.startsWith("@types/")) + .map((dependency) => dependency.substring("@types/".length)); }; const tryCollectAllDependencies = async (packagePath: string) => { - try { - return collectAllDependencies(packagePath); - } catch (error) { - return getQuickErrorSummary(error); - } + try { + return collectAllDependencies(packagePath); + } catch (error) { + return getQuickErrorSummary(error); + } }; const collectAllDependencies = async (packagePath: string) => { - const rawContents = (await fs.readFile(packagePath)).toString(); - const parsedContents = JSON.parse(rawContents) as { [i: string]: { [i: string]: string } | undefined }; - - const allDependencies: string[] = []; - - for (const groupName of ["dependencies", "devDependencies", "peerDependencies"]) { - const packageObject = parsedContents[groupName]; - - if (packageObject !== undefined) { - allDependencies.push(...Object.keys(packageObject)); - } - } - - return new Set(allDependencies); + const rawContents = (await fs.readFile(packagePath)).toString(); + const parsedContents = JSON.parse(rawContents) as Record< + string, + Record | undefined + >; + + const allDependencies: string[] = []; + + for (const groupName of [ + "dependencies", + "devDependencies", + "peerDependencies", + ]) { + const packageObject = parsedContents[groupName]; + + if (packageObject !== undefined) { + allDependencies.push(...Object.keys(packageObject)); + } + } + + return new Set(allDependencies); }; diff --git a/src/runtime/providers/missingTypes/collectPackageManagerRunner.ts b/src/runtime/providers/missingTypes/collectPackageManagerRunner.ts index b6b905f03..0ae1ee807 100644 --- a/src/runtime/providers/missingTypes/collectPackageManagerRunner.ts +++ b/src/runtime/providers/missingTypes/collectPackageManagerRunner.ts @@ -1,19 +1,24 @@ -import { fs } from "mz"; -import * as path from "path"; +import * as fs from "node:fs"; +import * as path from "node:path"; -import { TypeStatOptions } from "../../../options/types"; +import { TypeStatOptions } from "../../../options/types.js"; +import { installWithNpm } from "./installWithNpm.js"; +import { installWithYarn } from "./installWithYarn.js"; -import { installWithNpm } from "./installWithNpm"; -import { installWithYarn } from "./installWithYarn"; +export const collectPackageManagerRunner = ( + options: TypeStatOptions, + missingTypes: "npm" | "yarn" | true, +) => { + if (missingTypes === "npm") { + return installWithNpm; + } -export const collectPackageManagerRunner = async (options: TypeStatOptions, missingTypes: true | "npm" | "yarn") => { - if (missingTypes === "npm") { - return installWithNpm; - } + if ( + missingTypes === "yarn" || + fs.existsSync(path.join(options.package.directory, "yarn.lock")) + ) { + return installWithYarn; + } - if (missingTypes === "yarn" || (await fs.exists(path.join(options.package.directory, "yarn.lock")))) { - return installWithYarn; - } - - return installWithNpm; + return installWithNpm; }; diff --git a/src/runtime/providers/missingTypes/collectReferencedPackageNames.ts b/src/runtime/providers/missingTypes/collectReferencedPackageNames.ts index 897496764..fc08771ba 100644 --- a/src/runtime/providers/missingTypes/collectReferencedPackageNames.ts +++ b/src/runtime/providers/missingTypes/collectReferencedPackageNames.ts @@ -1,94 +1,100 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { LanguageServices } from "../../../services/language"; +import { LanguageServices } from "../../../services/language.js"; export const collectReferencedPackageNames = (services: LanguageServices) => { - const packageNames = new Set(); + const packageNames = new Set(); - for (const sourceFile of services.program.getSourceFiles()) { - for (const packageName of collectFileReferencedPackageNames(sourceFile)) { - packageNames.add(packageName); - } - } + for (const sourceFile of services.program.getSourceFiles()) { + for (const packageName of collectFileReferencedPackageNames(sourceFile)) { + packageNames.add(packageName); + } + } - return packageNames; + return packageNames; }; const collectFileReferencedPackageNames = (sourceFile: ts.SourceFile) => { - const packageNames = new Set(); + const packageNames = new Set(); - const visitNode = (node: ts.Node) => { - const packageName = parsePackageNameFromNode(node); + const visitNode = (node: ts.Node) => { + const packageName = parsePackageNameFromNode(node); - if (packageName !== undefined) { - packageNames.add(packageName); - } + if (packageName !== undefined) { + packageNames.add(packageName); + } - ts.forEachChild(node, visitNode); - }; + ts.forEachChild(node, visitNode); + }; - ts.forEachChild(sourceFile, visitNode); + ts.forEachChild(sourceFile, visitNode); - return packageNames; + return packageNames; }; const parsePackageNameFromNode = (node: ts.Node) => { - if (ts.isIdentifier(node) && (node.text === "module" || node.text === "process")) { - return "node"; - } - - if (ts.isImportDeclaration(node)) { - return parseImportDeclarationPackageName(node); - } - - if (ts.isImportEqualsDeclaration(node)) { - return parseImportEqualsDeclarationPackageName(node); - } - - if (ts.isCallExpression(node)) { - return parseCallExpressionPackageName(node); - } - - return undefined; + if ( + ts.isIdentifier(node) && + (node.text === "module" || node.text === "process") + ) { + return "node"; + } + + if (ts.isImportDeclaration(node)) { + return parseImportDeclarationPackageName(node); + } + + if (ts.isImportEqualsDeclaration(node)) { + return parseImportEqualsDeclarationPackageName(node); + } + + if (ts.isCallExpression(node)) { + return parseCallExpressionPackageName(node); + } + + return undefined; }; -const parseImportDeclarationPackageName = (node: ts.ImportDeclaration) => parseModuleSpecifier(node.moduleSpecifier); +const parseImportDeclarationPackageName = (node: ts.ImportDeclaration) => + parseModuleSpecifier(node.moduleSpecifier); -const parseImportEqualsDeclarationPackageName = (node: ts.ImportEqualsDeclaration) => { - const { moduleReference } = node; - if (!ts.isExternalModuleReference(moduleReference)) { - return undefined; - } +const parseImportEqualsDeclarationPackageName = ( + node: ts.ImportEqualsDeclaration, +) => { + const { moduleReference } = node; + if (!ts.isExternalModuleReference(moduleReference)) { + return undefined; + } - return parseModuleSpecifier(moduleReference.expression); + return parseModuleSpecifier(moduleReference.expression); }; const parseCallExpressionPackageName = (node: ts.CallExpression) => { - if ( - !ts.isIdentifier(node.expression) || - (node.expression.text !== "import" && node.expression.text !== "require") || - node.arguments.length !== 1 - ) { - return undefined; - } - - const firstArgument = node.arguments[0]; - if (!ts.isStringLiteral(firstArgument)) { - return undefined; - } - - return parseModuleSpecifier(firstArgument); + if ( + !ts.isIdentifier(node.expression) || + (node.expression.text !== "import" && node.expression.text !== "require") || + node.arguments.length !== 1 + ) { + return undefined; + } + + const firstArgument = node.arguments[0]; + if (!ts.isStringLiteral(firstArgument)) { + return undefined; + } + + return parseModuleSpecifier(firstArgument); }; const parseModuleSpecifier = (node: ts.Expression) => { - if (!ts.isStringLiteral(node)) { - return undefined; - } + if (!ts.isStringLiteral(node)) { + return undefined; + } - const { text } = node; - if (text[0].match(/[aZ]/) === null) { - return undefined; - } + const { text } = node; + if (text[0].match(/[aZ]/) === null) { + return undefined; + } - return text.split("/")[0]; + return text.split("/")[0]; }; diff --git a/src/runtime/providers/missingTypes/filterTypedPackageNames.ts b/src/runtime/providers/missingTypes/filterTypedPackageNames.ts index b4d2636c8..df51c42d6 100644 --- a/src/runtime/providers/missingTypes/filterTypedPackageNames.ts +++ b/src/runtime/providers/missingTypes/filterTypedPackageNames.ts @@ -2,20 +2,30 @@ import * as https from "https"; /** * Removes package names that don't have a corresponding DefinitelyTyped package. - * * @param packageNames Package names to filter. * @returns Promise for just the package names with a corresponding DefinitelyTyped package. */ -export const filterTypedPackageNames = async (packageNames: ReadonlyArray) => { - const processedPackageNames = await Promise.all(packageNames.map(filterTypedPackageName)); +export const filterTypedPackageNames = async ( + packageNames: readonly string[], +) => { + const processedPackageNames = await Promise.all( + packageNames.map(filterTypedPackageName), + ); - return processedPackageNames.filter((packageName) => packageName !== undefined) as string[]; + return processedPackageNames.filter( + (packageName) => packageName !== undefined, + ) as string[]; }; -const filterTypedPackageName = async (packageName: string): Promise => { - return new Promise((resolve) => { - https.get(`https://www.npmjs.com/package/@types/${packageName}`, (result) => { - resolve(result.statusCode === 200 ? packageName : undefined); - }); - }); +const filterTypedPackageName = async ( + packageName: string, +): Promise => { + return new Promise((resolve) => { + https.get( + `https://www.npmjs.com/package/@types/${packageName}`, + (result) => { + resolve(result.statusCode === 200 ? packageName : undefined); + }, + ); + }); }; diff --git a/src/runtime/providers/missingTypes/installWithNpm.ts b/src/runtime/providers/missingTypes/installWithNpm.ts index 8ed6be6d5..50032373e 100644 --- a/src/runtime/providers/missingTypes/installWithNpm.ts +++ b/src/runtime/providers/missingTypes/installWithNpm.ts @@ -1,10 +1,19 @@ -import { TypeStatOptions } from "../../../options/types"; +import { TypeStatOptions } from "../../../options/types.js"; +import { runCommand } from "./runCommand.js"; -import { runCommand } from "./runCommand"; - -export const installWithNpm = async (options: TypeStatOptions, missingPackageNames: ReadonlyArray) => { - await runCommand( - options, - ["npm", "install", ...Array.from(missingPackageNames).map((packageName) => `@types/${packageName}`), "-D"].join(" "), - ); +export const installWithNpm = async ( + options: TypeStatOptions, + missingPackageNames: readonly string[], +) => { + await runCommand( + options, + [ + "npm", + "install", + ...Array.from(missingPackageNames).map( + (packageName) => `@types/${packageName}`, + ), + "-D", + ].join(" "), + ); }; diff --git a/src/runtime/providers/missingTypes/installWithYarn.ts b/src/runtime/providers/missingTypes/installWithYarn.ts index 7d05fdfc3..6963bb722 100644 --- a/src/runtime/providers/missingTypes/installWithYarn.ts +++ b/src/runtime/providers/missingTypes/installWithYarn.ts @@ -1,10 +1,19 @@ -import { TypeStatOptions } from "../../../options/types"; +import { TypeStatOptions } from "../../../options/types.js"; +import { runCommand } from "./runCommand.js"; -import { runCommand } from "./runCommand"; - -export const installWithYarn = async (options: TypeStatOptions, missingPackageNames: ReadonlyArray) => { - await runCommand( - options, - ["yarn", "add", ...Array.from(missingPackageNames).map((packageName) => `@types/${packageName}`), "-D"].join(" "), - ); +export const installWithYarn = async ( + options: TypeStatOptions, + missingPackageNames: readonly string[], +) => { + await runCommand( + options, + [ + "yarn", + "add", + ...Array.from(missingPackageNames).map( + (packageName) => `@types/${packageName}`, + ), + "-D", + ].join(" "), + ); }; diff --git a/src/runtime/providers/missingTypes/runCommand.ts b/src/runtime/providers/missingTypes/runCommand.ts index 8fb659282..096d01c8d 100644 --- a/src/runtime/providers/missingTypes/runCommand.ts +++ b/src/runtime/providers/missingTypes/runCommand.ts @@ -1,40 +1,44 @@ import chalk from "chalk"; import { spawn } from "child_process"; -import { TypeStatOptions } from "../../../options/types"; +import { TypeStatOptions } from "../../../options/types.js"; const isWindows = () => process.platform === "win32"; const commandAliases = new Map([ - ["npm", isWindows() ? "npm.cmd" : undefined], - ["yarn", isWindows() ? "yarn.cmd" : undefined], + ["npm", isWindows() ? "npm.cmd" : undefined], + ["yarn", isWindows() ? "yarn.cmd" : undefined], ]); /** * Runs a shell command. - * - * @param fullCommand Command to spawnute, including args. + * @param options Parsed runtime options for TypeStat. + * @param fullCommand Command to spawn, including args. * @returns Promise for the result code of the command. */ -export const runCommand = async (options: TypeStatOptions, fullCommand: string | string[]) => { - const [command, ...args] = typeof fullCommand === "string" ? fullCommand.split(" ") : fullCommand; - const commandAlias = getCommandAlias(command); - - options.output.stdout(chalk.grey(`> ${commandAlias} ${args.join(" ")}`)); - - return new Promise((resolve, reject): void => { - const childProcess = spawn(commandAlias, args, { - cwd: options.package.directory, - stdio: "inherit", - }); - - childProcess.on("error", reject); - childProcess.on("close", resolve); - }); +export const runCommand = async ( + options: TypeStatOptions, + fullCommand: string | string[], +) => { + const [command, ...args] = + typeof fullCommand === "string" ? fullCommand.split(" ") : fullCommand; + const commandAlias = getCommandAlias(command); + + options.output.stdout(chalk.grey(`> ${commandAlias} ${args.join(" ")}`)); + + return new Promise((resolve, reject): void => { + const childProcess = spawn(commandAlias, args, { + cwd: options.package.directory, + stdio: "inherit", + }); + + childProcess.on("error", reject); + childProcess.on("close", resolve); + }); }; const getCommandAlias = (command: string): string => { - const alias = commandAliases.get(command); + const alias = commandAliases.get(command); - return alias === undefined ? command : alias; + return alias ?? command; }; diff --git a/src/runtime/providers/tracking/WaveTracker.test.ts b/src/runtime/providers/tracking/WaveTracker.test.ts index a9b6dbed6..b423c660e 100644 --- a/src/runtime/providers/tracking/WaveTracker.test.ts +++ b/src/runtime/providers/tracking/WaveTracker.test.ts @@ -1,95 +1,99 @@ -import { infiniteWaveThreshold, WaveTracker } from "./WaveTracker"; +import { describe, expect, it } from "vitest"; + +import { WaveTracker, infiniteWaveThreshold } from "./WaveTracker.js"; describe("WaveTracker", () => { - describe("addAndCheck", () => { - it("returns false for first wave hash", () => { - // Arrange - const waveTracker = new WaveTracker(); + describe("addAndCheck", () => { + it("returns false for first wave hash", () => { + // Arrange + const waveTracker = new WaveTracker(); + + // Act + const result = waveTracker.addAndCheck({ a: [] }); + + // Assert + expect(result).toBe(false); + }); - // Act - const result = waveTracker.addAndCheck({ a: [] }); + it("returns false for a second, new wave hash", () => { + // Arrange + const waveTracker = new WaveTracker(); + waveTracker.addAndCheck({ a: [] }); - // Assert - expect(result).toBe(false); - }); + // Act + const result = waveTracker.addAndCheck({ b: [] }); - it("returns false for a second, new wave hash", () => { - // Arrange - const waveTracker = new WaveTracker(); - waveTracker.addAndCheck({ a: [] }); + // Assert + expect(result).toBe(false); + }); - // Act - const result = waveTracker.addAndCheck({ b: [] }); + it("returns false for a second, duplicate wave hash", () => { + // Arrange + const waveTracker = new WaveTracker(); + waveTracker.addAndCheck({ a: [] }); - // Assert - expect(result).toBe(false); - }); + // Act + const result = waveTracker.addAndCheck({ a: [] }); - it("returns false for a second, duplicate wave hash", () => { - // Arrange - const waveTracker = new WaveTracker(); - waveTracker.addAndCheck({ a: [] }); + // Assert + expect(result).toBe(false); + }); - // Act - const result = waveTracker.addAndCheck({ a: [] }); + it("returns true for a duplicate number wave at the threshold", () => { + // Arrange + const waveTracker = new WaveTracker(); - // Assert - expect(result).toBe(false); - }); + for (let i = 0; i < infiniteWaveThreshold; i += 1) { + waveTracker.addAndCheck({ a: [] }); + } - it("returns true for a duplicate number wave at the threshold", () => { - // Arrange - const waveTracker = new WaveTracker(); + // Act + const result = waveTracker.addAndCheck({ a: [] }); - for (let i = 0; i < infiniteWaveThreshold; i += 1) { - waveTracker.addAndCheck({ a: [] }); - } + // Assert + expect(result).toBe(true); + }); - // Act - const result = waveTracker.addAndCheck({ a: [] }); + it("returns false for a duplicate number wave interrupted before at the threshold", () => { + // Arrange + const waveTracker = new WaveTracker(); - // Assert - expect(result).toBe(true); - }); + for (let i = 0; i < 10; i += 1) { + waveTracker.addAndCheck({ a: [] }); + } - it("returns false for a duplicate number wave interrupted before at the threshold", () => { - // Arrange - const waveTracker = new WaveTracker(); + waveTracker.addAndCheck({ b: [] }); - for (let i = 0; i < 10; i += 1) { - waveTracker.addAndCheck({ a: [] }); - } - waveTracker.addAndCheck({ b: [] }); + for (let i = 0; i < 15; i += 1) { + waveTracker.addAndCheck({ a: [] }); + } - for (let i = 0; i < 15; i += 1) { - waveTracker.addAndCheck({ a: [] }); - } + // Act + const result = waveTracker.addAndCheck({ a: [] }); - // Act - const result = waveTracker.addAndCheck({ a: [] }); + // Assert + expect(result).toBe(false); + }); - // Assert - expect(result).toBe(false); - }); + it("returns true for a duplicate number wave resumed before at the threshold", () => { + // Arrange + const waveTracker = new WaveTracker(); - it("returns true for a duplicate number wave resumed before at the threshold", () => { - // Arrange - const waveTracker = new WaveTracker(); + for (let i = 0; i < 10; i += 1) { + waveTracker.addAndCheck({ a: [] }); + } - for (let i = 0; i < 10; i += 1) { - waveTracker.addAndCheck({ a: [] }); - } - waveTracker.addAndCheck({ b: [] }); + waveTracker.addAndCheck({ b: [] }); - for (let i = 0; i < infiniteWaveThreshold - 1; i += 1) { - waveTracker.addAndCheck({ a: [] }); - } + for (let i = 0; i < infiniteWaveThreshold - 1; i += 1) { + waveTracker.addAndCheck({ a: [] }); + } - // Act - const result = waveTracker.addAndCheck({ a: [] }); + // Act + const result = waveTracker.addAndCheck({ a: [] }); - // Assert - expect(result).toBe(true); - }); - }); + // Assert + expect(result).toBe(true); + }); + }); }); diff --git a/src/runtime/providers/tracking/WaveTracker.ts b/src/runtime/providers/tracking/WaveTracker.ts index 478bbb364..bba9cef21 100644 --- a/src/runtime/providers/tracking/WaveTracker.ts +++ b/src/runtime/providers/tracking/WaveTracker.ts @@ -1,7 +1,9 @@ import { Mutation } from "automutate"; -import { Dictionary } from "../../../shared/maps"; -const createHash = (fileMutations: Dictionary) => Object.keys(fileMutations).join(","); +import { Dictionary } from "../../../shared/maps.js"; + +const createHash = (fileMutations: Dictionary) => + Object.keys(fileMutations).join(","); /** * How many waves in a row must be duplicates of previously seen waves to halt. @@ -9,32 +11,32 @@ const createHash = (fileMutations: Dictionary) => Object.ke export const infiniteWaveThreshold = 20; export class WaveTracker { - /** - * How many times each wave file names hash has been seen. - */ - #previouslySeen = new Set(); - - /** - * How many waves in a row have now had repetitions greater than the duplicate threshold. - */ - #repeatedCount = 0; - - /** - * @param fileMutations A newly created wave of mutations. - * @returns Whether the wave has reached the duplicate threshold. - */ - addAndCheck(fileMutations: Dictionary) { - const hash = createHash(fileMutations); - const previouslySeen = this.#previouslySeen.has(hash); - - this.#previouslySeen.add(hash); - - if (!previouslySeen) { - this.#repeatedCount = 0; - return false; - } - - this.#repeatedCount += 1; - return this.#repeatedCount === infiniteWaveThreshold; - } + /** + * How many times each wave file names hash has been seen. + */ + #previouslySeen = new Set(); + + /** + * How many waves in a row have now had repetitions greater than the duplicate threshold. + */ + #repeatedCount = 0; + + /** + * @param fileMutations A newly created wave of mutations. + * @returns Whether the wave has reached the duplicate threshold. + */ + addAndCheck(fileMutations: Dictionary) { + const hash = createHash(fileMutations); + const previouslySeen = this.#previouslySeen.has(hash); + + this.#previouslySeen.add(hash); + + if (!previouslySeen) { + this.#repeatedCount = 0; + return false; + } + + this.#repeatedCount += 1; + return this.#repeatedCount === infiniteWaveThreshold; + } } diff --git a/src/runtime/types.ts b/src/runtime/types.ts index f1c112e04..9cbfb8850 100644 --- a/src/runtime/types.ts +++ b/src/runtime/types.ts @@ -1,11 +1,17 @@ import { MutationsWave } from "automutate"; -import { TypeStatOptions } from "../options/types"; + +import { TypeStatOptions } from "../options/types.js"; export interface ProvidedMutationsWave { - mutationsWave?: MutationsWave; - newOptions?: TypeStatOptions; + mutationsWave?: MutationsWave; + newOptions?: TypeStatOptions; } -export type Provider = () => ProvidedMutationsWave | undefined | Promise; +export type Provider = () => + | Promise + | ProvidedMutationsWave + | undefined; -export type ProviderCreator = (options: TypeStatOptions) => Provider | undefined; +export type ProviderCreator = ( + options: TypeStatOptions, +) => Provider | undefined; diff --git a/src/services/LazyCache.ts b/src/services/LazyCache.ts index cdb926a57..a043284a1 100644 --- a/src/services/LazyCache.ts +++ b/src/services/LazyCache.ts @@ -1,14 +1,14 @@ export class LazyCache { - private value?: T; + private value?: T; - public constructor(private readonly getter: () => T) {} + public constructor(private readonly getter: () => T) {} - public get(): T { - this.value ??= this.getter(); - return this.value; - } + public clear(): void { + this.value = undefined; + } - public clear(): void { - this.value = undefined; - } + public get(): T { + this.value ??= this.getter(); + return this.value; + } } diff --git a/src/services/createProgramConfiguration.ts b/src/services/createProgramConfiguration.ts index b215e6239..fb5d4f8ae 100644 --- a/src/services/createProgramConfiguration.ts +++ b/src/services/createProgramConfiguration.ts @@ -1,37 +1,41 @@ -/* eslint-disable @typescript-eslint/unbound-method */ -import * as fs from "mz/fs"; -import * as path from "path"; -import * as ts from "typescript"; +import * as fs from "node:fs"; +import * as path from "node:path"; +import ts from "typescript"; -import { TypeStatOptions } from "../options/types"; -import { collectOptionals, uniquify } from "../shared/arrays"; -import { normalizeAndSlashify } from "../shared/paths"; +import { TypeStatOptions } from "../options/types.js"; +import { collectOptionals, uniquify } from "../shared/arrays.js"; +import { normalizeAndSlashify } from "../shared/paths.js"; export const createProgramConfiguration = (options: TypeStatOptions) => { - // Create a TypeScript configuration using the raw options - const parsedConfiguration = ts.parseJsonConfigFileContent( - { - ...options.compilerOptions, - skipLibCheck: true, - }, - { - fileExists: fs.existsSync, - readDirectory: ts.sys.readDirectory, - readFile: (file) => fs.readFileSync(file, "utf8"), - useCaseSensitiveFileNames: true, - }, - path.resolve(path.dirname(options.projectPath)), - { noEmit: true }, - ); + // Create a TypeScript configuration using the raw options + const parsedConfiguration = ts.parseJsonConfigFileContent( + { + ...options.compilerOptions, + skipLibCheck: true, + }, + { + fileExists: fs.existsSync, + // eslint-disable-next-line @typescript-eslint/unbound-method + readDirectory: ts.sys.readDirectory, + readFile: (file) => fs.readFileSync(file, "utf8"), + useCaseSensitiveFileNames: true, + }, + path.resolve(path.dirname(options.projectPath)), + { noEmit: true }, + ); - // Include all possible file names in our program, including ones we won't later visit - // TypeScript projects must include source files for all nodes we look at - // See https://github.com/Microsoft/TypeScript/issues/28413 - const fileNames = uniquify(...Array.from(collectOptionals(options.fileNames, parsedConfiguration.fileNames)).map(normalizeAndSlashify)); + // Include all possible file names in our program, including ones we won't later visit + // TypeScript projects must include source files for all nodes we look at + // See https://github.com/Microsoft/TypeScript/issues/28413 + const fileNames = uniquify( + ...Array.from( + collectOptionals(options.fileNames, parsedConfiguration.fileNames), + ).map(normalizeAndSlashify), + ); - // Create a basic TypeScript compiler host and program using the parsed compiler options - const host = ts.createCompilerHost({}, true); - const program = ts.createProgram(fileNames, options.compilerOptions, host); + // Create a basic TypeScript compiler host and program using the parsed compiler options + const host = ts.createCompilerHost({}, true); + const program = ts.createProgram(fileNames, options.compilerOptions, host); - return { fileNames, parsedConfiguration, program }; + return { fileNames, parsedConfiguration, program }; }; diff --git a/src/services/language.ts b/src/services/language.ts index 39c9290a3..2d4b0c9c5 100644 --- a/src/services/language.ts +++ b/src/services/language.ts @@ -1,103 +1,121 @@ /* eslint-disable @typescript-eslint/unbound-method */ -import * as fs from "mz/fs"; -import * as ts from "typescript"; +import * as fs from "node:fs"; +import ts from "typescript"; -import { TypeStatOptions } from "../options/types"; -import { arrayify, uniquify } from "../shared/arrays"; -import { isIntrisinicNameType, WellKnownTypeName } from "../shared/typeNodes"; +import { TypeStatOptions } from "../options/types.js"; +import { arrayify, uniquify } from "../shared/arrays.js"; +import { WellKnownTypeName, isIntrinsicNameType } from "../shared/typeNodes.js"; +import { createProgramConfiguration } from "./createProgramConfiguration.js"; -import { createProgramConfiguration } from "./createProgramConfiguration"; - -export type WellKnownTypes = Readonly>>; +export type WellKnownTypes = Readonly< + Record> +>; /** * Language service and type information with their backing TypeScript configuration. */ export interface LanguageServices { - readonly languageService: ts.LanguageService; - readonly parsedConfiguration: ts.ParsedCommandLine; - readonly printers: Printers; - readonly program: ts.Program; - readonly wellKnownTypes: WellKnownTypes; + readonly languageService: ts.LanguageService; + readonly parsedConfiguration: ts.ParsedCommandLine; + readonly printers: Printers; + readonly program: ts.Program; + readonly wellKnownTypes: WellKnownTypes; } export interface Printers { - readonly node: (node: ts.Node) => string; - readonly type: ( - types: ts.Type | string | readonly (ts.Type | string)[], - enclosingDeclaration?: ts.Node, - typeFormatFlags?: ts.TypeFormatFlags, - ) => string; + readonly node: (node: ts.Node) => string; + readonly type: ( + types: readonly (string | ts.Type)[] | string | ts.Type, + enclosingDeclaration?: ts.Node, + typeFormatFlags?: ts.TypeFormatFlags, + ) => string; } /** * @returns Associated language service and type information based on TypeStat options. */ -export const createLanguageServices = (options: TypeStatOptions): LanguageServices => { - // Collect file names and parse raw options into a TypeScript program with its configuration settings - const { fileNames, parsedConfiguration, program } = createProgramConfiguration(options); +export const createLanguageServices = ( + options: TypeStatOptions, +): LanguageServices => { + // Collect file names and parse raw options into a TypeScript program with its configuration settings + const { fileNames, parsedConfiguration, program } = + createProgramConfiguration(options); - // Create a TypeScript language service using the compiler host - const servicesHost: ts.LanguageServiceHost = { - fileExists: ts.sys.fileExists, - getCompilationSettings: () => options.compilerOptions, - getCurrentDirectory: () => options.package.directory, - getDefaultLibFileName: ts.getDefaultLibFilePath, - getScriptFileNames: () => fileNames, - getScriptSnapshot: (fileName) => - fs.existsSync(fileName) ? ts.ScriptSnapshot.fromString(fs.readFileSync(fileName).toString()) : undefined, - getScriptVersion: () => "0", - readDirectory: ts.sys.readDirectory, - readFile: ts.sys.readFile, - }; - const languageService = ts.createLanguageService(servicesHost, ts.createDocumentRegistry()); + // Create a TypeScript language service using the compiler host + const servicesHost: ts.LanguageServiceHost = { + fileExists: ts.sys.fileExists, + getCompilationSettings: () => options.compilerOptions, + getCurrentDirectory: () => options.package.directory, + getDefaultLibFileName: ts.getDefaultLibFilePath, + getScriptFileNames: () => fileNames, + getScriptSnapshot: (fileName) => + fs.existsSync(fileName) + ? ts.ScriptSnapshot.fromString(fs.readFileSync(fileName).toString()) + : undefined, + getScriptVersion: () => "0", + readDirectory: ts.sys.readDirectory, + readFile: ts.sys.readFile, + }; + const languageService = ts.createLanguageService( + servicesHost, + ts.createDocumentRegistry(), + ); - // This printer will later come in handy for emitting raw ASTs to text - const printer = ts.createPrinter({ - newLine: options.compilerOptions.newLine, - }); - const printers: Printers = { - node(node) { - return printer.printNode( - ts.EmitHint.Unspecified, - node, - ts.createSourceFile("temp.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TSX), - ); - }, - type(types, enclosingDeclaration, typeFormatFlags) { - const typeChecker = program.getTypeChecker(); - return uniquify( - ...arrayify(types).map((type) => - typeof type === "string" - ? type - : typeChecker.typeToString( - // Our mutations generally always go for base primitives, not literals - // This might need to be revisited for potential future high fidelity types... - typeChecker.getBaseTypeOfLiteralType(type), - enclosingDeclaration, - typeFormatFlags, - ), - ), - ).join(" | "); - }, - }; + // This printer will later come in handy for emitting raw ASTs to text + const printer = ts.createPrinter({ + newLine: options.compilerOptions.newLine, + }); + const printers: Printers = { + node(node) { + return printer.printNode( + ts.EmitHint.Unspecified, + node, + ts.createSourceFile( + "temp.ts", + "", + ts.ScriptTarget.Latest, + false, + ts.ScriptKind.TSX, + ), + ); + }, + type(types, enclosingDeclaration, typeFormatFlags) { + const typeChecker = program.getTypeChecker(); + return uniquify( + ...arrayify(types).map((type) => + typeof type === "string" + ? type + : typeChecker.typeToString( + // Our mutations generally always go for base primitives, not literals + // This might need to be revisited for potential future high fidelity types... + typeChecker.getBaseTypeOfLiteralType(type), + enclosingDeclaration, + typeFormatFlags, + ), + ), + ).join(" | "); + }, + }; - let wellKnownTypes: WellKnownTypes | undefined; + let wellKnownTypes: WellKnownTypes | undefined; - return { - languageService, - parsedConfiguration, - program, - printers, - get wellKnownTypes(): WellKnownTypes { - return (wellKnownTypes ??= program.getTypeCatalog().reduce>((acc, type) => { - if (isIntrisinicNameType(type)) { - acc[type.intrinsicName] = type; - } + return { + languageService, + parsedConfiguration, + printers, + program, + get wellKnownTypes(): WellKnownTypes { + return (wellKnownTypes ??= program + .getTypeCatalog() + .reduce>((acc, type) => { + if (isIntrinsicNameType(type)) { + acc[type.intrinsicName] = type; + } - return acc; - // eslint-disable-next-line @typescript-eslint/prefer-reduce-type-parameter - }, {} as WellKnownTypes)); - }, - }; + return acc; + // eslint-disable-next-line @typescript-eslint/prefer-reduce-type-parameter + }, {} as WellKnownTypes)); + }, + }; }; +/* eslint-enable @typescript-eslint/unbound-method */ diff --git a/src/services/parseJsonConfigFileContent.ts b/src/services/parseJsonConfigFileContent.ts index 6f5713520..4f6149654 100644 --- a/src/services/parseJsonConfigFileContent.ts +++ b/src/services/parseJsonConfigFileContent.ts @@ -1,28 +1,34 @@ -import minimatch from "minimatch"; -import * as fs from "mz/fs"; -import * as path from "path"; -import * as ts from "typescript"; +import { minimatch } from "minimatch"; +import * as fs from "node:fs"; +import * as path from "node:path"; +import ts from "typescript"; -export const parseJsonConfigFileContent = (config: unknown, cwd: string, existingOptions?: ts.CompilerOptions) => { - return ts.parseJsonConfigFileContent( - config, - { - useCaseSensitiveFileNames: true, - readDirectory: (rootDir, extensions, excludes, includes) => - includes - .flatMap((include) => - fs.readdirSync(path.join(rootDir, include)).map((fileName) => path.join(rootDir, include, fileName)), - ) - .filter( - (filePath) => - !excludes?.some((exclude) => minimatch(filePath, exclude)) && - extensions.some((extension) => filePath.endsWith(extension)), - ) - .map((filePath) => path.relative(rootDir, filePath)), - fileExists: (filePath) => fs.statSync(filePath).isFile(), - readFile: (filePath) => fs.readFileSync(filePath).toString(), - }, - cwd, - existingOptions, - ); +export const parseJsonConfigFileContent = ( + config: unknown, + cwd: string, + existingOptions?: ts.CompilerOptions, +) => { + return ts.parseJsonConfigFileContent( + config, + { + fileExists: (filePath) => fs.statSync(filePath).isFile(), + readDirectory: (rootDir, extensions, excludes, includes) => + includes + .flatMap((include) => + fs + .readdirSync(path.join(rootDir, include)) + .map((fileName) => path.join(rootDir, include, fileName)), + ) + .filter( + (filePath) => + !excludes?.some((exclude) => minimatch(filePath, exclude)) && + extensions.some((extension) => filePath.endsWith(extension)), + ) + .map((filePath) => path.relative(rootDir, filePath)), + readFile: (filePath) => fs.readFileSync(filePath).toString(), + useCaseSensitiveFileNames: true, + }, + cwd, + existingOptions, + ); }; diff --git a/src/shared/FileInfoCache.ts b/src/shared/FileInfoCache.ts index 0a1da7afb..2c85935e6 100644 --- a/src/shared/FileInfoCache.ts +++ b/src/shared/FileInfoCache.ts @@ -1,39 +1,49 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { LanguageServices } from "../services/language"; - -import { findRelevantNodeReferencesAsNodes } from "./references"; +import { LanguageServices } from "../services/language.js"; +import { findRelevantNodeReferencesAsNodes } from "./references.js"; export class FileInfoCache { - private readonly nodeReferences = new Map(); - private variableUsage: ReadonlyMap | undefined; - - public constructor( - private readonly filteredNodes: ReadonlySet, - private readonly services: LanguageServices, - private readonly sourceFile: ts.SourceFile, - ) {} - - /** - * @returns All corresponding nodes for the reference entries for a node. - */ - public getNodeReferencesAsNodes(node: ts.Node): readonly ts.Node[] | undefined { - let references = this.nodeReferences.get(node); - - if (references === undefined) { - references = findRelevantNodeReferencesAsNodes(this.filteredNodes, this.services, node); - this.nodeReferences.set(node, references); - } - - return references; - } - - public getVariableUsage(): ReadonlyMap { - if (this.variableUsage === undefined) { - this.variableUsage = tsutils.collectVariableUsage(this.sourceFile); - } - - return this.variableUsage; - } + private readonly nodeReferences = new Map< + ts.Node, + readonly ts.Node[] | undefined + >(); + private variableUsage: + | ReadonlyMap + | undefined; + + public constructor( + private readonly filteredNodes: ReadonlySet, + private readonly services: LanguageServices, + private readonly sourceFile: ts.SourceFile, + ) {} + + /** + * @returns All corresponding nodes for the reference entries for a node. + */ + public getNodeReferencesAsNodes( + node: ts.Node, + ): readonly ts.Node[] | undefined { + let references = this.nodeReferences.get(node); + + if (references === undefined) { + references = findRelevantNodeReferencesAsNodes( + this.filteredNodes, + this.services, + node, + ); + this.nodeReferences.set(node, references); + } + + return references; + } + + public getVariableUsage(): ReadonlyMap { + if (this.variableUsage === undefined) { + this.variableUsage = tsutils.collectVariableUsage(this.sourceFile); + } + + return this.variableUsage; + } } diff --git a/src/shared/NameGenerator.test.ts b/src/shared/NameGenerator.test.ts index 965abb7e5..35366e2da 100644 --- a/src/shared/NameGenerator.test.ts +++ b/src/shared/NameGenerator.test.ts @@ -1,42 +1,44 @@ -import { NameGenerator } from "./NameGenerator"; +import { describe, expect, it } from "vitest"; + +import { NameGenerator } from "./NameGenerator.js"; describe("NameGenerator", () => { - it("creates a basic name when the base portion hasn't been requested yet", () => { - // Arrange - const sourceFileName = "File"; - const nameGenerator = new NameGenerator(sourceFileName); - - // Act - const name = nameGenerator.generateName("Base"); - - // Assert - expect(name).toEqual("FileBase"); - }); - - it("creates a 1-suffixed name when the base portion has been requested once", () => { - // Arrange - const sourceFileName = "File"; - const nameGenerator = new NameGenerator(sourceFileName); - nameGenerator.generateName("Base"); - - // Act - const name = nameGenerator.generateName("Base"); - - // Assert - expect(name).toEqual("FileBase2"); - }); - - it("creates 2-suffixed name when the base portion has been requested twice", () => { - // Arrange - const sourceFileName = "File"; - const nameGenerator = new NameGenerator(sourceFileName); - nameGenerator.generateName("Base"); - nameGenerator.generateName("Base"); - - // Act - const name = nameGenerator.generateName("Base"); - - // Assert - expect(name).toEqual("FileBase3"); - }); + it("creates a basic name when the base portion hasn't been requested yet", () => { + // Arrange + const sourceFileName = "File"; + const nameGenerator = new NameGenerator(sourceFileName); + + // Act + const name = nameGenerator.generateName("Base"); + + // Assert + expect(name).toEqual("FileBase"); + }); + + it("creates a 1-suffixed name when the base portion has been requested once", () => { + // Arrange + const sourceFileName = "File"; + const nameGenerator = new NameGenerator(sourceFileName); + nameGenerator.generateName("Base"); + + // Act + const name = nameGenerator.generateName("Base"); + + // Assert + expect(name).toEqual("FileBase2"); + }); + + it("creates 2-suffixed name when the base portion has been requested twice", () => { + // Arrange + const sourceFileName = "File"; + const nameGenerator = new NameGenerator(sourceFileName); + nameGenerator.generateName("Base"); + nameGenerator.generateName("Base"); + + // Act + const name = nameGenerator.generateName("Base"); + + // Assert + expect(name).toEqual("FileBase3"); + }); }); diff --git a/src/shared/NameGenerator.ts b/src/shared/NameGenerator.ts index da6c6de3e..8c79b4346 100644 --- a/src/shared/NameGenerator.ts +++ b/src/shared/NameGenerator.ts @@ -2,19 +2,19 @@ * Generates new names that are unique per file. */ export class NameGenerator { - private readonly countsPerBase = new Map(); + private readonly countsPerBase = new Map(); - public constructor(private readonly sourceFileName: string) {} + public constructor(private readonly sourceFileName: string) {} - public generateName(base: string) { - const existingCount = this.countsPerBase.get(base); + public generateName(base: string) { + const existingCount = this.countsPerBase.get(base); - if (existingCount === undefined) { - this.countsPerBase.set(base, 1); - return `${this.sourceFileName}${base}`; - } + if (existingCount === undefined) { + this.countsPerBase.set(base, 1); + return `${this.sourceFileName}${base}`; + } - this.countsPerBase.set(base, existingCount + 1); - return `${this.sourceFileName}${base}${existingCount + 1}`; - } + this.countsPerBase.set(base, existingCount + 1); + return `${this.sourceFileName}${base}${existingCount + 1}`; + } } diff --git a/src/shared/arrays.ts b/src/shared/arrays.ts index 686a45cbc..ef06e5548 100644 --- a/src/shared/arrays.ts +++ b/src/shared/arrays.ts @@ -1,29 +1,34 @@ -export const arrayify = (items: T | readonly T[] | undefined): readonly T[] => { - if (items === undefined) { - return []; - } +export const arrayify = ( + items: T | readonly T[] | undefined, +): readonly T[] => { + if (items === undefined) { + return []; + } - if (items instanceof Array) { - return items; - } + if (items instanceof Array) { + return items; + } - return [items]; + return [items]; }; -export const collectOptionals = (...arrays: (readonly T[] | undefined)[]): T[] => { - const results: T[] = []; +export const collectOptionals = ( + ...arrays: (readonly T[] | undefined)[] +): T[] => { + const results: T[] = []; - for (const array of arrays) { - if (array !== undefined) { - results.push(...array); - } - } + for (const array of arrays) { + if (array !== undefined) { + results.push(...array); + } + } - return results; + return results; }; -export const isNotUndefined = (item: T | undefined): item is T => item !== undefined; +export const isNotUndefined = (item: T | undefined): item is T => + item !== undefined; export const uniquify = (...items: T[]): T[] => { - return Array.from(new Set(items)); + return Array.from(new Set(items)); }; diff --git a/src/shared/assignments.ts b/src/shared/assignments.ts index 1b9515864..4cce7cf6e 100644 --- a/src/shared/assignments.ts +++ b/src/shared/assignments.ts @@ -1,12 +1,12 @@ -import * as ts from "typescript"; -import { FileMutationsRequest } from "./fileMutator"; -import { getValueDeclarationOfFunction } from "./functionTypes"; -import { getTypeAtLocationIfNotError } from "./types"; +import ts from "typescript"; + +import { FileMutationsRequest } from "./fileMutator.js"; +import { getValueDeclarationOfFunction } from "./functionTypes.js"; +import { getTypeAtLocationIfNotError } from "./types.js"; /** * Given a node passed to a location with a declared, known type, * attempts to find that known type. - * * @example * If the node is assigned to a variable, this would return that variable's type. * In this case, that would be `Record`: @@ -15,7 +15,6 @@ import { getTypeAtLocationIfNotError } from "./types"; * const value: Record = {}; * // ^^ * ``` - * * @example * If the node passed to a function, this would return that variable's type. * In this case, that would be `number | null`: @@ -26,40 +25,58 @@ import { getTypeAtLocationIfNotError } from "./types"; * // ^ * ``` */ -export const getManuallyAssignedTypeOfNode = (request: FileMutationsRequest, node: ts.Node) => { - const { parent } = node; +export const getManuallyAssignedTypeOfNode = ( + request: FileMutationsRequest, + node: ts.Node, +) => { + const { parent } = node; - if (ts.isCallExpression(parent)) { - return getAssignedTypeOfParameter(request, node as ts.Expression, parent); - } + if (ts.isCallExpression(parent)) { + return getAssignedTypeOfParameter(request, node as ts.Expression, parent); + } - if (ts.isVariableDeclaration(parent)) { - return getAssignedTypeOfVariable(request, parent); - } + if (ts.isVariableDeclaration(parent)) { + return getAssignedTypeOfVariable(request, parent); + } - return undefined; + return undefined; }; -const getAssignedTypeOfParameter = (request: FileMutationsRequest, node: ts.Expression, parent: ts.CallExpression) => { - // Collect the declared type of the function-like being called - const functionLikeValueDeclaration = getValueDeclarationOfFunction(request, parent.expression); - if (functionLikeValueDeclaration === undefined) { - return undefined; - } +const getAssignedTypeOfParameter = ( + request: FileMutationsRequest, + node: ts.Expression, + parent: ts.CallExpression, +) => { + // Collect the declared type of the function-like being called + const functionLikeValueDeclaration = getValueDeclarationOfFunction( + request, + parent.expression, + ); + if (functionLikeValueDeclaration === undefined) { + return undefined; + } - // Don't bother checking for an out-of-range parameter - const argumentIndex = parent.arguments.indexOf(node); - if (argumentIndex >= functionLikeValueDeclaration.parameters.length) { - return undefined; - } + // Don't bother checking for an out-of-range parameter + const argumentIndex = parent.arguments.indexOf(node); + if (argumentIndex >= functionLikeValueDeclaration.parameters.length) { + return undefined; + } - return getTypeAtLocationIfNotError(request, functionLikeValueDeclaration.parameters[argumentIndex]); + return getTypeAtLocationIfNotError( + request, + functionLikeValueDeclaration.parameters[argumentIndex], + ); }; -const getAssignedTypeOfVariable = (request: FileMutationsRequest, node: ts.VariableDeclaration) => { - if (node.type === undefined) { - return undefined; - } +const getAssignedTypeOfVariable = ( + request: FileMutationsRequest, + node: ts.VariableDeclaration, +) => { + if (node.type === undefined) { + return undefined; + } - return request.services.program.getTypeChecker().getTypeFromTypeNode(node.type); + return request.services.program + .getTypeChecker() + .getTypeFromTypeNode(node.type); }; diff --git a/src/shared/calls.ts b/src/shared/calls.ts index f250743fa..be7cd675d 100644 --- a/src/shared/calls.ts +++ b/src/shared/calls.ts @@ -1,49 +1,70 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "./fileMutator"; -import { getTypeAtLocationIfNotError } from "./types"; +import { FileMutationsRequest } from "./fileMutator.js"; +import { getTypeAtLocationIfNotError } from "./types.js"; export const getDeclaredTypesOfArgument = ( - request: FileMutationsRequest, - parentCall: ts.CallExpression | ts.NewExpression, - argument: ts.Expression, + request: FileMutationsRequest, + parentCall: ts.CallExpression | ts.NewExpression, + argument: ts.Expression, ) => { - const declaredTypes: ts.Type[] = []; + const declaredTypes: ts.Type[] = []; - if (parentCall.arguments === undefined) { - return declaredTypes; - } + if (parentCall.arguments === undefined) { + return declaredTypes; + } - const parentCallType = getTypeAtLocationIfNotError(request, parentCall.expression); - if (parentCallType === undefined) { - return declaredTypes; - } + const parentCallType = getTypeAtLocationIfNotError( + request, + parentCall.expression, + ); + if (parentCallType === undefined) { + return declaredTypes; + } - // Get the signatures for that parent call - const argumentIndex = parentCall.arguments.indexOf(argument); - const typeChecker = request.services.program.getTypeChecker(); - const parentSignatures = ts.isCallExpression(parentCall) ? parentCallType.getCallSignatures() : parentCallType.getConstructSignatures(); + // Get the signatures for that parent call + const argumentIndex = parentCall.arguments.indexOf(argument); + const typeChecker = request.services.program.getTypeChecker(); + const parentSignatures = ts.isCallExpression(parentCall) + ? parentCallType.getCallSignatures() + : parentCallType.getConstructSignatures(); - for (const parentSignature of parentSignatures) { - if (argumentIndex >= parentSignature.parameters.length || parentSignature.declaration === undefined) { - continue; - } + for (const parentSignature of parentSignatures) { + if ( + argumentIndex >= parentSignature.parameters.length || + parentSignature.declaration === undefined + ) { + continue; + } - const parameterSymbol = parentSignature.parameters[argumentIndex]; - const parameterType = typeChecker.getTypeOfSymbolAtLocation(parameterSymbol, parentSignature.declaration.parameters[argumentIndex]); - declaredTypes.push(parameterType); - } + const parameterSymbol = parentSignature.parameters[argumentIndex]; + const parameterType = typeChecker.getTypeOfSymbolAtLocation( + parameterSymbol, + parentSignature.declaration.parameters[argumentIndex], + ); + declaredTypes.push(parameterType); + } - return declaredTypes; + return declaredTypes; }; -export const getCallExpressionType = (request: FileMutationsRequest, parentCall: ts.CallExpression) => { - const typeChecker = request.services.program.getTypeChecker(); - const argumentTypes = parentCall.arguments.map((argument) => typeChecker.getTypeAtLocation(argument)); +export const getCallExpressionType = ( + request: FileMutationsRequest, + parentCall: ts.CallExpression, +) => { + const typeChecker = request.services.program.getTypeChecker(); + const argumentTypes = parentCall.arguments.map((argument) => + typeChecker.getTypeAtLocation(argument), + ); - return [ - "((", - argumentTypes.map((parameter, index) => `arg${index}: ${request.services.printers.type(parameter)}`).join(", "), - ") => unknown)", - ].join(""); + return [ + "((", + argumentTypes + .map( + (parameter, index) => + `arg${index}: ${request.services.printers.type(parameter)}`, + ) + .join(", "), + ") => unknown)", + ].join(""); }; diff --git a/src/shared/comparisons.ts b/src/shared/comparisons.ts index 1566509db..c4fa68430 100644 --- a/src/shared/comparisons.ts +++ b/src/shared/comparisons.ts @@ -1,113 +1,161 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; - -import { FileMutationsRequest } from "./fileMutator"; -import { isIntrisinicNameType, isOptionalTypeArgumentsTypeNode } from "./typeNodes"; -import { getTypeAtLocationIfNotError } from "./types"; - -export const declaredInitializedTypeNodeIsRedundant = (request: FileMutationsRequest, declaration: ts.TypeNode, initializer: ts.Node) => { - // Most literals (e.g. `""`) have a corresponding keyword (e.g. `string`) - switch (declaration.kind) { - case ts.SyntaxKind.BooleanKeyword: - return initializer.kind === ts.SyntaxKind.FalseKeyword || initializer.kind === ts.SyntaxKind.TrueKeyword; - - case ts.SyntaxKind.NullKeyword: - return initializer.kind === ts.SyntaxKind.NullKeyword; - - case ts.SyntaxKind.NumberKeyword: - return initializer.kind === ts.SyntaxKind.NumericLiteral; - - case ts.SyntaxKind.StringKeyword: - return initializer.kind === ts.SyntaxKind.StringLiteral; - - // (except for `undefined`, which is an initializer one should never reassign) - case ts.SyntaxKind.UndefinedKeyword: - return ts.isIdentifier(initializer) && initializer.text === "undefined"; - } - - // `RegExp`s are also initializers that one should never reassign - if (ts.isTypeReferenceNode(declaration) && ts.isIdentifier(declaration.typeName)) { - switch (declaration.typeName.text) { - case "RegExp": - return initializer.kind === ts.SyntaxKind.RegularExpressionLiteral; - } - } - - // Other types are complex enough to need the type checker... - const declaredType = getTypeAtLocationIfNotError(request, declaration); - if (declaredType === undefined) { - return undefined; - } - - const initializedType = getTypeAtLocationIfNotError(request, initializer); - if (initializedType === undefined) { - return undefined; - } - - return declaredTypeIsEquivalent(request.services.program.getTypeChecker(), declaredType, initializedType); +import ts from "typescript"; + +import { FileMutationsRequest } from "./fileMutator.js"; +import { + isIntrinsicNameType, + isOptionalTypeArgumentsTypeNode, +} from "./typeNodes.js"; +import { getTypeAtLocationIfNotError } from "./types.js"; + +export const declaredInitializedTypeNodeIsRedundant = ( + request: FileMutationsRequest, + declaration: ts.TypeNode, + initializer: ts.Node, +) => { + // Most literals (e.g. `""`) have a corresponding keyword (e.g. `string`) + switch (declaration.kind) { + case ts.SyntaxKind.BooleanKeyword: + return ( + initializer.kind === ts.SyntaxKind.FalseKeyword || + initializer.kind === ts.SyntaxKind.TrueKeyword + ); + + case ts.SyntaxKind.NullKeyword: + return initializer.kind === ts.SyntaxKind.NullKeyword; + + case ts.SyntaxKind.NumberKeyword: + return initializer.kind === ts.SyntaxKind.NumericLiteral; + + case ts.SyntaxKind.StringKeyword: + return initializer.kind === ts.SyntaxKind.StringLiteral; + + // (except for `undefined`, which is an initializer one should never reassign) + case ts.SyntaxKind.UndefinedKeyword: + return ts.isIdentifier(initializer) && initializer.text === "undefined"; + } + + // `RegExp`s are also initializers that one should never reassign + if ( + ts.isTypeReferenceNode(declaration) && + ts.isIdentifier(declaration.typeName) + ) { + switch (declaration.typeName.text) { + case "RegExp": + return initializer.kind === ts.SyntaxKind.RegularExpressionLiteral; + } + } + + // Other types are complex enough to need the type checker... + const declaredType = getTypeAtLocationIfNotError(request, declaration); + if (declaredType === undefined) { + return undefined; + } + + const initializedType = getTypeAtLocationIfNotError(request, initializer); + if (initializedType === undefined) { + return undefined; + } + + return declaredTypeIsEquivalent( + request.services.program.getTypeChecker(), + declaredType, + initializedType, + ); }; -const declaredTypeIsEquivalent = (typeChecker: ts.TypeChecker, declaredType: ts.Type, initializedType: ts.Type) => { - // Most types, such as `string[]` / `[""]`, are generally found by this intersection... - if ( - typeChecker.isTypeAssignableTo(declaredType, initializedType) && - typeChecker.isTypeAssignableTo(initializedType, declaredType) && - // ...though, notably, declares union types trigger false positives against non-union initializations - !(tsutils.isUnionType(declaredType) && !tsutils.isUnionType(initializedType)) - ) { - return true; - } - - // We have to hackily check for boolean types with intrinsic names... - // `boolean[]` is really the type `[false, true]` - if (isIntrisinicNameType(declaredType) && isIntrisinicNameType(initializedType)) { - return intrinsicNamesAreEquivalent(declaredType.intrinsicName, initializedType.intrinsicName); - } - - // If the types have the same symbol, they're likely arrays or classes with potentially comparable generics - return typeSymbolsAndArgumentsAreEquivalent(typeChecker, declaredType, initializedType); +const declaredTypeIsEquivalent = ( + typeChecker: ts.TypeChecker, + declaredType: ts.Type, + initializedType: ts.Type, +) => { + // Most types, such as `string[]` / `[""]`, are generally found by this intersection... + if ( + typeChecker.isTypeAssignableTo(declaredType, initializedType) && + typeChecker.isTypeAssignableTo(initializedType, declaredType) && + // ...though, notably, declares union types trigger false positives against non-union initializations + !( + tsutils.isUnionType(declaredType) && !tsutils.isUnionType(initializedType) + ) + ) { + return true; + } + + // We have to hackily check for boolean types with intrinsic names... + // `boolean[]` is really the type `[false, true]` + if ( + isIntrinsicNameType(declaredType) && + isIntrinsicNameType(initializedType) + ) { + return intrinsicNamesAreEquivalent( + declaredType.intrinsicName, + initializedType.intrinsicName, + ); + } + + // If the types have the same symbol, they're likely arrays or classes with potentially comparable generics + return typeSymbolsAndArgumentsAreEquivalent( + typeChecker, + declaredType, + initializedType, + ); }; -const typeSymbolsAndArgumentsAreEquivalent = (typeChecker: ts.TypeChecker, declaredType: ts.Type, initializedType: ts.Type) => { - const declaredSymbol = declaredType.getSymbol(); - const initializedSymbol = initializedType.getSymbol(); - if ( - declaredSymbol !== initializedSymbol || - !isOptionalTypeArgumentsTypeNode(declaredType) || - declaredType.typeArguments === undefined || - !isOptionalTypeArgumentsTypeNode(initializedType) || - initializedType.typeArguments === undefined - ) { - return false; - } - - if (declaredType.typeArguments.length !== initializedType.typeArguments.length) { - return false; - } - - for (let i = 0; i < declaredType.typeArguments.length; i += 1) { - const declaredTypeArgument = declaredType.typeArguments[i]; - const initializedTypeArgument = initializedType.typeArguments[i]; - - if (!declaredTypeIsEquivalent(typeChecker, declaredTypeArgument, initializedTypeArgument)) { - return false; - } - } - - return true; +const typeSymbolsAndArgumentsAreEquivalent = ( + typeChecker: ts.TypeChecker, + declaredType: ts.Type, + initializedType: ts.Type, +) => { + const declaredSymbol = declaredType.getSymbol(); + const initializedSymbol = initializedType.getSymbol(); + if ( + declaredSymbol !== initializedSymbol || + !isOptionalTypeArgumentsTypeNode(declaredType) || + declaredType.typeArguments === undefined || + !isOptionalTypeArgumentsTypeNode(initializedType) || + initializedType.typeArguments === undefined + ) { + return false; + } + + if ( + declaredType.typeArguments.length !== initializedType.typeArguments.length + ) { + return false; + } + + for (let i = 0; i < declaredType.typeArguments.length; i += 1) { + const declaredTypeArgument = declaredType.typeArguments[i]; + const initializedTypeArgument = initializedType.typeArguments[i]; + + if ( + !declaredTypeIsEquivalent( + typeChecker, + declaredTypeArgument, + initializedTypeArgument, + ) + ) { + return false; + } + } + + return true; }; /** * Checks intrinsic names of types that wouldn't have been caught with `typeChecker.isTypeAssignableTo`. */ -const intrinsicNamesAreEquivalent = (declaredName: string, initializedName: string) => { - switch (declaredName) { - case "boolean": - return initializedName === "false" || initializedName === "true"; - - case "null": - return initializedName === "null"; - } - - return false; +const intrinsicNamesAreEquivalent = ( + declaredName: string, + initializedName: string, +) => { + switch (declaredName) { + case "boolean": + return initializedName === "false" || initializedName === "true"; + + case "null": + return initializedName === "null"; + } + + return false; }; diff --git a/src/shared/diagnostics.ts b/src/shared/diagnostics.ts index 0755b299b..4c6a59b92 100644 --- a/src/shared/diagnostics.ts +++ b/src/shared/diagnostics.ts @@ -1,17 +1,24 @@ -import * as ts from "typescript"; +import ts from "typescript"; export type DiagnosticWithStart = ts.Diagnostic & { - start: number; + start: number; }; -export const isDiagnosticWithStart = (diagnostic: ts.Diagnostic): diagnostic is DiagnosticWithStart => { - return !!diagnostic.start; +export const isDiagnosticWithStart = ( + diagnostic: ts.Diagnostic, +): diagnostic is DiagnosticWithStart => { + return !!diagnostic.start; }; -export const getLineForDiagnostic = (diagnostic: DiagnosticWithStart, sourceFile: ts.SourceFile) => { - return ts.getLineAndCharacterOfPosition(sourceFile, diagnostic.start).line; +export const getLineForDiagnostic = ( + diagnostic: DiagnosticWithStart, + sourceFile: ts.SourceFile, +) => { + return ts.getLineAndCharacterOfPosition(sourceFile, diagnostic.start).line; }; export const stringifyDiagnosticMessageText = (diagnostic: ts.Diagnostic) => { - return typeof diagnostic.messageText === "string" ? diagnostic.messageText : diagnostic.messageText.messageText; + return typeof diagnostic.messageText === "string" + ? diagnostic.messageText + : diagnostic.messageText.messageText; }; diff --git a/src/shared/errors.ts b/src/shared/errors.ts index 9f4114b39..e80b5baf6 100644 --- a/src/shared/errors.ts +++ b/src/shared/errors.ts @@ -1,16 +1,19 @@ -/* eslint-disable @typescript-eslint/restrict-template-expressions */ -export const getQuickErrorSummary = (error: unknown, stackTraceLimit = Infinity): string => { - if (!(error instanceof Error) || error.stack === undefined) { - return `${error}`; - } +export const getQuickErrorSummary = ( + error: unknown, + stackTraceLimit = Infinity, +): string => { + if (!(error instanceof Error) || error.stack === undefined) { + // eslint-disable-next-line @typescript-eslint/restrict-template-expressions + return `${error}`; + } - const lines = error.stack.split("\n"); + const lines = error.stack.split("\n"); - let output = lines.slice(0, stackTraceLimit).join("\n\t"); + let output = lines.slice(0, stackTraceLimit).join("\n\t"); - if (lines.length > stackTraceLimit) { - output += "\n\t ..."; - } + if (lines.length > stackTraceLimit) { + output += "\n\t ..."; + } - return output; + return output; }; diff --git a/src/shared/fileMutator.ts b/src/shared/fileMutator.ts index acc7a66d4..0c9cbfb02 100644 --- a/src/shared/fileMutator.ts +++ b/src/shared/fileMutator.ts @@ -1,29 +1,29 @@ import { Mutation } from "automutate"; -import * as ts from "typescript"; +import ts from "typescript"; -import { TypeStatOptions } from "../options/types"; -import { LanguageServices } from "../services/language"; -import { FileInfoCache } from "./FileInfoCache"; -import { NameGenerator } from "./NameGenerator"; - -import { MutationsComplaint } from "../mutators/complaint"; +import { MutationsComplaint } from "../mutators/complaint.js"; +import { TypeStatOptions } from "../options/types.js"; +import { LanguageServices } from "../services/language.js"; +import { FileInfoCache } from "./FileInfoCache.js"; +import { NameGenerator } from "./NameGenerator.js"; /** * Source file, metadata, and settings to collect mutations in the file. */ export interface FileMutationsRequest { - readonly fileInfoCache: FileInfoCache; - readonly filteredNodes: Set; - readonly nameGenerator: NameGenerator; - readonly options: TypeStatOptions; - readonly services: LanguageServices; - readonly sourceFile: ts.SourceFile; + readonly fileInfoCache: FileInfoCache; + readonly filteredNodes: Set; + readonly nameGenerator: NameGenerator; + readonly options: TypeStatOptions; + readonly services: LanguageServices; + readonly sourceFile: ts.SourceFile; } /** * Finds mutations of a certain node type to run on a file. - * * @param request Source file, metadata, and settings to collect mutations in the file. * @returns Any mutations found to apply to the file, or a wrapped error complaint, if either is found. */ -export type FileMutator = (request: FileMutationsRequest) => readonly Mutation[] | MutationsComplaint | undefined; +export type FileMutator = ( + request: FileMutationsRequest, +) => MutationsComplaint | readonly Mutation[] | undefined; diff --git a/src/shared/fileNames.ts b/src/shared/fileNames.ts index a7786497a..3a8542869 100644 --- a/src/shared/fileNames.ts +++ b/src/shared/fileNames.ts @@ -1,12 +1,14 @@ /** * Converts a full file path to just the non-extension portion of the file name. - * * @param fullFilePath Full file path, such as `"C:/Code/Project/src/MyFile.ts"`. * @returns Non-extension part of the path, such as `"MyFile"`. */ export const getFriendlyFileName = (fullFilePath: string): string => { - const lastSlashOrStart = fullFilePath.lastIndexOf("/") + 1; - const firstDotAfterLastSlash = fullFilePath.indexOf(".", lastSlashOrStart); + const lastSlashOrStart = fullFilePath.lastIndexOf("/") + 1; + const firstDotAfterLastSlash = fullFilePath.indexOf(".", lastSlashOrStart); - return fullFilePath[lastSlashOrStart].toUpperCase() + fullFilePath.substring(lastSlashOrStart + 1, firstDotAfterLastSlash); + return ( + fullFilePath[lastSlashOrStart].toUpperCase() + + fullFilePath.substring(lastSlashOrStart + 1, firstDotAfterLastSlash) + ); }; diff --git a/src/shared/functionTypes.ts b/src/shared/functionTypes.ts index ea203a49a..3dda854bc 100644 --- a/src/shared/functionTypes.ts +++ b/src/shared/functionTypes.ts @@ -1,16 +1,22 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "./fileMutator"; -import { getValueDeclarationOfType } from "./nodeTypes"; +import { FileMutationsRequest } from "./fileMutator.js"; +import { getValueDeclarationOfType } from "./nodeTypes.js"; /** * @returns Declared type of a function-like expression. */ -export const getValueDeclarationOfFunction = (request: FileMutationsRequest, node: ts.Expression) => { - const functionLikeValueDeclaration = getValueDeclarationOfType(request, node); - if (functionLikeValueDeclaration === undefined || !ts.isFunctionLike(functionLikeValueDeclaration)) { - return undefined; - } +export const getValueDeclarationOfFunction = ( + request: FileMutationsRequest, + node: ts.Expression, +) => { + const functionLikeValueDeclaration = getValueDeclarationOfType(request, node); + if ( + functionLikeValueDeclaration === undefined || + !ts.isFunctionLike(functionLikeValueDeclaration) + ) { + return undefined; + } - return functionLikeValueDeclaration; + return functionLikeValueDeclaration; }; diff --git a/src/shared/maps.ts b/src/shared/maps.ts index 3e951fbeb..778c3d8c9 100644 --- a/src/shared/maps.ts +++ b/src/shared/maps.ts @@ -1,21 +1,25 @@ export type Dictionary = Record; -export const convertMapToObject = (map: ReadonlyMap): Dictionary => { - const output: Dictionary = {}; +export const convertMapToObject = ( + map: ReadonlyMap, +): Dictionary => { + const output: Dictionary = {}; - for (const [key, value] of map) { - output[key] = value; - } + for (const [key, value] of map) { + output[key] = value; + } - return output; + return output; }; -export const convertObjectToMap = (object: Readonly>): Map => { - const map = new Map(); +export const convertObjectToMap = ( + object: Readonly>, +): Map => { + const map = new Map(); - for (const key of Object.keys(object)) { - map.set(key, object[key]); - } + for (const key of Object.keys(object)) { + map.set(key, object[key]); + } - return map; + return map; }; diff --git a/src/shared/names.ts b/src/shared/names.ts index 6de7b2668..427f34f02 100644 --- a/src/shared/names.ts +++ b/src/shared/names.ts @@ -1,16 +1,20 @@ -import * as ts from "typescript"; +import ts from "typescript"; /** * Gets the name of a property if it's statically computable from text. */ export const getStaticNameOfProperty = (node: ts.Node | undefined) => { - if (node === undefined) { - return undefined; - } + if (node === undefined) { + return undefined; + } - if (ts.isIdentifier(node) || ts.isStringLiteral(node) || ts.isNumericLiteral(node)) { - return node.text; - } + if ( + ts.isIdentifier(node) || + ts.isStringLiteral(node) || + ts.isNumericLiteral(node) + ) { + return node.text; + } - return undefined; + return undefined; }; diff --git a/src/shared/nodeExtensions.ts b/src/shared/nodeExtensions.ts index a6eb26203..dbf7d548a 100644 --- a/src/shared/nodeExtensions.ts +++ b/src/shared/nodeExtensions.ts @@ -1,50 +1,62 @@ -import * as ts from "typescript"; - -import { FileMutationsRequest } from "./fileMutator"; -import { getTypeAtLocationIfNotError } from "./types"; - -export const getClassExtendsExpression = (node: ts.ClassLikeDeclaration): ts.ExpressionWithTypeArguments | undefined => { - const { heritageClauses } = node; - if (heritageClauses === undefined) { - return undefined; - } - - const classExtension = heritageClauses.find((clause) => clause.token === ts.SyntaxKind.ExtendsKeyword); - if (classExtension === undefined) { - return undefined; - } - - return classExtension.types.length === 1 ? classExtension.types[0] : undefined; +import ts from "typescript"; + +import { FileMutationsRequest } from "./fileMutator.js"; +import { getTypeAtLocationIfNotError } from "./types.js"; + +export const getClassExtendsExpression = ( + node: ts.ClassLikeDeclaration, +): ts.ExpressionWithTypeArguments | undefined => { + const { heritageClauses } = node; + if (heritageClauses === undefined) { + return undefined; + } + + const classExtension = heritageClauses.find( + (clause) => clause.token === ts.SyntaxKind.ExtendsKeyword, + ); + if (classExtension === undefined) { + return undefined; + } + + return classExtension.types.length === 1 + ? classExtension.types[0] + : undefined; }; export const getBaseClassDeclaration = ( - request: FileMutationsRequest, - extension: ts.ExpressionWithTypeArguments, + request: FileMutationsRequest, + extension: ts.ExpressionWithTypeArguments, ): ts.ClassLikeDeclaration | undefined => { - // First try retrieving the base class from the extension itself - let extensionSymbol = getTypeAtLocationIfNotError(request, extension)?.getSymbol(); - - // If that didn't work, it might be from a type error due to missing type parameters - // Try the base constructor of the child class instead - // This is an internal member, but ah well... - if (extensionSymbol === undefined) { - const { resolvedBaseConstructorType } = getTypeAtLocationIfNotError(request, extension.parent.parent) as ts.Type & { - resolvedBaseConstructorType: ts.Type | undefined; - }; - - if (resolvedBaseConstructorType !== undefined) { - extensionSymbol = resolvedBaseConstructorType.symbol; - } - } - - if (extensionSymbol === undefined) { - return undefined; - } - - const { valueDeclaration } = extensionSymbol; - if (!valueDeclaration || !ts.isClassLike(valueDeclaration)) { - return undefined; - } - - return valueDeclaration; + // First try retrieving the base class from the extension itself + let extensionSymbol = getTypeAtLocationIfNotError( + request, + extension, + )?.getSymbol(); + + // If that didn't work, it might be from a type error due to missing type parameters + // Try the base constructor of the child class instead + // This is an internal member, but ah well... + if (extensionSymbol === undefined) { + const { resolvedBaseConstructorType } = getTypeAtLocationIfNotError( + request, + extension.parent.parent, + ) as ts.Type & { + resolvedBaseConstructorType: ts.Type | undefined; + }; + + if (resolvedBaseConstructorType !== undefined) { + extensionSymbol = resolvedBaseConstructorType.symbol; + } + } + + if (extensionSymbol === undefined) { + return undefined; + } + + const { valueDeclaration } = extensionSymbol; + if (!valueDeclaration || !ts.isClassLike(valueDeclaration)) { + return undefined; + } + + return valueDeclaration; }; diff --git a/src/shared/nodeTypes.ts b/src/shared/nodeTypes.ts index 5b46f8d81..12a0004d8 100644 --- a/src/shared/nodeTypes.ts +++ b/src/shared/nodeTypes.ts @@ -1,123 +1,159 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { isTypeFlagSetRecursively } from "../mutations/collecting/flags"; -import { FileMutationsRequest } from "./fileMutator"; -import { getTypeAtLocationIfNotError } from "./types"; +import { isTypeFlagSetRecursively } from "../mutations/collecting/flags.js"; +import { FileMutationsRequest } from "./fileMutator.js"; +import { getTypeAtLocationIfNotError } from "./types.js"; -export type NodeSelector = (node: ts.Node) => node is TNode; +export type NodeSelector = ( + node: ts.Node, +) => node is TNode; /** * Any node type that may optionally contain a type annotation. */ export type NodeWithOptionalType = ts.Node & { - type?: ts.TypeNode; + type?: ts.TypeNode; }; /** * Any node type that contains a type annotation. */ export type NodeWithType = ts.Node & { - type: ts.TypeNode; + type: ts.TypeNode; }; export type NodeWithIdentifierName = ts.Node & { - name: ts.Identifier; + name: ts.Identifier; }; -export type ParameterDeclarationWithType = ts.ParameterDeclaration & NodeWithType; +export type ParameterDeclarationWithType = ts.ParameterDeclaration & + NodeWithType; export type PropertySignatureWithType = ts.PropertySignature & NodeWithType; /** * Node types TypeStat may attempt to create a type declaration on. */ -export type NodeWithCreatableType = ts.ParameterDeclaration | ts.PropertyDeclaration | ts.VariableDeclaration; +export type NodeWithCreatableType = + | ts.ParameterDeclaration + | ts.PropertyDeclaration + | ts.VariableDeclaration; /** * Node types TypeStat may attempt to add to an existing type declaration on. */ export type NodeWithAddableType = NodeWithType & - (ts.FunctionLikeDeclaration | ts.ParameterDeclaration | ts.PropertyDeclaration | ts.VariableDeclaration); + ( + | ts.FunctionLikeDeclaration + | ts.ParameterDeclaration + | ts.PropertyDeclaration + | ts.VariableDeclaration + ); /** * Any function-like declaration that has an explicit type. */ -export type FunctionLikeDeclarationWithType = ts.FunctionLikeDeclaration & NodeWithType; +export type FunctionLikeDeclarationWithType = ts.FunctionLikeDeclaration & + NodeWithType; // TODO: make this a more specific type // Will have to deal with instantiations (new Container() { ... }) and declarations (class Container() { ... })) export type NodeWithDefinedTypeArguments = ts.Node & { - typeArguments?: ts.NodeArray; + typeArguments?: ts.NodeArray; }; // TODO: make this a more specific type // Will have to deal with instantiations (new Container() { ... }) and declarations (class Container() { ... })) export type NodeWithDefinedTypeParameters = ts.Node & { - typeParameters: ts.NodeArray; + typeParameters: ts.NodeArray; }; -export const isNodeWithType = (node: NodeWithOptionalType): node is NodeWithType => node.type !== undefined; +export const isNodeWithType = ( + node: NodeWithOptionalType, +): node is NodeWithType => node.type !== undefined; -export const isNodeWithIdentifierName = (node: ts.Node): node is NodeWithIdentifierName => { - return "name" in node && !!(node as NodeWithIdentifierName).name; +export const isNodeWithIdentifierName = ( + node: ts.Node, +): node is NodeWithIdentifierName => { + return "name" in node && !!(node as NodeWithIdentifierName).name; }; -export const isNodeWithDefinedTypeArguments = (node: ts.Node): node is NodeWithDefinedTypeArguments => { - return "typeArguments" in node; +export const isNodeWithDefinedTypeArguments = ( + node: ts.Node, +): node is NodeWithDefinedTypeArguments => { + return "typeArguments" in node; }; -export const isNodeWithDefinedTypeParameters = (node: ts.Node): node is NodeWithDefinedTypeParameters => { - return "typeParameters" in node; +export const isNodeWithDefinedTypeParameters = ( + node: ts.Node, +): node is NodeWithDefinedTypeParameters => { + return "typeParameters" in node; }; -export type PropertySignatureWithStaticName = ts.PropertySignature & NodeWithIdentifierName; +export type PropertySignatureWithStaticName = ts.PropertySignature & + NodeWithIdentifierName; -export const isPropertySignatureWithStaticName = (node: ts.Node): node is PropertySignatureWithStaticName => { - return ts.isPropertySignature(node) && isNodeWithIdentifierName(node); +export const isPropertySignatureWithStaticName = ( + node: ts.Node, +): node is PropertySignatureWithStaticName => { + return ts.isPropertySignature(node) && isNodeWithIdentifierName(node); }; -export const getValueDeclarationOfType = (request: FileMutationsRequest, node: ts.Node): ts.Node | undefined => { - // Try getting the symbol at the location, which sometimes only works in the latter form - const nodeType = getTypeAtLocationIfNotError(request, node); - const symbol = nodeType?.getSymbol() ?? request.services.program.getTypeChecker().getSymbolAtLocation(node); - - if (symbol === undefined) { - return undefined; - } - - // Despite the type definition, valueDeclaration itself is sometimes undefined - const valueDeclaration: ts.Declaration | undefined = symbol.valueDeclaration; - if (valueDeclaration !== undefined) { - return valueDeclaration; - } - - // Since the real .valueDeclaration is undefined, use the first one we know of - return symbol.declarations?.length ? symbol.declarations[0] : undefined; +export const getValueDeclarationOfType = ( + request: FileMutationsRequest, + node: ts.Node, +): ts.Node | undefined => { + // Try getting the symbol at the location, which sometimes only works in the latter form + const nodeType = getTypeAtLocationIfNotError(request, node); + const symbol = + nodeType?.getSymbol() ?? + request.services.program.getTypeChecker().getSymbolAtLocation(node); + + if (symbol === undefined) { + return undefined; + } + + // Despite the type definition, valueDeclaration itself is sometimes undefined + const valueDeclaration: ts.Declaration | undefined = symbol.valueDeclaration; + if (valueDeclaration !== undefined) { + return valueDeclaration; + } + + // Since the real .valueDeclaration is undefined, use the first one we know of + return symbol.declarations?.length ? symbol.declarations[0] : undefined; }; /** * @returns Whether a type is missing in a passed type compared to its declared type. */ -export const isTypeMissingBetween = (typeFlag: ts.TypeFlags, passedType: ts.Type, declaredType: ts.Type) => - isTypeFlagSetRecursively(passedType, typeFlag) && !isTypeFlagSetRecursively(declaredType, typeFlag); +export const isTypeMissingBetween = ( + typeFlag: ts.TypeFlags, + passedType: ts.Type, + declaredType: ts.Type, +) => + isTypeFlagSetRecursively(passedType, typeFlag) && + !isTypeFlagSetRecursively(declaredType, typeFlag); // If either null or undefined is missing in the argument, we'll need a ! mutation /** * @returns Whether null or undefined is missing in a passed type compared to its declared type. */ -export const isNullOrUndefinedMissingBetween = (passedType: ts.Type, declaredType: ts.Type) => - isTypeMissingBetween(ts.TypeFlags.Null, passedType, declaredType) || - isTypeMissingBetween(ts.TypeFlags.Undefined, passedType, declaredType); +export const isNullOrUndefinedMissingBetween = ( + passedType: ts.Type, + declaredType: ts.Type, +) => + isTypeMissingBetween(ts.TypeFlags.Null, passedType, declaredType) || + isTypeMissingBetween(ts.TypeFlags.Undefined, passedType, declaredType); export const getIdentifyingTypeLiteralParent = (node: ts.TypeLiteralNode) => { - const { parent } = node; - if (ts.isTypeAliasDeclaration(parent)) { - return parent.name; - } + const { parent } = node; + if (ts.isTypeAliasDeclaration(parent)) { + return parent.name; + } - // ??? - return node; + // ??? + return node; }; // Todo: eventually, these should expand to object, Object, etc... @@ -128,16 +164,16 @@ const knownGlobalBaseTypeNames = new Set(["Function"]); * @returns Whether the type is a known base type such as Function. */ export const isKnownGlobalBaseType = (type: ts.Type) => { - return knownGlobalBaseTypeNames.has(type.getSymbol()?.escapedName.toString()); + return knownGlobalBaseTypeNames.has(type.getSymbol()?.escapedName.toString()); }; const neverAndOrUnknown = [ - ts.TypeFlags.Never, - ts.TypeFlags.Unknown, - ts.TypeFlags.Never & ts.TypeFlags.Unknown, - ts.TypeFlags.Never | ts.TypeFlags.Unknown, + ts.TypeFlags.Never, + ts.TypeFlags.Unknown, + ts.TypeFlags.Never & ts.TypeFlags.Unknown, + ts.TypeFlags.Never | ts.TypeFlags.Unknown, ]; export const isNeverAndOrUnknownType = (type: ts.Type) => { - return neverAndOrUnknown.includes(type.flags); + return neverAndOrUnknown.includes(type.flags); }; diff --git a/src/shared/nodes.ts b/src/shared/nodes.ts index 64bef29d6..ce86d80a8 100644 --- a/src/shared/nodes.ts +++ b/src/shared/nodes.ts @@ -1,113 +1,149 @@ import * as tsutils from "ts-api-utils"; -import * as ts from "typescript"; +import ts from "typescript"; -import { FileMutationsRequest } from "./fileMutator"; - -import { getValueDeclarationOfType, NodeSelector } from "./nodeTypes"; +import { FileMutationsRequest } from "./fileMutator.js"; +import { NodeSelector, getValueDeclarationOfType } from "./nodeTypes.js"; /** * Finds a node in a source file by its starting position. */ -export const findNodeByStartingPosition = (sourceFile: ts.SourceFile, start: number): ts.Node | undefined => { - if (start >= sourceFile.end) { - throw new Error(`Cannot request start ${start} outside of source file '${sourceFile.fileName}'.`); - } - - const visitNode = (node: ts.Node): ts.Node | undefined => { - const nodeStart = node.getStart(sourceFile); - if (nodeStart === start) { - return node; - } - - if (nodeStart > start || node.end < start) { - return undefined; - } - - return ts.forEachChild(node, visitNode); - }; - - return ts.forEachChild(sourceFile, visitNode); +export const findNodeByStartingPosition = ( + sourceFile: ts.SourceFile, + start: number, +): ts.Node | undefined => { + if (start >= sourceFile.end) { + throw new Error( + `Cannot request start ${start} outside of source file '${sourceFile.fileName}'.`, + ); + } + + const visitNode = (node: ts.Node): ts.Node | undefined => { + const nodeStart = node.getStart(sourceFile); + if (nodeStart === start) { + return node; + } + + if (nodeStart > start || node.end < start) { + return undefined; + } + + return ts.forEachChild(node, visitNode); + }; + + return ts.forEachChild(sourceFile, visitNode); }; /** * Checks whether a node's position is completely within a parent node's. */ -export const isNodeWithinNode = (sourceFile: ts.SourceFile, child: ts.Node, parent: ts.Node): boolean => - child.end <= parent.end && child.getStart(sourceFile) >= parent.getStart(sourceFile); - -export const getParentOfKind = (node: ts.Node, selector: NodeSelector): TNode | undefined => { - if ((node.parent as ts.Node | undefined) === undefined) { - return undefined; - } - - node = node.parent; - - if (selector(node)) { - return node; - } - - return getParentOfKind(node.parent, selector); +export const isNodeWithinNode = ( + sourceFile: ts.SourceFile, + child: ts.Node, + parent: ts.Node, +): boolean => + child.end <= parent.end && + child.getStart(sourceFile) >= parent.getStart(sourceFile); + +export const getParentOfKind = ( + node: ts.Node, + selector: NodeSelector, +): TNode | undefined => { + if ((node.parent as ts.Node | undefined) === undefined) { + return undefined; + } + + node = node.parent; + + if (selector(node)) { + return node; + } + + return getParentOfKind(node.parent, selector); }; /** * @returns Whether a node is a binary expression that sets a value with an equals token. - * @remarks This only looks at = assignments, ignoring others such as +=. + * This only looks at = assignments, ignoring others such as +=. */ -export const isNodeAssigningBinaryExpression = (node: ts.Node): node is ts.BinaryExpression => - ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.EqualsToken; +export const isNodeAssigningBinaryExpression = ( + node: ts.Node, +): node is ts.BinaryExpression => + ts.isBinaryExpression(node) && + node.operatorToken.kind === ts.SyntaxKind.EqualsToken; /** * Gets a variable initializer for an expression, if one exists. * If a parent is provided, it will ignore an initializer not within that parent. */ export const getVariableInitializerForExpression = ( - request: FileMutationsRequest, - expression: ts.Expression, - parentFunctionLike: ts.Block | ts.SourceFile | ts.FunctionLikeDeclaration | undefined, + request: FileMutationsRequest, + expression: ts.Expression, + parentFunctionLike: + | ts.Block + | ts.FunctionLikeDeclaration + | ts.SourceFile + | undefined, ): ts.Expression | undefined => { - if (!ts.isIdentifier(expression)) { - return undefined; - } - - const valueDeclaration = getValueDeclarationOfType(request, expression); - if ( - valueDeclaration === undefined || - (parentFunctionLike !== undefined && !isNodeWithinNode(request.sourceFile, valueDeclaration, parentFunctionLike)) - ) { - return undefined; - } - - if (!ts.isVariableDeclaration(valueDeclaration) || valueDeclaration.initializer === undefined) { - return undefined; - } - - return valueDeclaration.initializer; + if (!ts.isIdentifier(expression)) { + return undefined; + } + + const valueDeclaration = getValueDeclarationOfType(request, expression); + if ( + valueDeclaration === undefined || + (parentFunctionLike !== undefined && + !isNodeWithinNode( + request.sourceFile, + valueDeclaration, + parentFunctionLike, + )) + ) { + return undefined; + } + + if ( + !ts.isVariableDeclaration(valueDeclaration) || + valueDeclaration.initializer === undefined + ) { + return undefined; + } + + return valueDeclaration.initializer; }; -export const getExpressionWithin = (node: ts.Node) => (ts.isExpressionStatement(node) ? node.expression : node); +export const getExpressionWithin = (node: ts.Node) => + ts.isExpressionStatement(node) ? node.expression : node; -export const getCloseAncestorCallOrNewExpression = (node: ts.Node): ts.CallExpression | ts.NewExpression | undefined => { - if (ts.isSourceFile(node.parent) || tsutils.isBlockLike(node)) { - return undefined; - } +export const getCloseAncestorCallOrNewExpression = ( + node: ts.Node, +): ts.CallExpression | ts.NewExpression | undefined => { + if (ts.isSourceFile(node.parent) || tsutils.isBlockLike(node)) { + return undefined; + } - if (ts.isCallExpression(node) || ts.isNewExpression(node)) { - return node; - } + if (ts.isCallExpression(node) || ts.isNewExpression(node)) { + return node; + } - return getCloseAncestorCallOrNewExpression(node.parent); + return getCloseAncestorCallOrNewExpression(node.parent); }; -export const getClassExtendsType = (node: ts.ClassLikeDeclaration): ts.ExpressionWithTypeArguments | undefined => { - const { heritageClauses } = node; - if (heritageClauses === undefined) { - return undefined; - } - - const classExtension = heritageClauses.find((clause) => clause.token === ts.SyntaxKind.ExtendsKeyword); - if (classExtension === undefined) { - return undefined; - } - - return classExtension.types.length === 1 ? classExtension.types[0] : undefined; +export const getClassExtendsType = ( + node: ts.ClassLikeDeclaration, +): ts.ExpressionWithTypeArguments | undefined => { + const { heritageClauses } = node; + if (heritageClauses === undefined) { + return undefined; + } + + const classExtension = heritageClauses.find( + (clause) => clause.token === ts.SyntaxKind.ExtendsKeyword, + ); + if (classExtension === undefined) { + return undefined; + } + + return classExtension.types.length === 1 + ? classExtension.types[0] + : undefined; }; diff --git a/src/shared/paths.ts b/src/shared/paths.ts index 76e811abd..581f0d2c3 100644 --- a/src/shared/paths.ts +++ b/src/shared/paths.ts @@ -1,3 +1,4 @@ -import * as path from "path"; +import * as path from "node:path"; -export const normalizeAndSlashify = (filePath: string) => path.normalize(filePath).replace(/\\/g, "/"); +export const normalizeAndSlashify = (filePath: string) => + path.normalize(filePath).replace(/\\/g, "/"); diff --git a/src/shared/printing/newlines.ts b/src/shared/printing/newlines.ts index f45dcfbcf..662dd495f 100644 --- a/src/shared/printing/newlines.ts +++ b/src/shared/printing/newlines.ts @@ -1,10 +1,10 @@ import { EOL } from "os"; -import * as ts from "typescript"; +import ts from "typescript"; export const printNewLine = ({ newLine }: ts.CompilerOptions) => { - if (newLine === undefined) { - return EOL; - } + if (newLine === undefined) { + return EOL; + } - return newLine === ts.NewLineKind.CarriageReturnLineFeed ? "\r\n" : "\n"; + return newLine === ts.NewLineKind.CarriageReturnLineFeed ? "\r\n" : "\n"; }; diff --git a/src/shared/printing/nodePrinting.ts b/src/shared/printing/nodePrinting.ts index 887c9aaaf..f632f5183 100644 --- a/src/shared/printing/nodePrinting.ts +++ b/src/shared/printing/nodePrinting.ts @@ -1,30 +1,40 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { TypeSummariesByName, TypeSummary } from "../../mutations/expansions/summarization"; -import { FileMutationsRequest } from "../fileMutator"; -import { printNewLine } from "./newlines"; +import { + TypeSummariesByName, + TypeSummary, +} from "../../mutations/expansions/summarization.js"; +import { FileMutationsRequest } from "../fileMutator.js"; +import { printNewLine } from "./newlines.js"; export const printNamedTypeSummaries = ( - request: FileMutationsRequest, - enclosingDeclaration: ts.Node | undefined, - typeSummaries: TypeSummariesByName, + request: FileMutationsRequest, + enclosingDeclaration: ts.Node | undefined, + typeSummaries: TypeSummariesByName, ): string => { - return Array.from(typeSummaries) - .map(([typeName, typeSummary]) => printNamedTypeSummary(request, enclosingDeclaration, typeName, typeSummary)) - .join(""); + return Array.from(typeSummaries) + .map(([typeName, typeSummary]) => + printNamedTypeSummary( + request, + enclosingDeclaration, + typeName, + typeSummary, + ), + ) + .join(""); }; export const printNamedTypeSummary = ( - request: FileMutationsRequest, - enclosingDeclaration: ts.Node | undefined, - name: string, - summary: TypeSummary, + request: FileMutationsRequest, + enclosingDeclaration: ts.Node | undefined, + name: string, + summary: TypeSummary, ): string => { - return [ - name, - summary.alwaysProvided ? "?: " : ": ", - request.services.printers.type(summary.types, enclosingDeclaration), - ";", - printNewLine(request.options.compilerOptions), - ].join(""); + return [ + name, + summary.alwaysProvided ? "?: " : ": ", + request.services.printers.type(summary.types, enclosingDeclaration), + ";", + printNewLine(request.options.compilerOptions), + ].join(""); }; diff --git a/src/shared/references.ts b/src/shared/references.ts index ac60d8c88..e034968ba 100644 --- a/src/shared/references.ts +++ b/src/shared/references.ts @@ -1,80 +1,124 @@ -import * as ts from "typescript"; +import ts from "typescript"; -import { LanguageServices } from "../services/language"; +import { LanguageServices } from "../services/language.js"; +import { findNodeByStartingPosition } from "./nodes.js"; -import { findNodeByStartingPosition } from "./nodes"; +export const isNodeFilteredOut = ( + filteredNodes: ReadonlySet, + node: ts.Node | undefined, +): boolean => { + while (node !== undefined) { + if (filteredNodes.has(node)) { + return true; + } -export const isNodeFilteredOut = (filteredNodes: ReadonlySet, node: ts.Node | undefined): boolean => { - while (node !== undefined) { - if (filteredNodes.has(node)) { - return true; - } + node = node.parent; + } - node = node.parent; - } - - return false; + return false; }; export const findRelevantNodeReferencesAsNodes = ( - filteredNodes: ReadonlySet, - services: LanguageServices, - identifyingNode: ts.Node, + filteredNodes: ReadonlySet, + services: LanguageServices, + identifyingNode: ts.Node, ): ts.Node[] | undefined => { - const references = findRelevantNodeReferences(filteredNodes, services, identifyingNode); - if (references === undefined) { - return undefined; - } - - const referencingNodes: ts.Node[] = []; - - for (const reference of references) { - // Grab the source file containing the reference - const referencingSourceFile = services.program.getSourceFile(reference.fileName); - if (referencingSourceFile === undefined) { - continue; - } - - // Find the referencing node from its place in that source file, unless it's the original node - const referencingNode = findNodeByStartingPosition(referencingSourceFile, reference.textSpan.start); - if (referencingNode === undefined || referencingNode === identifyingNode) { - continue; - } - - referencingNodes.push(referencingNode); - } - - return referencingNodes; + const references = findRelevantNodeReferences( + filteredNodes, + services, + identifyingNode, + ); + if (references === undefined) { + return undefined; + } + + const referencingNodes: ts.Node[] = []; + + for (const reference of references) { + // Grab the source file containing the reference + const referencingSourceFile = services.program.getSourceFile( + reference.fileName, + ); + if (referencingSourceFile === undefined) { + continue; + } + + // Find the referencing node from its place in that source file, unless it's the original node + const referencingNode = findNodeByStartingPosition( + referencingSourceFile, + reference.textSpan.start, + ); + if (referencingNode === undefined || referencingNode === identifyingNode) { + continue; + } + + referencingNodes.push(referencingNode); + } + + return referencingNodes; }; -const referenceIsFilteredOut = (filteredNodes: ReadonlySet, sourceFile: ts.SourceFile, reference: ts.ReferenceEntry): boolean => { - return isNodeFilteredOut(filteredNodes, findNodeByStartingPosition(sourceFile, reference.textSpan.start)); +const referenceIsFilteredOut = ( + filteredNodes: ReadonlySet, + sourceFile: ts.SourceFile, + reference: ts.ReferenceEntry, +): boolean => { + return isNodeFilteredOut( + filteredNodes, + findNodeByStartingPosition(sourceFile, reference.textSpan.start), + ); }; const findRelevantNodeReferences = ( - filteredNodes: ReadonlySet, - services: LanguageServices, - node: ts.Node, + filteredNodes: ReadonlySet, + services: LanguageServices, + node: ts.Node, ): ts.ReferenceEntry[] | undefined => { - // Find all locations the node is referenced - const nodeSourceFile = node.getSourceFile(); - const referencedSymbols = services.languageService.findReferences(nodeSourceFile.fileName, node.getStart(nodeSourceFile)); - if (referencedSymbols === undefined) { - return undefined; - } - - const references = new Set(); - - // For each reference within the referencing symbols, add it if it's not the child of a filtered node - for (const referenceSymbol of referencedSymbols) { - for (const reference of referenceSymbol.references) { - // Add the reference if it's not a child of nodes we filter out - const referencingSourceFile = services.program.getSourceFile(reference.fileName); - if (referencingSourceFile !== undefined && !referenceIsFilteredOut(filteredNodes, referencingSourceFile, reference)) { - references.add(reference); - } - } - } - - return Array.from(references); + // Find all locations the node is referenced + const referencedSymbols = findReferencesForNormalizedFileName(services, node); + if (referencedSymbols === undefined) { + return undefined; + } + + const references = new Set(); + + // For each reference within the referencing symbols, add it if it's not the child of a filtered node + for (const referenceSymbol of referencedSymbols) { + for (const reference of referenceSymbol.references) { + // Add the reference if it's not a child of nodes we filter out + const referencingSourceFile = services.program.getSourceFile( + reference.fileName, + ); + if ( + referencingSourceFile !== undefined && + !referenceIsFilteredOut(filteredNodes, referencingSourceFile, reference) + ) { + references.add(reference); + } + } + } + + return Array.from(references); }; + +function findReferencesForNormalizedFileName( + services: LanguageServices, + node: ts.Node, +) { + const nodeSourceFile = node.getSourceFile(); + try { + return services.languageService.findReferences( + // TypeScript stores pnpm-resolved node_modules under non-pnpm paths. + nodeSourceFile.fileName.replace( + /node_modules\/\.pnpm\/.+\/node_modules/, + "node_modules", + ), + node.getStart(nodeSourceFile), + ); + } catch { + return services.languageService.findReferences( + nodeSourceFile.fileName, + node.getStart(nodeSourceFile), + ); + } +} diff --git a/src/shared/runtime.ts b/src/shared/runtime.ts index 7aefbc46a..7981c7f85 100644 --- a/src/shared/runtime.ts +++ b/src/shared/runtime.ts @@ -1,36 +1,47 @@ import { Mutation } from "automutate"; -import { MutationsComplaint } from "../mutators/complaint"; -import { FileMutationsRequest, FileMutator } from "./fileMutator"; +import { MutationsComplaint } from "../mutators/complaint.js"; +import { FileMutationsRequest, FileMutator } from "./fileMutator.js"; export const findFirstMutations = ( - request: FileMutationsRequest, - mutators: readonly [string, FileMutator][], -): readonly Mutation[] | MutationsComplaint | undefined => { - for (const [mutatorName, mutator] of mutators) { - try { - const result = mutator(request); + request: FileMutationsRequest, + mutators: readonly [string, FileMutator][], +): MutationsComplaint | readonly Mutation[] | undefined => { + for (const [mutatorName, mutator] of mutators) { + try { + const result = mutator(request); - if (result instanceof MutationsComplaint) { - logOutput(request, mutatorName, "found a complaint", result); - return MutationsComplaint.wrapping(mutatorName, result); - } + if (result instanceof MutationsComplaint) { + logOutput(request, mutatorName, "found a complaint", result); + return MutationsComplaint.wrapping(mutatorName, result); + } - if (result !== undefined && result.length !== 0) { - logOutput(request, mutatorName, "found mutations", result); - return result; - } - } catch (error) { - logOutput(request, mutatorName, "threw an error", error); - return new MutationsComplaint(error as Error, [mutatorName]); - } - } + if (result !== undefined && result.length !== 0) { + logOutput(request, mutatorName, "found mutations", result); + return result; + } + } catch (error) { + logOutput(request, mutatorName, "threw an error", error); + return new MutationsComplaint(error as Error, [mutatorName]); + } + } - return undefined; + return undefined; }; -const logOutput = (request: FileMutationsRequest, mutatorName: string, action: string, data: unknown) => { - request.options.output.log?.( - [mutatorName, ` ${action} in `, request.sourceFile.fileName, ": ", JSON.stringify(data, null, 4)].join(""), - ); +const logOutput = ( + request: FileMutationsRequest, + mutatorName: string, + action: string, + data: unknown, +) => { + request.options.output.log?.( + [ + mutatorName, + ` ${action} in `, + request.sourceFile.fileName, + ": ", + JSON.stringify(data, null, 4), + ].join(""), + ); }; diff --git a/src/shared/sets.ts b/src/shared/sets.ts index e0dbb6a73..68708ed9e 100644 --- a/src/shared/sets.ts +++ b/src/shared/sets.ts @@ -1,13 +1,16 @@ -export const setSubtract = (whole: ReadonlySet, ...removals: ReadonlySet[]): Set => { - const result = new Set(whole); +export const setSubtract = ( + whole: ReadonlySet, + ...removals: ReadonlySet[] +): Set => { + const result = new Set(whole); - for (const removal of removals) { - for (const item of result) { - if (removal.has(item)) { - result.delete(item); - } - } - } + for (const removal of removals) { + for (const item of result) { + if (removal.has(item)) { + result.delete(item); + } + } + } - return result; + return result; }; diff --git a/src/shared/transforms.ts b/src/shared/transforms.ts index d11572035..b890736f2 100644 --- a/src/shared/transforms.ts +++ b/src/shared/transforms.ts @@ -1,27 +1,36 @@ -import * as ts from "typescript"; +import ts from "typescript"; -export type KnownTypeLiteralNode = ts.KeywordTypeNode | ts.LiteralTypeNode | ts.TypeQueryNode; +export type KnownTypeLiteralNode = + | ts.KeywordTypeNode + | ts.LiteralTypeNode + | ts.TypeQueryNode; -export const transformLiteralToTypeLiteralNode = (node: ts.Node): KnownTypeLiteralNode | undefined => { - if (ts.isIdentifier(node)) { - ts.factory.createTypeQueryNode(ts.factory.createIdentifier(node.text)); - } +export const transformLiteralToTypeLiteralNode = ( + node: ts.Node, +): KnownTypeLiteralNode | undefined => { + if (ts.isIdentifier(node)) { + ts.factory.createTypeQueryNode(ts.factory.createIdentifier(node.text)); + } - if (ts.isNumericLiteral(node)) { - return ts.factory.createLiteralTypeNode(ts.factory.createNumericLiteral(node.text)); - } + if (ts.isNumericLiteral(node)) { + return ts.factory.createLiteralTypeNode( + ts.factory.createNumericLiteral(node.text), + ); + } - if (ts.isStringLiteral(node)) { - return ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(node.text)); - } + if (ts.isStringLiteral(node)) { + return ts.factory.createLiteralTypeNode( + ts.factory.createStringLiteral(node.text), + ); + } - if (node.kind === ts.SyntaxKind.NullKeyword) { - return ts.factory.createLiteralTypeNode(ts.factory.createNull()); - } + if (node.kind === ts.SyntaxKind.NullKeyword) { + return ts.factory.createLiteralTypeNode(ts.factory.createNull()); + } - if (node.kind === ts.SyntaxKind.UndefinedKeyword) { - return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword); - } + if (node.kind === ts.SyntaxKind.UndefinedKeyword) { + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword); + } - return undefined; + return undefined; }; diff --git a/src/shared/typeNodes.ts b/src/shared/typeNodes.ts index 5dc74fe19..8be8c91c2 100644 --- a/src/shared/typeNodes.ts +++ b/src/shared/typeNodes.ts @@ -1,50 +1,56 @@ -import * as ts from "typescript"; +import ts from "typescript"; export type WellKnownTypeName = - | "any" - | "error" - | "unknown" - | "undefined" - | "null" - | "string" - | "number" - | "bigint" - | "false" - | "true" - | "boolean" - | "symbol" - | "void" - | "never" - | "object"; + | "any" + | "bigint" + | "boolean" + | "error" + | "false" + | "never" + | "null" + | "number" + | "object" + | "string" + | "symbol" + | "true" + | "undefined" + | "unknown" + | "void"; export type TypeWithTypeArguments = ts.Type & { - typeArguments: ts.Type[]; + typeArguments: ts.Type[]; }; -export const isTypeArgumentsType = (type: ts.Type): type is TypeWithTypeArguments => { - return "typeArguments" in type; +export const isTypeArgumentsType = ( + type: ts.Type, +): type is TypeWithTypeArguments => { + return "typeArguments" in type && !!type.typeArguments; }; export type TypeWithOptionalTypeArguments = ts.Type & { - typeArguments?: ts.Type[]; + typeArguments?: ts.Type[]; }; -export const isOptionalTypeArgumentsTypeNode = (type: ts.Type): type is TypeWithOptionalTypeArguments => { - return "typeArguments" in type; +export const isOptionalTypeArgumentsTypeNode = ( + type: ts.Type, +): type is TypeWithOptionalTypeArguments => { + return "typeArguments" in type; }; export type TypeWithIntrinsicName = ts.Type & { - intrinsicName: WellKnownTypeName; + intrinsicName: WellKnownTypeName; }; -export const isIntrisinicNameType = (type: ts.Type): type is TypeWithIntrinsicName => { - return "intrinsicName" in type; +export const isIntrinsicNameType = ( + type: ts.Type, +): type is TypeWithIntrinsicName => { + return "intrinsicName" in type; }; export type TypeWithValue = ts.Type & { - value: string; + value: string; }; export const isTypeWithValue = (type: ts.Type): type is TypeWithValue => { - return "value" in type; + return "value" in type; }; diff --git a/src/shared/types.ts b/src/shared/types.ts index c4e08c0ae..c8e510da1 100644 --- a/src/shared/types.ts +++ b/src/shared/types.ts @@ -1,43 +1,62 @@ -import * as ts from "typescript"; -import { FileMutationsRequest } from "./fileMutator"; -import { isIntrisinicNameType } from "./typeNodes"; +import ts from "typescript"; + +import { FileMutationsRequest } from "./fileMutator.js"; +import { isIntrinsicNameType } from "./typeNodes.js"; /** * @returns Whether the type has `localTypeParameters`, such as the built-in Map and Array definitions. */ -export const typeHasLocalTypeParameters = (type: ts.Type): type is ts.InterfaceType => - (type as Partial).localTypeParameters !== undefined; +export const typeHasLocalTypeParameters = ( + type: ts.Type, +): type is ts.InterfaceType => + (type as Partial).localTypeParameters !== undefined; /** * @returns Whether a type is from the built-in .d.ts files shipped with TypeScript. */ export const isTypeBuiltIn = (type: ts.Type) => { - const symbol = type.getSymbol(); - if (!symbol?.valueDeclaration) { - return false; - } - - const sourceFile = symbol.valueDeclaration.getSourceFile(); - - return sourceFile.hasNoDefaultLib && sourceFile.isDeclarationFile && sourceFile.fileName.includes("node_modules/typescript/lib/"); + const symbol = type.getSymbol(); + if (!symbol?.valueDeclaration) { + return false; + } + + const sourceFile = symbol.valueDeclaration.getSourceFile(); + + return ( + sourceFile.hasNoDefaultLib && + sourceFile.isDeclarationFile && + sourceFile.fileName.includes("node_modules/typescript/lib/") + ); }; -export const getSymbolAtLocationIfNotError = (request: FileMutationsRequest, node: ts.Node | undefined): ts.Symbol | undefined => { - if (node === undefined) { - return undefined; - } +export const getSymbolAtLocationIfNotError = ( + request: FileMutationsRequest, + node: ts.Node | undefined, +): ts.Symbol | undefined => { + if (node === undefined) { + return undefined; + } - const symbol = request.services.program.getTypeChecker().getSymbolAtLocation(node); + const symbol = request.services.program + .getTypeChecker() + .getSymbolAtLocation(node); - return symbol?.declarations?.length ? symbol : undefined; + return symbol?.declarations?.length ? symbol : undefined; }; -export const getTypeAtLocationIfNotError = (request: FileMutationsRequest, node: ts.Node | undefined): ts.Type | undefined => { - if (node === undefined) { - return undefined; - } - - const type = request.services.program.getTypeChecker().getTypeAtLocation(node); - - return isIntrisinicNameType(type) && type.intrinsicName === "error" ? undefined : type; +export const getTypeAtLocationIfNotError = ( + request: FileMutationsRequest, + node: ts.Node | undefined, +): ts.Type | undefined => { + if (node === undefined) { + return undefined; + } + + const type = request.services.program + .getTypeChecker() + .getTypeAtLocation(node); + + return isIntrinsicNameType(type) && type.intrinsicName === "error" + ? undefined + : type; }; diff --git a/src/suppressions/builtin/suppressTypeErrors/index.ts b/src/suppressions/builtin/suppressTypeErrors/index.ts index 2d6d46167..bbcc518d3 100644 --- a/src/suppressions/builtin/suppressTypeErrors/index.ts +++ b/src/suppressions/builtin/suppressTypeErrors/index.ts @@ -1,52 +1,56 @@ -import * as ts from "typescript"; +import { Mutation } from "automutate"; +import ts from "typescript"; +import { TypeStatOptions } from "../../../options/types.js"; +import { LanguageServices } from "../../../services/language.js"; import { - DiagnosticWithStart, - getLineForDiagnostic, - isDiagnosticWithStart, - stringifyDiagnosticMessageText, -} from "../../../shared/diagnostics"; -import { TypeStatOptions } from "../../../options/types"; -import { LanguageServices } from "../../../services/language"; -import { Mutation } from "automutate"; + DiagnosticWithStart, + getLineForDiagnostic, + isDiagnosticWithStart, + stringifyDiagnosticMessageText, +} from "../../../shared/diagnostics.js"; export interface CleanupRequest { - readonly options: TypeStatOptions; - readonly services: LanguageServices; - readonly sourceFile: ts.SourceFile; + readonly options: TypeStatOptions; + readonly services: LanguageServices; + readonly sourceFile: ts.SourceFile; } -export const suppressRemainingTypeIssues = (request: CleanupRequest): ReadonlyArray | undefined => { - if (!request.options.cleanups.suppressTypeErrors) { - return undefined; - } - - const allDiagnostics = request.services.program.getSemanticDiagnostics(request.sourceFile).filter(isDiagnosticWithStart); - if (!allDiagnostics.length) { - return undefined; - } - - const diagnosticsPerLine = new Map(); - - for (const diagnostic of allDiagnostics) { - const line = getLineForDiagnostic(diagnostic, request.sourceFile); - const existing = diagnosticsPerLine.get(line); - - if (existing) { - existing.push(diagnostic); - } else { - diagnosticsPerLine.set(line, [diagnostic]); - } - } - - return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { - const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); - return { - insertion: `// @ts-expect-error -- TODO: ${messages}\n`, - range: { - begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), - }, - type: "text-insert", - }; - }); +export const suppressRemainingTypeIssues = ( + request: CleanupRequest, +): readonly Mutation[] | undefined => { + if (!request.options.cleanups.suppressTypeErrors) { + return undefined; + } + + const allDiagnostics = request.services.program + .getSemanticDiagnostics(request.sourceFile) + .filter(isDiagnosticWithStart); + if (!allDiagnostics.length) { + return undefined; + } + + const diagnosticsPerLine = new Map(); + + for (const diagnostic of allDiagnostics) { + const line = getLineForDiagnostic(diagnostic, request.sourceFile); + const existing = diagnosticsPerLine.get(line); + + if (existing) { + existing.push(diagnostic); + } else { + diagnosticsPerLine.set(line, [diagnostic]); + } + } + + return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { + const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); + return { + insertion: `// @ts-expect-error -- TODO: ${messages}\n`, + range: { + begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), + }, + type: "text-insert", + }; + }); }; diff --git a/src/suppressors/builtin/suppressTypeErrors/index.ts b/src/suppressors/builtin/suppressTypeErrors/index.ts index 2d6d46167..bbcc518d3 100644 --- a/src/suppressors/builtin/suppressTypeErrors/index.ts +++ b/src/suppressors/builtin/suppressTypeErrors/index.ts @@ -1,52 +1,56 @@ -import * as ts from "typescript"; +import { Mutation } from "automutate"; +import ts from "typescript"; +import { TypeStatOptions } from "../../../options/types.js"; +import { LanguageServices } from "../../../services/language.js"; import { - DiagnosticWithStart, - getLineForDiagnostic, - isDiagnosticWithStart, - stringifyDiagnosticMessageText, -} from "../../../shared/diagnostics"; -import { TypeStatOptions } from "../../../options/types"; -import { LanguageServices } from "../../../services/language"; -import { Mutation } from "automutate"; + DiagnosticWithStart, + getLineForDiagnostic, + isDiagnosticWithStart, + stringifyDiagnosticMessageText, +} from "../../../shared/diagnostics.js"; export interface CleanupRequest { - readonly options: TypeStatOptions; - readonly services: LanguageServices; - readonly sourceFile: ts.SourceFile; + readonly options: TypeStatOptions; + readonly services: LanguageServices; + readonly sourceFile: ts.SourceFile; } -export const suppressRemainingTypeIssues = (request: CleanupRequest): ReadonlyArray | undefined => { - if (!request.options.cleanups.suppressTypeErrors) { - return undefined; - } - - const allDiagnostics = request.services.program.getSemanticDiagnostics(request.sourceFile).filter(isDiagnosticWithStart); - if (!allDiagnostics.length) { - return undefined; - } - - const diagnosticsPerLine = new Map(); - - for (const diagnostic of allDiagnostics) { - const line = getLineForDiagnostic(diagnostic, request.sourceFile); - const existing = diagnosticsPerLine.get(line); - - if (existing) { - existing.push(diagnostic); - } else { - diagnosticsPerLine.set(line, [diagnostic]); - } - } - - return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { - const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); - return { - insertion: `// @ts-expect-error -- TODO: ${messages}\n`, - range: { - begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), - }, - type: "text-insert", - }; - }); +export const suppressRemainingTypeIssues = ( + request: CleanupRequest, +): readonly Mutation[] | undefined => { + if (!request.options.cleanups.suppressTypeErrors) { + return undefined; + } + + const allDiagnostics = request.services.program + .getSemanticDiagnostics(request.sourceFile) + .filter(isDiagnosticWithStart); + if (!allDiagnostics.length) { + return undefined; + } + + const diagnosticsPerLine = new Map(); + + for (const diagnostic of allDiagnostics) { + const line = getLineForDiagnostic(diagnostic, request.sourceFile); + const existing = diagnosticsPerLine.get(line); + + if (existing) { + existing.push(diagnostic); + } else { + diagnosticsPerLine.set(line, [diagnostic]); + } + } + + return Array.from(diagnosticsPerLine).map(([line, diagnostics]) => { + const messages = diagnostics.map(stringifyDiagnosticMessageText).join(" "); + return { + insertion: `// @ts-expect-error -- TODO: ${messages}\n`, + range: { + begin: ts.getPositionOfLineAndCharacter(request.sourceFile, line, 0), + }, + type: "text-insert", + }; + }); }; diff --git a/src/tests/runTests.ts b/src/tests/runTests.ts index 80e37cf24..1b029f6ba 100644 --- a/src/tests/runTests.ts +++ b/src/tests/runTests.ts @@ -1,73 +1,97 @@ -/* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-unsafe-assignment */ import { describeMutationTestCases } from "automutate-tests"; import { Command } from "commander"; import * as fs from "fs"; -import * as path from "path"; -import * as ts from "typescript"; +import * as path from "node:path"; +import ts from "typescript"; -import { fillOutRawOptions } from "../options/fillOutRawOptions"; -import { RawTypeStatOptions } from "../options/types"; -import { createTypeStatProvider } from "../runtime/createTypeStatProvider"; -import { infiniteWaveThreshold } from "../runtime/providers/tracking/WaveTracker"; -import { arrayify } from "../shared/arrays"; +import { fillOutRawOptions } from "../options/fillOutRawOptions.js"; +import { RawTypeStatOptions } from "../options/types.js"; +import { createTypeStatProvider } from "../runtime/createTypeStatProvider.js"; +import { infiniteWaveThreshold } from "../runtime/providers/tracking/WaveTracker.js"; +import { arrayify } from "../shared/arrays.js"; -const parsed = new Command() - // Allow unknown options for the case of IDE debuggers who directly write to process.argv - // If this line is removed, VS Code debugging will break ๐Ÿ˜ฒ - .allowUnknownOption(true) - .option("-a, --accept", "override existing expected results instead of asserting") - .option("--console [console]", "whether to forward logs to the console") - .option("-i, --include [include]", "path to a TypeScript project file") - .parse(process.argv) - .opts(); +interface ParsedOptions { + accept?: boolean; + console?: boolean; + include?: string; +} -const rawPathToRegExp = (rawPath: string) => new RegExp(`.*${rawPath.split(/\\|\//g).slice(-3).join(".*")}.*`, "i"); +const parsed: ParsedOptions = new Command() + // Allow unknown options for the case of IDE debuggers who directly write to process.argv + // If this line is removed, VS Code debugging will break ๐Ÿ˜ฒ + .allowUnknownOption(true) + .option( + "-a, --accept", + "override existing expected results instead of asserting", + ) + .option("--console [console]", "whether to forward logs to the console") + .option("-i, --include [include]", "path to a TypeScript project file") + .parse(process.argv) + .opts(); + +const rawPathToRegExp = (rawPath: string) => + new RegExp( + `.*${rawPath.replace(/^test/, "").split(/\\|\//).filter(Boolean).slice(-3).join(".*")}.*`, + "i", + ); // The .vscode/launch.json task adds includes via environment variable -const includes = [...arrayify(parsed.include ?? []).map(rawPathToRegExp), ...arrayify(process.env.TEST_GLOB).map(rawPathToRegExp)]; +const includes = [ + ...arrayify(parsed.include ?? []).map(rawPathToRegExp), + ...arrayify(process.env.TEST_GLOB).map(rawPathToRegExp), +]; describeMutationTestCases( - path.join(__dirname, "../../test"), - (fileName, typeStatPath) => { - if (typeStatPath === undefined) { - throw new Error(`Could not find typestat.json for ${fileName}.`); - } + path.join(import.meta.dirname, "../../test"), + (fileName, typeStatPath) => { + if (typeStatPath === undefined) { + throw new Error(`Could not find typestat.json for ${fileName}.`); + } - const projectDirectory = path.dirname(typeStatPath); - const rawOptions = JSON.parse(fs.readFileSync(typeStatPath).toString()) as RawTypeStatOptions; + const projectDirectory = path.dirname(typeStatPath); + const rawOptions = JSON.parse( + fs.readFileSync(typeStatPath).toString(), + ) as RawTypeStatOptions; - const projectPath = path.join(projectDirectory, "tsconfig.json"); - const rawCompilerOptions = fs.readFileSync(typeStatPath).toString(); - const compilerOptions = ts.parseConfigFileTextToJson(typeStatPath, rawCompilerOptions).config; - const output = { - log: parsed.console ? console.log.bind(console, "[log]") : () => {}, - stderr: console.error.bind(console), - stdout: parsed.console ? console.log.bind(console, "[stdout]") : () => {}, - }; + const projectPath = path.join(projectDirectory, "tsconfig.json"); + const rawCompilerOptions = fs.readFileSync(typeStatPath).toString(); + const compilerOptions = ( + ts.parseConfigFileTextToJson(typeStatPath, rawCompilerOptions) as { + config: ts.CompilerOptions; + } + ).config; + const output = { + // eslint-disable-next-line @typescript-eslint/no-empty-function + log: parsed.console ? console.log.bind(console, "[log]") : () => {}, + stderr: console.error.bind(console), + // eslint-disable-next-line @typescript-eslint/no-empty-function + stdout: parsed.console ? console.log.bind(console, "[stdout]") : () => {}, + }; - return createTypeStatProvider({ - ...fillOutRawOptions({ - argv: { args: [] }, - compilerOptions, - cwd: path.dirname(projectPath), - output, - projectPath, - rawOptions: { - ...rawOptions, - projectPath, - }, - }), - fileNames: [fileName], - }); - }, - { - accept: parsed.accept || !!process.env.TEST_ACCEPT, - actual: (original) => (original.endsWith("x") ? "actual.tsx" : "actual.ts"), - expected: (original) => (original.endsWith("x") ? "expected.tsx" : "expected.ts"), - includes, - normalizeEndlines: "\n", - original: "./original.*", - settings: "typestat.json", - waves: { maximum: infiniteWaveThreshold + 1 }, - }, + return createTypeStatProvider({ + ...fillOutRawOptions({ + argv: { args: [] }, + compilerOptions, + cwd: path.dirname(projectPath), + output, + projectPath, + rawOptions: { + ...rawOptions, + projectPath, + }, + }), + fileNames: [fileName], + }); + }, + { + accept: parsed.accept ?? !!process.env.TEST_ACCEPT, + actual: (original) => (original.endsWith("x") ? "actual.tsx" : "actual.ts"), + expected: (original) => + original.endsWith("x") ? "expected.tsx" : "expected.ts", + includes, + normalizeEndlines: "\n", + original: "./original.*", + settings: "typestat.json", + waves: { maximum: infiniteWaveThreshold + 1 }, + }, ); diff --git a/src/types.d.ts b/src/types.d.ts index 9138eacdb..5f30e8964 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -1,11 +1,11 @@ import "typescript"; declare module "typescript" { - interface Program { - getTypeCatalog(): readonly Type[]; - } + interface Program { + getTypeCatalog(): readonly Type[]; + } - interface TypeChecker { - isTypeAssignableTo(source: Type, target: Type): boolean; - } + interface TypeChecker { + isTypeAssignableTo(source: Type, target: Type): boolean; + } } diff --git a/test/cases/cleanups/suppressTypeErrors/expected.ts b/test/cases/cleanups/suppressTypeErrors/expected.ts index 07673ebcc..dd07e8f78 100644 --- a/test/cases/cleanups/suppressTypeErrors/expected.ts +++ b/test/cases/cleanups/suppressTypeErrors/expected.ts @@ -1,7 +1,7 @@ (function () { // @ts-expect-error -- TODO: Type 'number' is not assignable to type 'string'. - let incorrectSingle: string = 0; + let incorrectSingle: string = 0; // @ts-expect-error -- TODO: Property 'replace' does not exist on type 'undefined[]'. Property 'values' does not exist on type '{}'. - let incorrectMutiple: string = [].replace() + {}.values(); + let incorrectMultiple: string = [].replace() + {}.values(); })(); diff --git a/test/cases/cleanups/suppressTypeErrors/original.ts b/test/cases/cleanups/suppressTypeErrors/original.ts index 1bccfa8ba..c144374ed 100644 --- a/test/cases/cleanups/suppressTypeErrors/original.ts +++ b/test/cases/cleanups/suppressTypeErrors/original.ts @@ -1,5 +1,5 @@ (function () { - let incorrectSingle: string = 0; + let incorrectSingle: string = 0; - let incorrectMutiple: string = [].replace() + {}.values(); + let incorrectMultiple: string = [].replace() + {}.values(); })(); diff --git a/test/cases/cleanups/suppressTypeErrors/tsconfig.json b/test/cases/cleanups/suppressTypeErrors/tsconfig.json index 1099359f7..c633fdd11 100644 --- a/test/cases/cleanups/suppressTypeErrors/tsconfig.json +++ b/test/cases/cleanups/suppressTypeErrors/tsconfig.json @@ -1,6 +1,6 @@ { - "compilerOptions": { - "strictNullChecks": true - }, - "files": ["actual.ts"] + "compilerOptions": { + "strictNullChecks": true + }, + "files": ["actual.ts"] } diff --git a/test/cases/cleanups/suppressTypeErrors/typestat.json b/test/cases/cleanups/suppressTypeErrors/typestat.json index 3062f99b4..130fa677a 100644 --- a/test/cases/cleanups/suppressTypeErrors/typestat.json +++ b/test/cases/cleanups/suppressTypeErrors/typestat.json @@ -1,5 +1,5 @@ { - "cleanups": { - "suppressTypeErrors": true - } + "cleanups": { + "suppressTypeErrors": true + } } diff --git a/test/cases/custom mutators/empty/expected.ts b/test/cases/custom mutators/empty/expected.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/custom mutators/empty/expected.ts +++ b/test/cases/custom mutators/empty/expected.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/empty/original.ts b/test/cases/custom mutators/empty/original.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/custom mutators/empty/original.ts +++ b/test/cases/custom mutators/empty/original.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/empty/tsconfig.json b/test/cases/custom mutators/empty/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/custom mutators/empty/tsconfig.json +++ b/test/cases/custom mutators/empty/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/custom mutators/empty/typestat.json b/test/cases/custom mutators/empty/typestat.json index befc5d08f..d73983394 100644 --- a/test/cases/custom mutators/empty/typestat.json +++ b/test/cases/custom mutators/empty/typestat.json @@ -1,3 +1,3 @@ { - "mutators": [] + "mutators": [] } diff --git a/test/cases/custom mutators/one/expected.ts b/test/cases/custom mutators/one/expected.ts index c553057fd..a5d49c2d6 100644 --- a/test/cases/custom mutators/one/expected.ts +++ b/test/cases/custom mutators/one/expected.ts @@ -1,7 +1,7 @@ -/* foo */ (function() { - console.log("Hello, world!"); +/* foo */ (function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/one/original.ts b/test/cases/custom mutators/one/original.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/custom mutators/one/original.ts +++ b/test/cases/custom mutators/one/original.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/one/sampleMutator.cjs b/test/cases/custom mutators/one/sampleMutator.cjs new file mode 100644 index 000000000..6c1ea6fee --- /dev/null +++ b/test/cases/custom mutators/one/sampleMutator.cjs @@ -0,0 +1,15 @@ +const prefix = "/* foo */ "; + +module.exports.fileMutator = (request) => { + return request.sourceFile.getFullText().indexOf(prefix) === -1 + ? [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ] + : []; +}; diff --git a/test/cases/custom mutators/one/sampleMutator.js b/test/cases/custom mutators/one/sampleMutator.js deleted file mode 100644 index 7b7452488..000000000 --- a/test/cases/custom mutators/one/sampleMutator.js +++ /dev/null @@ -1,15 +0,0 @@ -const prefix = "/* foo */ "; - -module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().indexOf(prefix) === -1 - ? [ - { - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }, - ] - : []; -}; diff --git a/test/cases/custom mutators/one/tsconfig.json b/test/cases/custom mutators/one/tsconfig.json index 666d46256..5ee1dbd15 100644 --- a/test/cases/custom mutators/one/tsconfig.json +++ b/test/cases/custom mutators/one/tsconfig.json @@ -1,3 +1,3 @@ { - "include": ["actual.ts"] + "include": ["actual.ts"] } diff --git a/test/cases/custom mutators/one/typestat.json b/test/cases/custom mutators/one/typestat.json index 5bc58d626..b24b1ee59 100644 --- a/test/cases/custom mutators/one/typestat.json +++ b/test/cases/custom mutators/one/typestat.json @@ -1,3 +1,3 @@ { - "mutators": ["./sampleMutator.js"] + "mutators": ["./sampleMutator.cjs"] } diff --git a/test/cases/custom mutators/two/expected.ts b/test/cases/custom mutators/two/expected.ts index ba4000bf3..f22206579 100644 --- a/test/cases/custom mutators/two/expected.ts +++ b/test/cases/custom mutators/two/expected.ts @@ -1,7 +1,7 @@ -/* 2 */ /* 1 */ (function() { - console.log("Hello, world!"); +/* 2 */ /* 1 */ (function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/two/mutator1.cjs b/test/cases/custom mutators/two/mutator1.cjs new file mode 100644 index 000000000..f4ebcdddf --- /dev/null +++ b/test/cases/custom mutators/two/mutator1.cjs @@ -0,0 +1,15 @@ +const prefix = "/* 1 */ "; + +module.exports.fileMutator = (request) => { + return request.sourceFile.getFullText().indexOf(prefix) === -1 + ? [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ] + : []; +}; diff --git a/test/cases/custom mutators/two/mutator1.js b/test/cases/custom mutators/two/mutator1.js deleted file mode 100644 index 7eef1d01b..000000000 --- a/test/cases/custom mutators/two/mutator1.js +++ /dev/null @@ -1,15 +0,0 @@ -const prefix = "/* 1 */ "; - -module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().indexOf(prefix) === -1 - ? [ - { - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }, - ] - : []; -}; diff --git a/test/cases/custom mutators/two/mutator2.cjs b/test/cases/custom mutators/two/mutator2.cjs new file mode 100644 index 000000000..762f1670e --- /dev/null +++ b/test/cases/custom mutators/two/mutator2.cjs @@ -0,0 +1,15 @@ +const prefix = "/* 2 */ "; + +module.exports.fileMutator = (request) => { + return request.sourceFile.getFullText().indexOf(prefix) === -1 + ? [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ] + : []; +}; diff --git a/test/cases/custom mutators/two/mutator2.js b/test/cases/custom mutators/two/mutator2.js deleted file mode 100644 index 6493df4ef..000000000 --- a/test/cases/custom mutators/two/mutator2.js +++ /dev/null @@ -1,15 +0,0 @@ -const prefix = "/* 2 */ "; - -module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().indexOf(prefix) === -1 - ? [ - { - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }, - ] - : []; -}; diff --git a/test/cases/custom mutators/two/original.ts b/test/cases/custom mutators/two/original.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/custom mutators/two/original.ts +++ b/test/cases/custom mutators/two/original.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/custom mutators/two/tsconfig.json b/test/cases/custom mutators/two/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/custom mutators/two/tsconfig.json +++ b/test/cases/custom mutators/two/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/custom mutators/two/typestat.json b/test/cases/custom mutators/two/typestat.json index 66de540f1..abbf7b2cd 100644 --- a/test/cases/custom mutators/two/typestat.json +++ b/test/cases/custom mutators/two/typestat.json @@ -1,3 +1,3 @@ { - "mutators": ["./mutator1.js", "./mutator2.js"] + "mutators": ["./mutator1.cjs", "./mutator2.cjs"] } diff --git a/test/cases/files/above/expected.ts b/test/cases/files/above/expected.ts index 561cf1c84..0c44e3afc 100644 --- a/test/cases/files/above/expected.ts +++ b/test/cases/files/above/expected.ts @@ -1,5 +1,5 @@ /* Above file */ -(function() { - let text: string | number; - text = 1; +(function () { + let text: string | number; + text = 1; })(); diff --git a/test/cases/files/above/original.ts b/test/cases/files/above/original.ts index 2439e5669..9e0db9254 100644 --- a/test/cases/files/above/original.ts +++ b/test/cases/files/above/original.ts @@ -1,4 +1,4 @@ -(function() { - let text: string; - text = 1; +(function () { + let text: string; + text = 1; })(); diff --git a/test/cases/files/above/tsconfig.json b/test/cases/files/above/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/files/above/tsconfig.json +++ b/test/cases/files/above/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/files/above/typestat.json b/test/cases/files/above/typestat.json index 07eb7e995..59e0f05f2 100644 --- a/test/cases/files/above/typestat.json +++ b/test/cases/files/above/typestat.json @@ -1,8 +1,8 @@ { - "files": { - "above": "/* Above file */" - }, - "fixes": { - "incompleteTypes": true - } + "files": { + "above": "/* Above file */" + }, + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/files/below/expected.ts b/test/cases/files/below/expected.ts index cd03480f1..e5ed0d49a 100644 --- a/test/cases/files/below/expected.ts +++ b/test/cases/files/below/expected.ts @@ -1,5 +1,5 @@ -(function() { - let text: string | number; - text = 1; +(function () { + let text: string | number; + text = 1; })(); /* Below file */ diff --git a/test/cases/files/below/original.ts b/test/cases/files/below/original.ts index 2439e5669..9e0db9254 100644 --- a/test/cases/files/below/original.ts +++ b/test/cases/files/below/original.ts @@ -1,4 +1,4 @@ -(function() { - let text: string; - text = 1; +(function () { + let text: string; + text = 1; })(); diff --git a/test/cases/files/below/tsconfig.json b/test/cases/files/below/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/files/below/tsconfig.json +++ b/test/cases/files/below/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/files/below/typestat.json b/test/cases/files/below/typestat.json index ec07c298e..c7cb53a22 100644 --- a/test/cases/files/below/typestat.json +++ b/test/cases/files/below/typestat.json @@ -1,8 +1,8 @@ { - "files": { - "below": "/* Below file */" - }, - "fixes": { - "incompleteTypes": true - } + "files": { + "below": "/* Below file */" + }, + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/files/both/expected.ts b/test/cases/files/both/expected.ts index e0acc0e27..504adb067 100644 --- a/test/cases/files/both/expected.ts +++ b/test/cases/files/both/expected.ts @@ -1,6 +1,6 @@ /* Above file */ -(function() { - let text: string | number; - text = 1; +(function () { + let text: string | number; + text = 1; })(); /* Below file */ diff --git a/test/cases/files/both/original.ts b/test/cases/files/both/original.ts index 2439e5669..9e0db9254 100644 --- a/test/cases/files/both/original.ts +++ b/test/cases/files/both/original.ts @@ -1,4 +1,4 @@ -(function() { - let text: string; - text = 1; +(function () { + let text: string; + text = 1; })(); diff --git a/test/cases/files/both/tsconfig.json b/test/cases/files/both/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/files/both/tsconfig.json +++ b/test/cases/files/both/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/files/both/typestat.json b/test/cases/files/both/typestat.json index ffbcaab1b..79b531ee6 100644 --- a/test/cases/files/both/typestat.json +++ b/test/cases/files/both/typestat.json @@ -1,9 +1,9 @@ { - "files": { - "above": "/* Above file */", - "below": "/* Below file */" - }, - "fixes": { - "incompleteTypes": true - } + "files": { + "above": "/* Above file */", + "below": "/* Below file */" + }, + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/files/empty/expected.ts b/test/cases/files/empty/expected.ts index 230c75bf1..2ce9b334e 100644 --- a/test/cases/files/empty/expected.ts +++ b/test/cases/files/empty/expected.ts @@ -1,4 +1,4 @@ -(function() { - let text: string | number; - text = 1; +(function () { + let text: string | number; + text = 1; })(); diff --git a/test/cases/files/empty/original.ts b/test/cases/files/empty/original.ts index 2439e5669..9e0db9254 100644 --- a/test/cases/files/empty/original.ts +++ b/test/cases/files/empty/original.ts @@ -1,4 +1,4 @@ -(function() { - let text: string; - text = 1; +(function () { + let text: string; + text = 1; })(); diff --git a/test/cases/files/empty/tsconfig.json b/test/cases/files/empty/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/files/empty/tsconfig.json +++ b/test/cases/files/empty/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/files/empty/typestat.json b/test/cases/files/empty/typestat.json index 49a9f9f28..db23342b6 100644 --- a/test/cases/files/empty/typestat.json +++ b/test/cases/files/empty/typestat.json @@ -1,9 +1,9 @@ { - "files": { - "above": "", - "below": "" - }, - "fixes": { - "incompleteTypes": true - } + "files": { + "above": "", + "below": "" + }, + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/filters/empty/expected.ts b/test/cases/filters/empty/expected.ts index 96d1f1068..4aa47a994 100644 --- a/test/cases/filters/empty/expected.ts +++ b/test/cases/filters/empty/expected.ts @@ -1,9 +1,9 @@ -(function() { - function one(): string | undefined { - return undefined; - } +(function () { + function one(): string | undefined { + return undefined; + } - function two(): string | undefined { - return undefined; - } + function two(): string | undefined { + return undefined; + } })(); diff --git a/test/cases/filters/empty/original.ts b/test/cases/filters/empty/original.ts index 85b137b54..1c9e9d1f3 100644 --- a/test/cases/filters/empty/original.ts +++ b/test/cases/filters/empty/original.ts @@ -1,9 +1,9 @@ -(function() { - function one(): string { - return undefined; - } +(function () { + function one(): string { + return undefined; + } - function two(): string { - return undefined; - } + function two(): string { + return undefined; + } })(); diff --git a/test/cases/filters/empty/tsconfig.json b/test/cases/filters/empty/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/filters/empty/tsconfig.json +++ b/test/cases/filters/empty/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/filters/empty/typestat.json b/test/cases/filters/empty/typestat.json index c0cfceebf..37854e3a6 100644 --- a/test/cases/filters/empty/typestat.json +++ b/test/cases/filters/empty/typestat.json @@ -1,10 +1,10 @@ { - "filters": [], - "fixes": { - "incompleteTypes": true, - "noImplicitAny": true - }, - "types": { - "strictNullChecks": true - } + "filters": [], + "fixes": { + "incompleteTypes": true, + "noImplicitAny": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/filters/one/expected.ts b/test/cases/filters/one/expected.ts index 9f13fef5d..92fd4f60d 100644 --- a/test/cases/filters/one/expected.ts +++ b/test/cases/filters/one/expected.ts @@ -1,9 +1,9 @@ -(function() { - function one(): string { - return undefined; - } +(function () { + function one(): string { + return undefined; + } - function two(): string | undefined { - return undefined; - } + function two(): string | undefined { + return undefined; + } })(); diff --git a/test/cases/filters/one/original.ts b/test/cases/filters/one/original.ts index 85b137b54..1c9e9d1f3 100644 --- a/test/cases/filters/one/original.ts +++ b/test/cases/filters/one/original.ts @@ -1,9 +1,9 @@ -(function() { - function one(): string { - return undefined; - } +(function () { + function one(): string { + return undefined; + } - function two(): string { - return undefined; - } + function two(): string { + return undefined; + } })(); diff --git a/test/cases/filters/one/tsconfig.json b/test/cases/filters/one/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/filters/one/tsconfig.json +++ b/test/cases/filters/one/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/filters/one/typestat.json b/test/cases/filters/one/typestat.json index 5cdfa301a..8f5b0bff8 100644 --- a/test/cases/filters/one/typestat.json +++ b/test/cases/filters/one/typestat.json @@ -1,10 +1,10 @@ { - "filters": ["FunctionDeclaration[name.text=one]"], - "fixes": { - "incompleteTypes": true, - "noImplicitAny": true - }, - "types": { - "strictNullChecks": true - } + "filters": ["FunctionDeclaration[name.text=one]"], + "fixes": { + "incompleteTypes": true, + "noImplicitAny": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/filters/two/expected.ts b/test/cases/filters/two/expected.ts index 4f8709699..2adb4737a 100644 --- a/test/cases/filters/two/expected.ts +++ b/test/cases/filters/two/expected.ts @@ -1,21 +1,21 @@ -(function() { - class Foo { - public value: number = 3; +(function () { + class Foo { + public value: number = 3; - dispose() { - this.value = null; - } - } + dispose() { + this.value = null; + } + } - function teardown(action: () => void) { - action(); - } + function teardown(action: () => void) { + action(); + } - let foo = new Foo(); + let foo = new Foo(); - foo.value = 1; + foo.value = 1; - teardown(() => { - foo = null; - }); + teardown(() => { + foo = null; + }); })(); diff --git a/test/cases/filters/two/original.ts b/test/cases/filters/two/original.ts index 4f8709699..2adb4737a 100644 --- a/test/cases/filters/two/original.ts +++ b/test/cases/filters/two/original.ts @@ -1,21 +1,21 @@ -(function() { - class Foo { - public value: number = 3; +(function () { + class Foo { + public value: number = 3; - dispose() { - this.value = null; - } - } + dispose() { + this.value = null; + } + } - function teardown(action: () => void) { - action(); - } + function teardown(action: () => void) { + action(); + } - let foo = new Foo(); + let foo = new Foo(); - foo.value = 1; + foo.value = 1; - teardown(() => { - foo = null; - }); + teardown(() => { + foo = null; + }); })(); diff --git a/test/cases/filters/two/tsconfig.json b/test/cases/filters/two/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/filters/two/tsconfig.json +++ b/test/cases/filters/two/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/filters/two/typestat.json b/test/cases/filters/two/typestat.json index ab98f268c..391a1d440 100644 --- a/test/cases/filters/two/typestat.json +++ b/test/cases/filters/two/typestat.json @@ -1,10 +1,13 @@ { - "filters": ["MethodDeclaration[name.text=dispose]", "CallExpression[expression.text=teardown]"], - "fixes": { - "incompleteTypes": true, - "noImplicitAny": true - }, - "types": { - "strictNullChecks": true - } + "filters": [ + "MethodDeclaration[name.text=dispose]", + "CallExpression[expression.text=teardown]" + ], + "fixes": { + "incompleteTypes": true, + "noImplicitAny": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/importExtensions/assets/withIndex/index.module.scss b/test/cases/fixes/importExtensions/assets/withIndex/index.module.scss index a51167348..8606e6ac2 100644 --- a/test/cases/fixes/importExtensions/assets/withIndex/index.module.scss +++ b/test/cases/fixes/importExtensions/assets/withIndex/index.module.scss @@ -1,3 +1,3 @@ * { - color: pink !important; -} \ No newline at end of file + color: pink !important; +} diff --git a/test/cases/fixes/importExtensions/expected.ts b/test/cases/fixes/importExtensions/expected.ts index 6da4634cb..bcdd14321 100644 --- a/test/cases/fixes/importExtensions/expected.ts +++ b/test/cases/fixes/importExtensions/expected.ts @@ -1,14 +1,14 @@ -import direct from './assets/direct.svg'; -export * as direct from './assets/direct.svg'; +import direct from "./assets/direct.svg"; +export * as direct from "./assets/direct.svg"; -import * as withIndex from './assets/withIndex.module.scss'; -export { withIndex } from './assets/withIndex.module.scss'; +import * as withIndex from "./assets/withIndex.module.scss"; +export { withIndex } from "./assets/withIndex.module.scss"; -import { foundDirect } from './foundDirect'; -export { foundDirect } from './foundDirect'; +import { foundDirect } from "./foundDirect"; +export { foundDirect } from "./foundDirect"; -import { foundIndirect } from './foundIndirect'; -export { foundIndirect } from './foundIndirect'; +import { foundIndirect } from "./foundIndirect"; +export { foundIndirect } from "./foundIndirect"; -import { notfound } from './notfound'; -export { notfound } from './notfound'; +import { notfound } from "./notfound"; +export { notfound } from "./notfound"; diff --git a/test/cases/fixes/importExtensions/original.ts b/test/cases/fixes/importExtensions/original.ts index 8de5b8a3a..e4351bfd3 100644 --- a/test/cases/fixes/importExtensions/original.ts +++ b/test/cases/fixes/importExtensions/original.ts @@ -1,14 +1,14 @@ -import direct from './assets/direct'; -export * as direct from './assets/direct'; +import direct from "./assets/direct"; +export * as direct from "./assets/direct"; -import * as withIndex from './assets/withIndex'; -export { withIndex } from './assets/withIndex'; +import * as withIndex from "./assets/withIndex"; +export { withIndex } from "./assets/withIndex"; -import { foundDirect } from './foundDirect'; -export { foundDirect } from './foundDirect'; +import { foundDirect } from "./foundDirect"; +export { foundDirect } from "./foundDirect"; -import { foundIndirect } from './foundIndirect'; -export { foundIndirect } from './foundIndirect'; +import { foundIndirect } from "./foundIndirect"; +export { foundIndirect } from "./foundIndirect"; -import { notfound } from './notfound'; -export { notfound } from './notfound'; +import { notfound } from "./notfound"; +export { notfound } from "./notfound"; diff --git a/test/cases/fixes/importExtensions/tsconfig.json b/test/cases/fixes/importExtensions/tsconfig.json index f5c8a5fad..cf8033f07 100644 --- a/test/cases/fixes/importExtensions/tsconfig.json +++ b/test/cases/fixes/importExtensions/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts", "foundDirect.ts", "foundIndirect/index.ts"] + "files": ["actual.ts", "foundDirect.ts", "foundIndirect/index.ts"] } diff --git a/test/cases/fixes/importExtensions/typestat.json b/test/cases/fixes/importExtensions/typestat.json index 7e617e585..04c1b9dc8 100644 --- a/test/cases/fixes/importExtensions/typestat.json +++ b/test/cases/fixes/importExtensions/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "importExtensions": true - } + "fixes": { + "importExtensions": true + } } diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/expected.ts b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/expected.ts index a44c94168..bff2b260b 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/expected.ts +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/expected.ts @@ -1,118 +1,122 @@ -import { ComponentLike } from './react-like'; +import { ComponentLike } from "./react-like"; (function () { - // Straightforward generics + // Straightforward generics - class BaseWithoutGenerics { } - class BaseWithOneGeneric { constructor(t: T | OneInterface | OneType | string) { } } - class BaseWithTwoGenerics {constructor(t: T | number, u: U | boolean) {} } + class BaseWithoutGenerics {} + class BaseWithOneGeneric { + constructor(t: T | OneInterface | OneType | string) {} + } + class BaseWithTwoGenerics { + constructor(t: T | number, u: U | boolean) {} + } - class ExtendsBaseWithout extends BaseWithoutGenerics { } - new ExtendsBaseWithout(); + class ExtendsBaseWithout extends BaseWithoutGenerics {} + new ExtendsBaseWithout(); - class ExtendsBaseWithOneLiteral extends BaseWithOneGeneric { - constructor() { - super('abc') - } - } + class ExtendsBaseWithOneLiteral extends BaseWithOneGeneric { + constructor() { + super("abc"); + } + } - interface OneInterface { - property: string; - } - const oneInterface: OneInterface = { property: 'abc' }; + interface OneInterface { + property: string; + } + const oneInterface: OneInterface = { property: "abc" }; - class ExtendsBaseWithOneInterface extends BaseWithOneGeneric { - constructor() { - super(oneInterface) - } - } + class ExtendsBaseWithOneInterface extends BaseWithOneGeneric { + constructor() { + super(oneInterface); + } + } - type OneType = { - property: string[]; - } - const oneType: OneType = { property: ['a', 'b', 'c'] }; + type OneType = { + property: string[]; + }; + const oneType: OneType = { property: ["a", "b", "c"] }; - class ExtendsBaseWithOneType extends BaseWithOneGeneric { - constructor() { - super(oneType) - } - } + class ExtendsBaseWithOneType extends BaseWithOneGeneric { + constructor() { + super(oneType); + } + } - class ExtendsBaseWithTwo extends BaseWithTwoGenerics { - constructor() { - super(123, false) - } - } + class ExtendsBaseWithTwo extends BaseWithTwoGenerics { + constructor() { + super(123, false); + } + } - // Member object (e.g. for React state) + // Member object (e.g. for React state) - class MemberImmediateBase { - member: Second; + class MemberImmediateBase { + member: Second; - setMember(member: Second) { - return member; - } - } + setMember(member: Second) { + return member; + } + } - class MemberImmediate extends MemberImmediateBase<{}, { key: boolean; }> { - member = { - key: false, - }; + class MemberImmediate extends MemberImmediateBase<{}, { key: boolean; }> { + member = { + key: false, + }; - addToState = () => { - this.setMember({ key: true }); - }; - } + addToState = () => { + this.setMember({ key: true }); + }; + } - class MemberImmediateFunction extends MemberImmediateBase<{}, { key: (arg0: boolean) => void; }> { - member = { - key: (arg0: boolean) => {} - }; + class MemberImmediateFunction extends MemberImmediateBase<{}, { key: (arg0: boolean) => void; }> { + member = { + key: (arg0: boolean) => {}, + }; - addToState = () => { - this.setMember({ key: (arg0: boolean) => {} }); - }; - } + addToState = () => { + this.setMember({ key: (arg0: boolean) => {} }); + }; + } - class MemberCurriedBase { - member: First; + class MemberCurriedBase { + member: First; - setMember(getMember: (oldMember: First) => First) { - getMember(this.member); - } - } + setMember(getMember: (oldMember: First) => First) { + getMember(this.member); + } + } - interface MemberAndType { - key: boolean; - } + interface MemberAndType { + key: boolean; + } - class MemberCurriedWithMemberAndType extends MemberCurriedBase { - member: MemberAndType; + class MemberCurriedWithMemberAndType extends MemberCurriedBase { + member: MemberAndType; - addToState = () => { - this.setMember(previousMember => ({ - key: !previousMember.key, - })); - }; - } + addToState = () => { + this.setMember((previousMember) => ({ + key: !previousMember.key, + })); + }; + } - class MemberCurriedWithMember extends MemberCurriedBase<{ key: boolean; }> { - member = { - key: false, - }; + class MemberCurriedWithMember extends MemberCurriedBase<{ key: boolean; }> { + member = { + key: false, + }; - addToState = () => { - this.setMember(previousMember => ({ - key: !previousMember.key, - })); - }; - } + addToState = () => { + this.setMember((previousMember) => ({ + key: !previousMember.key, + })); + }; + } })(); diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/original.ts b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/original.ts index 7e36ed9c7..720f7b153 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/original.ts +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/original.ts @@ -1,110 +1,114 @@ -import { ComponentLike } from './react-like'; +import { ComponentLike } from "./react-like"; (function () { - // Straightforward generics - - class BaseWithoutGenerics { } - class BaseWithOneGeneric { constructor(t: T) { } } - class BaseWithTwoGenerics {constructor(t: T, u: U) {} } - - class ExtendsBaseWithout extends BaseWithoutGenerics { } - new ExtendsBaseWithout(); - - class ExtendsBaseWithOneLiteral extends BaseWithOneGeneric { - constructor() { - super('abc') - } - } - - interface OneInterface { - property: string; - } - const oneInterface: OneInterface = { property: 'abc' }; - - class ExtendsBaseWithOneInterface extends BaseWithOneGeneric { - constructor() { - super(oneInterface) - } - } - - type OneType = { - property: string[]; - } - const oneType: OneType = { property: ['a', 'b', 'c'] }; - - class ExtendsBaseWithOneType extends BaseWithOneGeneric { - constructor() { - super(oneType) - } - } - - class ExtendsBaseWithTwo extends BaseWithTwoGenerics { - constructor() { - super(123, false) - } - } - - // Member object (e.g. for React state) - - class MemberImmediateBase { - member: Second; - - setMember(member: Second) { - return member; - } - } - - class MemberImmediate extends MemberImmediateBase { - member = { - key: false, - }; - - addToState = () => { - this.setMember({ key: true }); - }; - } - - class MemberImmediateFunction extends MemberImmediateBase { - member = { - key: (arg0: boolean) => {} - }; - - addToState = () => { - this.setMember({ key: (arg0: boolean) => {} }); - }; - } - - class MemberCurriedBase { - member: First; - - setMember(getMember: (oldMember: First) => First) { - getMember(this.member); - } - } - - interface MemberAndType { - key: boolean; - } - - class MemberCurriedWithMemberAndType extends MemberCurriedBase { - member: MemberAndType; - - addToState = () => { - this.setMember(previousMember => ({ - key: !previousMember.key, - })); - }; - } - - class MemberCurriedWithMember extends MemberCurriedBase { - member = { - key: false, - }; - - addToState = () => { - this.setMember(previousMember => ({ - key: !previousMember.key, - })); - }; - } + // Straightforward generics + + class BaseWithoutGenerics {} + class BaseWithOneGeneric { + constructor(t: T) {} + } + class BaseWithTwoGenerics { + constructor(t: T, u: U) {} + } + + class ExtendsBaseWithout extends BaseWithoutGenerics {} + new ExtendsBaseWithout(); + + class ExtendsBaseWithOneLiteral extends BaseWithOneGeneric { + constructor() { + super("abc"); + } + } + + interface OneInterface { + property: string; + } + const oneInterface: OneInterface = { property: "abc" }; + + class ExtendsBaseWithOneInterface extends BaseWithOneGeneric { + constructor() { + super(oneInterface); + } + } + + type OneType = { + property: string[]; + }; + const oneType: OneType = { property: ["a", "b", "c"] }; + + class ExtendsBaseWithOneType extends BaseWithOneGeneric { + constructor() { + super(oneType); + } + } + + class ExtendsBaseWithTwo extends BaseWithTwoGenerics { + constructor() { + super(123, false); + } + } + + // Member object (e.g. for React state) + + class MemberImmediateBase { + member: Second; + + setMember(member: Second) { + return member; + } + } + + class MemberImmediate extends MemberImmediateBase { + member = { + key: false, + }; + + addToState = () => { + this.setMember({ key: true }); + }; + } + + class MemberImmediateFunction extends MemberImmediateBase { + member = { + key: (arg0: boolean) => {}, + }; + + addToState = () => { + this.setMember({ key: (arg0: boolean) => {} }); + }; + } + + class MemberCurriedBase { + member: First; + + setMember(getMember: (oldMember: First) => First) { + getMember(this.member); + } + } + + interface MemberAndType { + key: boolean; + } + + class MemberCurriedWithMemberAndType extends MemberCurriedBase { + member: MemberAndType; + + addToState = () => { + this.setMember((previousMember) => ({ + key: !previousMember.key, + })); + }; + } + + class MemberCurriedWithMember extends MemberCurriedBase { + member = { + key: false, + }; + + addToState = () => { + this.setMember((previousMember) => ({ + key: !previousMember.key, + })); + }; + } })(); diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/react-like.ts b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/react-like.ts index 82cae37a1..1d291ee03 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/react-like.ts +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/react-like.ts @@ -1,4 +1,4 @@ export declare class ComponentLike { - state: State; - setState(newState: State): void; + state: State; + setState(newState: State): void; } diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/tsconfig.json b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/tsconfig.json index db4c5dd90..ad620df5e 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts", "react-like.ts"] + "files": ["actual.ts", "react-like.ts"] } diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/typestat.json b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/typestat.json +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitClassGenerics/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/expected.ts b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/expected.ts index 00ad9bd24..4b794a53f 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/expected.ts +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/expected.ts @@ -1,33 +1,33 @@ (function () { - class Name { } + class Name {} - const stringsInferred = ['']; - stringsInferred.push(''); + const stringsInferred = [""]; + stringsInferred.push(""); - const stringsExplicit: string[] = []; - stringsExplicit.push(''); + const stringsExplicit: string[] = []; + stringsExplicit.push(""); - const stringsMissing: string[] = []; - stringsMissing.push(''); + const stringsMissing: string[] = []; + stringsMissing.push(""); - let name = new Name(); + let name = new Name(); - let names: Name[] = []; - names.push(new Name()); + let names: Name[] = []; + names.push(new Name()); - let uniqueNames: Set = new Set(); - uniqueNames.add(name); + let uniqueNames: Set = new Set(); + uniqueNames.add(name); - let namesById: Map = new Map(); - namesById.set('abc123', new Name()) + let namesById: Map = new Map(); + namesById.set("abc123", new Name()); - let idsByName: Map = new Map(); - idsByName.set(new Name(), 123); + let idsByName: Map = new Map(); + idsByName.set(new Name(), 123); - let uniqueMaybeNames: Set = new Set(); - uniqueMaybeNames.add(Math.random() > 0.5 ? 123 : undefined) + let uniqueMaybeNames: Set = new Set(); + uniqueMaybeNames.add(Math.random() > 0.5 ? 123 : undefined); - let uniqueNamesOrBooleans: Set = new Set(); - uniqueNamesOrBooleans.add(name); - uniqueNamesOrBooleans.add(false); + let uniqueNamesOrBooleans: Set = new Set(); + uniqueNamesOrBooleans.add(name); + uniqueNamesOrBooleans.add(false); })(); diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/original.ts b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/original.ts index e34b0de63..7e5124a6e 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/original.ts +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/original.ts @@ -1,33 +1,33 @@ (function () { - class Name { } + class Name {} - const stringsInferred = ['']; - stringsInferred.push(''); + const stringsInferred = [""]; + stringsInferred.push(""); - const stringsExplicit: string[] = []; - stringsExplicit.push(''); + const stringsExplicit: string[] = []; + stringsExplicit.push(""); - const stringsMissing = []; - stringsMissing.push(''); + const stringsMissing = []; + stringsMissing.push(""); - let name = new Name(); + let name = new Name(); - let names = []; - names.push(new Name()); + let names = []; + names.push(new Name()); - let uniqueNames = new Set(); - uniqueNames.add(name); + let uniqueNames = new Set(); + uniqueNames.add(name); - let namesById = new Map(); - namesById.set('abc123', new Name()) + let namesById = new Map(); + namesById.set("abc123", new Name()); - let idsByName = new Map(); - idsByName.set(new Name(), 123); + let idsByName = new Map(); + idsByName.set(new Name(), 123); - let uniqueMaybeNames = new Set(); - uniqueMaybeNames.add(Math.random() > 0.5 ? 123 : undefined) + let uniqueMaybeNames = new Set(); + uniqueMaybeNames.add(Math.random() > 0.5 ? 123 : undefined); - let uniqueNamesOrBooleans = new Set(); - uniqueNamesOrBooleans.add(name); - uniqueNamesOrBooleans.add(false); + let uniqueNamesOrBooleans = new Set(); + uniqueNamesOrBooleans.add(name); + uniqueNamesOrBooleans.add(false); })(); diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/tsconfig.json b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/typestat.json b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/typestat.json +++ b/test/cases/fixes/incompleteTypes/implicitGenerics/incompleteImplicitVariableGenerics/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/expected.ts b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/expected.ts index 2b76bb2f6..ec663f9d6 100644 --- a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/expected.ts +++ b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/expected.ts @@ -1,16 +1,16 @@ (function () { - type Values = { - alreadyDeclared: boolean; + type Values = { + alreadyDeclared: boolean; laterAssigned?: boolean; initiallyThere?: boolean; - }; + }; - class Container { - constructor(public values: T) { } - } + class Container { + constructor(public values: T) {} + } - new Container({ - alreadyDeclared: true, - initiallyThere: true, - }).values.laterAssigned = true; + new Container({ + alreadyDeclared: true, + initiallyThere: true, + }).values.laterAssigned = true; })(); diff --git a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/original.ts b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/original.ts index 2ad16d243..eb229d2ef 100644 --- a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/original.ts +++ b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/original.ts @@ -1,14 +1,14 @@ (function () { - type Values = { - alreadyDeclared: boolean; - }; + type Values = { + alreadyDeclared: boolean; + }; - class Container { - constructor(public values: T) { } - } + class Container { + constructor(public values: T) {} + } - new Container({ - alreadyDeclared: true, - initiallyThere: true, - }).values.laterAssigned = true; + new Container({ + alreadyDeclared: true, + initiallyThere: true, + }).values.laterAssigned = true; })(); diff --git a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/tsconfig.json b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/typestat.json b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/typestat.json +++ b/test/cases/fixes/incompleteTypes/interfaceOrTypeLiteralGenerics/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/parameterTypes/expected.ts b/test/cases/fixes/incompleteTypes/parameterTypes/expected.ts index e48536b9d..c6c55c210 100644 --- a/test/cases/fixes/incompleteTypes/parameterTypes/expected.ts +++ b/test/cases/fixes/incompleteTypes/parameterTypes/expected.ts @@ -1,16 +1,14 @@ (function () { - function takesNumber(one) { } - takesNumber(1); + function takesNumber(one) {} + takesNumber(1); - function takesStringThenBoolean(one, two) { } - takesStringThenBoolean('abc', true); + function takesStringThenBoolean(one, two) {} + takesStringThenBoolean("abc", true); - function takesStringOrBoolean(one) { } - function passesStringOrBoolean(input: string | boolean) { - takesStringOrBoolean(input); - } + function takesStringOrBoolean(one) {} + function passesStringOrBoolean(input: string | boolean) { + takesStringOrBoolean(input); + } - function takesAny( - input: any = {} - ) {} -})() \ No newline at end of file + function takesAny(input: any = {}) {} +})(); diff --git a/test/cases/fixes/incompleteTypes/parameterTypes/original.ts b/test/cases/fixes/incompleteTypes/parameterTypes/original.ts index e48536b9d..c6c55c210 100644 --- a/test/cases/fixes/incompleteTypes/parameterTypes/original.ts +++ b/test/cases/fixes/incompleteTypes/parameterTypes/original.ts @@ -1,16 +1,14 @@ (function () { - function takesNumber(one) { } - takesNumber(1); + function takesNumber(one) {} + takesNumber(1); - function takesStringThenBoolean(one, two) { } - takesStringThenBoolean('abc', true); + function takesStringThenBoolean(one, two) {} + takesStringThenBoolean("abc", true); - function takesStringOrBoolean(one) { } - function passesStringOrBoolean(input: string | boolean) { - takesStringOrBoolean(input); - } + function takesStringOrBoolean(one) {} + function passesStringOrBoolean(input: string | boolean) { + takesStringOrBoolean(input); + } - function takesAny( - input: any = {} - ) {} -})() \ No newline at end of file + function takesAny(input: any = {}) {} +})(); diff --git a/test/cases/fixes/incompleteTypes/parameterTypes/tsconfig.json b/test/cases/fixes/incompleteTypes/parameterTypes/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/incompleteTypes/parameterTypes/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/parameterTypes/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/incompleteTypes/parameterTypes/typestat.json b/test/cases/fixes/incompleteTypes/parameterTypes/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/parameterTypes/typestat.json +++ b/test/cases/fixes/incompleteTypes/parameterTypes/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/expected.ts b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/expected.ts index ead9f64c2..2bd788c84 100644 --- a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/expected.ts +++ b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/expected.ts @@ -1,81 +1,87 @@ (function () { - class WithMissingString { - property; - } - new WithMissingString().property = "abc"; + class WithMissingString { + property; + } + new WithMissingString().property = "abc"; - class WithExplicitString { - property: string; - } - new WithMissingString().property = "abc"; + class WithExplicitString { + property: string; + } + new WithMissingString().property = "abc"; - class WithMissingStringOrNumber { - property; - } - function setWithMissingStringOrNumber(instance: WithMissingStringOrNumber, value: string | number) { - instance.property = value; - } + class WithMissingStringOrNumber { + property; + } + function setWithMissingStringOrNumber( + instance: WithMissingStringOrNumber, + value: string | number, + ) { + instance.property = value; + } - class WithExplicitStringMissingNumber { - property: string | number; - } - function setWithExplicitStringMissingNumber(instance: WithExplicitStringMissingNumber, value: string | number) { - instance.property = value; - } + class WithExplicitStringMissingNumber { + property: string | number; + } + function setWithExplicitStringMissingNumber( + instance: WithExplicitStringMissingNumber, + value: string | number, + ) { + instance.property = value; + } - class WithObjectProperty { - member; + class WithObjectProperty { + member; - method() { - this.member = { - key: true, - }; - } - } + method() { + this.member = { + key: true, + }; + } + } - class WithIncompleteObjectProperty { - member: string | { key: boolean; }; + class WithIncompleteObjectProperty { + member: string | { key: boolean; }; - method() { - this.member = ""; - this.member = { - key: true, - }; - } - } + method() { + this.member = ""; + this.member = { + key: true, + }; + } + } - class WithIncompleteNestedObjectProperty { - member: string | { middle: { deepKey: boolean; }; middleKey: number; }; + class WithIncompleteNestedObjectProperty { + member: string | { middle: { deepKey: boolean; }; middleKey: number; }; - method() { - this.member = ""; - this.member = { - middle: { - deepKey: true, - }, - middleKey: 0, - }; - } - } + method() { + this.member = ""; + this.member = { + middle: { + deepKey: true, + }, + middleKey: 0, + }; + } + } - class WithAny { - property: any; - } + class WithAny { + property: any; + } - const withAny = new WithAny(); - withAny.property = ""; + const withAny = new WithAny(); + withAny.property = ""; - class WithUnknown { - property: string; - } + class WithUnknown { + property: string; + } - const withUnknown = new WithUnknown(); - withUnknown.property = ""; + const withUnknown = new WithUnknown(); + withUnknown.property = ""; - class WithNever { - property: string; - } + class WithNever { + property: string; + } - const withNever = new WithNever(); - withNever.property = ""; + const withNever = new WithNever(); + withNever.property = ""; })(); diff --git a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/original.ts b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/original.ts index c93e0df8f..cb0350a65 100644 --- a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/original.ts +++ b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/original.ts @@ -1,81 +1,87 @@ (function () { - class WithMissingString { - property; - } - new WithMissingString().property = "abc"; + class WithMissingString { + property; + } + new WithMissingString().property = "abc"; - class WithExplicitString { - property: string; - } - new WithMissingString().property = "abc"; + class WithExplicitString { + property: string; + } + new WithMissingString().property = "abc"; - class WithMissingStringOrNumber { - property; - } - function setWithMissingStringOrNumber(instance: WithMissingStringOrNumber, value: string | number) { - instance.property = value; - } + class WithMissingStringOrNumber { + property; + } + function setWithMissingStringOrNumber( + instance: WithMissingStringOrNumber, + value: string | number, + ) { + instance.property = value; + } - class WithExplicitStringMissingNumber { - property: string; - } - function setWithExplicitStringMissingNumber(instance: WithExplicitStringMissingNumber, value: string | number) { - instance.property = value; - } + class WithExplicitStringMissingNumber { + property: string; + } + function setWithExplicitStringMissingNumber( + instance: WithExplicitStringMissingNumber, + value: string | number, + ) { + instance.property = value; + } - class WithObjectProperty { - member; + class WithObjectProperty { + member; - method() { - this.member = { - key: true, - }; - } - } + method() { + this.member = { + key: true, + }; + } + } - class WithIncompleteObjectProperty { - member: string; + class WithIncompleteObjectProperty { + member: string; - method() { - this.member = ""; - this.member = { - key: true, - }; - } - } + method() { + this.member = ""; + this.member = { + key: true, + }; + } + } - class WithIncompleteNestedObjectProperty { - member: string; + class WithIncompleteNestedObjectProperty { + member: string; - method() { - this.member = ""; - this.member = { - middle: { - deepKey: true, - }, - middleKey: 0, - }; - } - } + method() { + this.member = ""; + this.member = { + middle: { + deepKey: true, + }, + middleKey: 0, + }; + } + } - class WithAny { - property: any; - } + class WithAny { + property: any; + } - const withAny = new WithAny(); - withAny.property = ""; + const withAny = new WithAny(); + withAny.property = ""; - class WithUnknown { - property: unknown; - } + class WithUnknown { + property: unknown; + } - const withUnknown = new WithUnknown(); - withUnknown.property = ""; + const withUnknown = new WithUnknown(); + withUnknown.property = ""; - class WithNever { - property: never; - } + class WithNever { + property: never; + } - const withNever = new WithNever(); - withNever.property = ""; + const withNever = new WithNever(); + withNever.property = ""; })(); diff --git a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/tsconfig.json b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/typestat.json b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/typestat.json +++ b/test/cases/fixes/incompleteTypes/propertyDeclarationTypes/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/expected.tsx index 592db8279..a79d69bb1 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/expected.tsx @@ -1,7 +1,9 @@ (function () { - class Example { - method(): void { - document.body.querySelectorAll("*").forEach((child) => Array.from(child.classList)); - } - } + class Example { + method(): void { + document.body + .querySelectorAll("*") + .forEach((child) => Array.from(child.classList)); + } + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/original.tsx index 592db8279..a79d69bb1 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/original.tsx @@ -1,7 +1,9 @@ (function () { - class Example { - method(): void { - document.body.querySelectorAll("*").forEach((child) => Array.from(child.classList)); - } - } + class Example { + method(): void { + document.body + .querySelectorAll("*") + .forEach((child) => Array.from(child.classList)); + } + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/tsconfig.json index e7fbe8e7a..77e283311 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/tsconfig.json @@ -1,8 +1,8 @@ { - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "jsx": "react" - }, - "files": ["actual.tsx"] + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "react" + }, + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/notReactProps/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/expected.tsx index ab6673780..00be14cca 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/expected.tsx @@ -1,24 +1,24 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - type WithFunctionsProps = { - providesNothing: () => void; - providesString: (arg0: string) => void; - providesNumberThenString: (arg0: number, arg1: string) => void; - providesBooleanGivesNumber: (arg0: boolean) => number; - returnsString: () => string; - } + type WithFunctionsProps = { + providesNothing: () => void; + providesString: (arg0: string) => void; + providesNumberThenString: (arg0: number, arg1: string) => void; + providesBooleanGivesNumber: (arg0: boolean) => number; + returnsString: () => string; + }; - class WithFunctions extends React.Component { - onClick = () => { - this.props.providesNothing(); - this.props.providesString(""); - this.props.providesNumberThenString(0, ""); - this.callReceiveNumber(this.props.providesBooleanGivesNumber(true)); - this.callReceiveString(this.props.returnsString()); - } + class WithFunctions extends React.Component { + onClick = () => { + this.props.providesNothing(); + this.props.providesString(""); + this.props.providesNumberThenString(0, ""); + this.callReceiveNumber(this.props.providesBooleanGivesNumber(true)); + this.callReceiveString(this.props.returnsString()); + }; - callReceiveNumber = (value: number) => value; - callReceiveString = (text: string) => text; - } + callReceiveNumber = (value: number) => value; + callReceiveString = (text: string) => text; + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/original.tsx index d9d484f68..f1a2e70ee 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/original.tsx @@ -1,24 +1,24 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - type WithFunctionsProps = { - providesNothing: Function; - providesString: Function; - providesNumberThenString: Function; - providesBooleanGivesNumber: Function; - returnsString: Function; - } + type WithFunctionsProps = { + providesNothing: Function; + providesString: Function; + providesNumberThenString: Function; + providesBooleanGivesNumber: Function; + returnsString: Function; + }; - class WithFunctions extends React.Component { - onClick = () => { - this.props.providesNothing(); - this.props.providesString(""); - this.props.providesNumberThenString(0, ""); - this.callReceiveNumber(this.props.providesBooleanGivesNumber(true)); - this.callReceiveString(this.props.returnsString()); - } + class WithFunctions extends React.Component { + onClick = () => { + this.props.providesNothing(); + this.props.providesString(""); + this.props.providesNumberThenString(0, ""); + this.callReceiveNumber(this.props.providesBooleanGivesNumber(true)); + this.callReceiveString(this.props.returnsString()); + }; - callReceiveNumber = (value: number) => value; - callReceiveString = (text: string) => text; - } + callReceiveNumber = (value: number) => value; + callReceiveString = (text: string) => text; + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/tsconfig.json index e7fbe8e7a..77e283311 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/tsconfig.json @@ -1,8 +1,8 @@ { - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "jsx": "react" - }, - "files": ["actual.tsx"] + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "react" + }, + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropFunctionsFromCalls/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/expected.tsx index b1f76424c..443d5c755 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/expected.tsx @@ -1,43 +1,45 @@ -import React from 'react'; +import React from "react"; (function () { - interface ClassComponentProps { - other?: boolean; + interface ClassComponentProps { + other?: boolean; text?: string; - } - - class ClassComponent extends React.Component { - render() { - return this.props.text; - } - } - - const renderClassComponent = (text: string) => - ; - - type FunctionComponentProps = { - other?: boolean; -texts?: string[]; - } - - class FunctionComponent extends React.Component { - render() { - return this.props.texts.join(''); - } - } + } - const renderFunctionComponent = (texts: string[]) => - ; + class ClassComponent extends React.Component { + render() { + return this.props.text; + } + } - type WithFunctionsProps = { - returnsBoolean: (() => boolean); - returnsStringOrNumber:( () => string) | (() => number); - } + const renderClassComponent = (text: string) => ; - class WithFunctions extends React.Component { } - - const withFunctions = false} - returnsStringOrNumber={() => 0} - />; + type FunctionComponentProps = { + other?: boolean; +texts?: string[]; + }; + + class FunctionComponent extends React.Component { + render() { + return this.props.texts.join(""); + } + } + + const renderFunctionComponent = (texts: string[]) => ( + + ); + + type WithFunctionsProps = { + returnsBoolean: (() => boolean); + returnsStringOrNumber:( () => string) | (() => number); + }; + + class WithFunctions extends React.Component {} + + const withFunctions = ( + false} + returnsStringOrNumber={() => 0} + /> + ); })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/original.tsx index 31a784782..7e8c6fa79 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/original.tsx @@ -1,41 +1,43 @@ -import React from 'react'; +import React from "react"; (function () { - interface ClassComponentProps { - other?: boolean; - } - - class ClassComponent extends React.Component { - render() { - return this.props.text; - } - } - - const renderClassComponent = (text: string) => - ; - - type FunctionComponentProps = { - other?: boolean; - } - - class FunctionComponent extends React.Component { - render() { - return this.props.texts.join(''); - } - } - - const renderFunctionComponent = (texts: string[]) => - ; - - type WithFunctionsProps = { - returnsBoolean: Function; - returnsStringOrNumber: () => string; - } - - class WithFunctions extends React.Component { } - - const withFunctions = false} - returnsStringOrNumber={() => 0} - />; + interface ClassComponentProps { + other?: boolean; + } + + class ClassComponent extends React.Component { + render() { + return this.props.text; + } + } + + const renderClassComponent = (text: string) => ; + + type FunctionComponentProps = { + other?: boolean; + }; + + class FunctionComponent extends React.Component { + render() { + return this.props.texts.join(""); + } + } + + const renderFunctionComponent = (texts: string[]) => ( + + ); + + type WithFunctionsProps = { + returnsBoolean: Function; + returnsStringOrNumber: () => string; + }; + + class WithFunctions extends React.Component {} + + const withFunctions = ( + false} + returnsStringOrNumber={() => 0} + /> + ); })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromLaterAssignments/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/expected.tsx index 61e8c0302..8bc657c8f 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/expected.tsx @@ -1,7 +1,7 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { +(function () { interface MyComponentProps { array?: any[]; @@ -54,62 +54,68 @@ interface MyComponentProps { stringsOrNumbersType?: string | number; } - class MyComponent extends React.Component { - static propTypes = { - array: PropTypes.array, - arrayRequired: PropTypes.array.isRequired, - bool: PropTypes.bool, - boolRequired: PropTypes.bool.isRequired, - element: PropTypes.element, - elementRequired: PropTypes.element.isRequired, - func: PropTypes.func, - funcRequired: PropTypes.func.isRequired, - instanceOfString: PropTypes.instanceOf(String), - instanceOfStringRequired: PropTypes.instanceOf(String).isRequired, - node: PropTypes.node, - nodeRequired: PropTypes.node.isRequired, - number: PropTypes.number, - numberRequired: PropTypes.number.isRequired, - numbers: PropTypes.arrayOf(PropTypes.number), - numbersRequired: PropTypes.arrayOf(PropTypes.number).isRequired, - numbersExact: PropTypes.oneOf([1, 2, 3]), - numbersExactRequired: PropTypes.oneOf([1, 2, 3]).isRequired, - numberType: PropTypes.oneOfType([PropTypes.number]), - numberOrStringType: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), - shape: PropTypes.shape({ - subShape: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }), - subShapeRequired: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }).isRequired, - }), - shapeRequired: PropTypes.shape({ - subShape: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }), - subShapeRequired: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }).isRequired, - }).isRequired, - string: PropTypes.string, - stringRequired: PropTypes.string.isRequired, - strings: PropTypes.oneOf(["a", "bc", "def"]), - stringsRequired: PropTypes.oneOf(["a", "bc", "def"]).isRequired, - stringsAndNumbers: PropTypes.oneOf(["a", 2, "def", 4]), - stringsAndNumbersRequired: PropTypes.oneOf(["a", 2, "def", 4]).isRequired, - stringsType: PropTypes.oneOfType([PropTypes.string]), - stringsOrNumbersType: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - }; + class MyComponent extends React.Component { + static propTypes = { + array: PropTypes.array, + arrayRequired: PropTypes.array.isRequired, + bool: PropTypes.bool, + boolRequired: PropTypes.bool.isRequired, + element: PropTypes.element, + elementRequired: PropTypes.element.isRequired, + func: PropTypes.func, + funcRequired: PropTypes.func.isRequired, + instanceOfString: PropTypes.instanceOf(String), + instanceOfStringRequired: PropTypes.instanceOf(String).isRequired, + node: PropTypes.node, + nodeRequired: PropTypes.node.isRequired, + number: PropTypes.number, + numberRequired: PropTypes.number.isRequired, + numbers: PropTypes.arrayOf(PropTypes.number), + numbersRequired: PropTypes.arrayOf(PropTypes.number).isRequired, + numbersExact: PropTypes.oneOf([1, 2, 3]), + numbersExactRequired: PropTypes.oneOf([1, 2, 3]).isRequired, + numberType: PropTypes.oneOfType([PropTypes.number]), + numberOrStringType: PropTypes.oneOfType([ + PropTypes.number, + PropTypes.string, + ]), + shape: PropTypes.shape({ + subShape: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }), + subShapeRequired: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }).isRequired, + }), + shapeRequired: PropTypes.shape({ + subShape: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }), + subShapeRequired: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }).isRequired, + }).isRequired, + string: PropTypes.string, + stringRequired: PropTypes.string.isRequired, + strings: PropTypes.oneOf(["a", "bc", "def"]), + stringsRequired: PropTypes.oneOf(["a", "bc", "def"]).isRequired, + stringsAndNumbers: PropTypes.oneOf(["a", 2, "def", 4]), + stringsAndNumbersRequired: PropTypes.oneOf(["a", 2, "def", 4]).isRequired, + stringsType: PropTypes.oneOfType([PropTypes.string]), + stringsOrNumbersType: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + ]), + }; - render() { - return ""; - } - } + render() { + return ""; + } + } interface LaterAssignedComponentProps { string?: string; @@ -117,14 +123,14 @@ interface LaterAssignedComponentProps { } - class LaterAssignedComponent extends React.Component { - render() { - return ""; - } - } + class LaterAssignedComponent extends React.Component { + render() { + return ""; + } + } - LaterAssignedComponent.propTypes = { - string: PropTypes.string, - stringRequired: PropTypes.string.isRequired, - }; -})(); \ No newline at end of file + LaterAssignedComponent.propTypes = { + string: PropTypes.string, + stringRequired: PropTypes.string.isRequired, + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/original.tsx index b73c69538..f65c325b3 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/original.tsx @@ -1,72 +1,78 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { - class MyComponent extends React.Component { - static propTypes = { - array: PropTypes.array, - arrayRequired: PropTypes.array.isRequired, - bool: PropTypes.bool, - boolRequired: PropTypes.bool.isRequired, - element: PropTypes.element, - elementRequired: PropTypes.element.isRequired, - func: PropTypes.func, - funcRequired: PropTypes.func.isRequired, - instanceOfString: PropTypes.instanceOf(String), - instanceOfStringRequired: PropTypes.instanceOf(String).isRequired, - node: PropTypes.node, - nodeRequired: PropTypes.node.isRequired, - number: PropTypes.number, - numberRequired: PropTypes.number.isRequired, - numbers: PropTypes.arrayOf(PropTypes.number), - numbersRequired: PropTypes.arrayOf(PropTypes.number).isRequired, - numbersExact: PropTypes.oneOf([1, 2, 3]), - numbersExactRequired: PropTypes.oneOf([1, 2, 3]).isRequired, - numberType: PropTypes.oneOfType([PropTypes.number]), - numberOrStringType: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), - shape: PropTypes.shape({ - subShape: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }), - subShapeRequired: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }).isRequired, - }), - shapeRequired: PropTypes.shape({ - subShape: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }), - subShapeRequired: PropTypes.shape({ - subSubNumber: PropTypes.number, - subSubNumberRequired: PropTypes.number.isRequired, - }).isRequired, - }).isRequired, - string: PropTypes.string, - stringRequired: PropTypes.string.isRequired, - strings: PropTypes.oneOf(["a", "bc", "def"]), - stringsRequired: PropTypes.oneOf(["a", "bc", "def"]).isRequired, - stringsAndNumbers: PropTypes.oneOf(["a", 2, "def", 4]), - stringsAndNumbersRequired: PropTypes.oneOf(["a", 2, "def", 4]).isRequired, - stringsType: PropTypes.oneOfType([PropTypes.string]), - stringsOrNumbersType: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - }; +(function () { + class MyComponent extends React.Component { + static propTypes = { + array: PropTypes.array, + arrayRequired: PropTypes.array.isRequired, + bool: PropTypes.bool, + boolRequired: PropTypes.bool.isRequired, + element: PropTypes.element, + elementRequired: PropTypes.element.isRequired, + func: PropTypes.func, + funcRequired: PropTypes.func.isRequired, + instanceOfString: PropTypes.instanceOf(String), + instanceOfStringRequired: PropTypes.instanceOf(String).isRequired, + node: PropTypes.node, + nodeRequired: PropTypes.node.isRequired, + number: PropTypes.number, + numberRequired: PropTypes.number.isRequired, + numbers: PropTypes.arrayOf(PropTypes.number), + numbersRequired: PropTypes.arrayOf(PropTypes.number).isRequired, + numbersExact: PropTypes.oneOf([1, 2, 3]), + numbersExactRequired: PropTypes.oneOf([1, 2, 3]).isRequired, + numberType: PropTypes.oneOfType([PropTypes.number]), + numberOrStringType: PropTypes.oneOfType([ + PropTypes.number, + PropTypes.string, + ]), + shape: PropTypes.shape({ + subShape: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }), + subShapeRequired: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }).isRequired, + }), + shapeRequired: PropTypes.shape({ + subShape: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }), + subShapeRequired: PropTypes.shape({ + subSubNumber: PropTypes.number, + subSubNumberRequired: PropTypes.number.isRequired, + }).isRequired, + }).isRequired, + string: PropTypes.string, + stringRequired: PropTypes.string.isRequired, + strings: PropTypes.oneOf(["a", "bc", "def"]), + stringsRequired: PropTypes.oneOf(["a", "bc", "def"]).isRequired, + stringsAndNumbers: PropTypes.oneOf(["a", 2, "def", 4]), + stringsAndNumbersRequired: PropTypes.oneOf(["a", 2, "def", 4]).isRequired, + stringsType: PropTypes.oneOfType([PropTypes.string]), + stringsOrNumbersType: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + ]), + }; - render() { - return ""; - } - } + render() { + return ""; + } + } - class LaterAssignedComponent extends React.Component { - render() { - return ""; - } - } + class LaterAssignedComponent extends React.Component { + render() { + return ""; + } + } - LaterAssignedComponent.propTypes = { - string: PropTypes.string, - stringRequired: PropTypes.string.isRequired, - }; -})(); \ No newline at end of file + LaterAssignedComponent.propTypes = { + string: PropTypes.string, + stringRequired: PropTypes.string.isRequired, + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/all/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/expected.tsx index b90bb02ee..ddf7087ba 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/expected.tsx @@ -1,15 +1,15 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { +(function () { interface MyComponentProps { boolRequired?: boolean; } - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/original.tsx index a1ebd1477..2ee5e4af6 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/original.tsx @@ -1,10 +1,10 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file +(function () { + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/typestat.json index 891e8121e..a5a0aa30d 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysOptional/typestat.json @@ -1,10 +1,10 @@ { - "fixes": { - "incompleteTypes": true - }, - "hints": { - "react": { - "propTypesOptionality": "alwaysOptional" - } - } + "fixes": { + "incompleteTypes": true + }, + "hints": { + "react": { + "propTypesOptionality": "alwaysOptional" + } + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/expected.tsx index c90a72af5..f347d10bc 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/expected.tsx @@ -1,15 +1,15 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { +(function () { interface MyComponentProps { boolRequired: boolean; } - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/original.tsx index a1ebd1477..2ee5e4af6 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/original.tsx @@ -1,10 +1,10 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file +(function () { + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/typestat.json index e65b77fed..9485eaf37 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/alwaysRequired/typestat.json @@ -1,10 +1,10 @@ { - "fixes": { - "incompleteTypes": true - }, - "hints": { - "react": { - "propTypesOptionality": "alwaysRequired" - } - } + "fixes": { + "incompleteTypes": true + }, + "hints": { + "react": { + "propTypesOptionality": "alwaysRequired" + } + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/expected.tsx index c90a72af5..f347d10bc 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/expected.tsx @@ -1,15 +1,15 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { +(function () { interface MyComponentProps { boolRequired: boolean; } - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/original.tsx index a1ebd1477..2ee5e4af6 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/original.tsx @@ -1,10 +1,10 @@ import React from "react"; import PropTypes from "prop-types"; -(function() { - class MyComponent extends React.Component { - static propTypes = { - boolRequired: PropTypes.bool.isRequired, - }; - } -})(); \ No newline at end of file +(function () { + class MyComponent extends React.Component { + static propTypes = { + boolRequired: PropTypes.bool.isRequired, + }; + } +})(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/typestat.json index b4e1090de..91b1e297f 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromPropTypes/optionality/asWritten/typestat.json @@ -1,10 +1,10 @@ { - "fixes": { - "incompleteTypes": true - }, - "hints": { - "react": { - "propTypesOptionality": "asWritten" - } - } + "fixes": { + "incompleteTypes": true + }, + "hints": { + "react": { + "propTypesOptionality": "asWritten" + } + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/expected.tsx index 20aa7ee65..9e8827098 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/expected.tsx @@ -1,36 +1,41 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - interface FromUsesComponentProps { - returnsBoolean: (() => boolean); - takesStringCall: ((text: string) => void); - takesNumberReturnsStringJsx: ((input: number) => string); - } - - const useReturnsBoolean = (callback: () => boolean) => { - return callback(); - } - - interface ReturnsStringProps { - takeTakesNumberReturnsString: (input: number) => string, - } - - class WithReturnsString extends React.Component {} - - const useTakesString = (callback: (text: string) => void) => { - callback(""); - } - - class FromUsesComponent extends React.Component { - render() { - const { returnsBoolean, takesStringCall, takesNumberReturnsStringJsx } = this.props; - - useReturnsBoolean(returnsBoolean); - useTakesString(takesStringCall) - - const withReturnsString = ; - - return ; - } - } + interface FromUsesComponentProps { + returnsBoolean: (() => boolean); + takesStringCall: ((text: string) => void); + takesNumberReturnsStringJsx: ((input: number) => string); + } + + const useReturnsBoolean = (callback: () => boolean) => { + return callback(); + }; + + interface ReturnsStringProps { + takeTakesNumberReturnsString: (input: number) => string; + } + + class WithReturnsString extends React.Component {} + + const useTakesString = (callback: (text: string) => void) => { + callback(""); + }; + + class FromUsesComponent extends React.Component { + render() { + const { returnsBoolean, takesStringCall, takesNumberReturnsStringJsx } = + this.props; + + useReturnsBoolean(returnsBoolean); + useTakesString(takesStringCall); + + const withReturnsString = ( + + ); + + return ; + } + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/original.tsx index b81744602..32503b50b 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/original.tsx @@ -1,36 +1,41 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - interface FromUsesComponentProps { - returnsBoolean: unknown; - takesStringCall: unknown; - takesNumberReturnsStringJsx: unknown; - } - - const useReturnsBoolean = (callback: () => boolean) => { - return callback(); - } - - interface ReturnsStringProps { - takeTakesNumberReturnsString: (input: number) => string, - } - - class WithReturnsString extends React.Component {} - - const useTakesString = (callback: (text: string) => void) => { - callback(""); - } - - class FromUsesComponent extends React.Component { - render() { - const { returnsBoolean, takesStringCall, takesNumberReturnsStringJsx } = this.props; - - useReturnsBoolean(returnsBoolean); - useTakesString(takesStringCall) - - const withReturnsString = ; - - return ; - } - } + interface FromUsesComponentProps { + returnsBoolean: unknown; + takesStringCall: unknown; + takesNumberReturnsStringJsx: unknown; + } + + const useReturnsBoolean = (callback: () => boolean) => { + return callback(); + }; + + interface ReturnsStringProps { + takeTakesNumberReturnsString: (input: number) => string; + } + + class WithReturnsString extends React.Component {} + + const useTakesString = (callback: (text: string) => void) => { + callback(""); + }; + + class FromUsesComponent extends React.Component { + render() { + const { returnsBoolean, takesStringCall, takesNumberReturnsStringJsx } = + this.props; + + useReturnsBoolean(returnsBoolean); + useTakesString(takesStringCall); + + const withReturnsString = ( + + ); + + return ; + } + } })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/tsconfig.json index e7fbe8e7a..77e283311 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/tsconfig.json @@ -1,8 +1,8 @@ { - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "jsx": "react" - }, - "files": ["actual.tsx"] + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "react" + }, + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsFromUses/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/expected.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/expected.tsx index f166ac585..8852fe65d 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/expected.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/expected.tsx @@ -1,11 +1,11 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - interface SomeValue { - value: string; - } + interface SomeValue { + value: string; + } - const someValue: SomeValue = { value: "" }; + const someValue: SomeValue = { value: "" }; interface ManyPropsProps { always: boolean; @@ -19,80 +19,91 @@ isNumberOrStringArray?: number[] | string[] | (string | number)[]; isObject?: SomeValue; } - const ManyProps = (props: ManyPropsProps) =>
; - - const renderManyProps = () => [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ] + const ManyProps = (props: ManyPropsProps) =>
; + + const renderManyProps = () => [ + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ]; interface SinglePropArrowFunctionProps { prop: number[]; } - const SinglePropArrowFunction = ({ prop }: SinglePropArrowFunctionProps) => { - console.log(prop); - return
; - }; + const SinglePropArrowFunction = ({ prop }: SinglePropArrowFunctionProps) => { + console.log(prop); + return
; + }; - const renderSinglePropArrowFunction = () => ; + const renderSinglePropArrowFunction = () => ( + + ); interface SinglePropFunctionExpressionAnonymousProps { prop: number[]; } - const SinglePropFunctionExpressionAnonymous = function ({ prop }: SinglePropFunctionExpressionAnonymousProps) { - console.log(prop); - return
; - }; + const SinglePropFunctionExpressionAnonymous = function ({ prop }: SinglePropFunctionExpressionAnonymousProps) { + console.log(prop); + return
; + }; - const renderSinglePropFunctionExpressionAnonymous = () => ; + const renderSinglePropFunctionExpressionAnonymous = () => ( + + ); interface FunctionExpressionNamedProps { prop: number[]; } - const SinglePropFunctionExpressionNamed = function FunctionExpressionNamed({ prop }: FunctionExpressionNamedProps) { - console.log(prop); - return
; - }; + const SinglePropFunctionExpressionNamed = function FunctionExpressionNamed({ + prop, + }: FunctionExpressionNamedProps) { + console.log(prop); + return
; + }; - const renderSinglePropFunctionExpressionNamed = () => ; + const renderSinglePropFunctionExpressionNamed = () => ( + + ); interface SinglePropClassExpressionProps { prop: number[]; } - const SinglePropClassExpression = class extends React.Component { - render() { - return
; - } - }; + const SinglePropClassExpression = class extends React.Component { + render() { + return
; + } + }; - const renderSinglePropClassExpression = () => ; + const renderSinglePropClassExpression = () => ( + + ); interface SinglePropClassDeclarationProps { prop: number[]; } - class SinglePropClassDeclaration extends React.Component { - render() { - return
; - } - }; - - const renderSinglePropClassDeclaration = () => ; + class SinglePropClassDeclaration extends React.Component { + render() { + return
; + } + } + const renderSinglePropClassDeclaration = () => ( + + ); })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/original.tsx b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/original.tsx index 4f9ba423f..885536585 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/original.tsx +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/original.tsx @@ -1,66 +1,77 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - interface SomeValue { - value: string; - } + interface SomeValue { + value: string; + } - const someValue: SomeValue = { value: "" }; + const someValue: SomeValue = { value: "" }; - const ManyProps = (props) =>
; + const ManyProps = (props) =>
; - const renderManyProps = () => [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ] + const renderManyProps = () => [ + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ]; - const SinglePropArrowFunction = ({ prop }) => { - console.log(prop); - return
; - }; + const SinglePropArrowFunction = ({ prop }) => { + console.log(prop); + return
; + }; - const renderSinglePropArrowFunction = () => ; + const renderSinglePropArrowFunction = () => ( + + ); - const SinglePropFunctionExpressionAnonymous = function ({ prop }) { - console.log(prop); - return
; - }; + const SinglePropFunctionExpressionAnonymous = function ({ prop }) { + console.log(prop); + return
; + }; - const renderSinglePropFunctionExpressionAnonymous = () => ; + const renderSinglePropFunctionExpressionAnonymous = () => ( + + ); - const SinglePropFunctionExpressionNamed = function FunctionExpressionNamed({ prop }) { - console.log(prop); - return
; - }; + const SinglePropFunctionExpressionNamed = function FunctionExpressionNamed({ + prop, + }) { + console.log(prop); + return
; + }; - const renderSinglePropFunctionExpressionNamed = () => ; + const renderSinglePropFunctionExpressionNamed = () => ( + + ); - const SinglePropClassExpression = class extends React.Component { - render() { - return
; - } - }; + const SinglePropClassExpression = class extends React.Component { + render() { + return
; + } + }; - const renderSinglePropClassExpression = () => ; + const renderSinglePropClassExpression = () => ( + + ); - class SinglePropClassDeclaration extends React.Component { - render() { - return
; - } - }; - - const renderSinglePropClassDeclaration = () => ; + class SinglePropClassDeclaration extends React.Component { + render() { + return
; + } + } + const renderSinglePropClassDeclaration = () => ( + + ); })(); diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/tsconfig.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/tsconfig.json index e7fbe8e7a..77e283311 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/tsconfig.json @@ -1,8 +1,8 @@ { - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "jsx": "react" - }, - "files": ["actual.tsx"] + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "react" + }, + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/typestat.json b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/typestat.json index e134a199b..1406ae0fa 100644 --- a/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/typestat.json +++ b/test/cases/fixes/incompleteTypes/reactTypes/reactPropsMissing/typestat.json @@ -1,5 +1,5 @@ { - "fixes": { - "incompleteTypes": true - } + "fixes": { + "incompleteTypes": true + } } diff --git a/test/cases/fixes/incompleteTypes/returnTypes/expected.ts b/test/cases/fixes/incompleteTypes/returnTypes/expected.ts index bfe44e10b..a8eef8c76 100644 --- a/test/cases/fixes/incompleteTypes/returnTypes/expected.ts +++ b/test/cases/fixes/incompleteTypes/returnTypes/expected.ts @@ -1,87 +1,87 @@ (function () { - function functionReturnsString(): string { - return ""; - } + function functionReturnsString(): string { + return ""; + } - function functionReturnsUndefined(): string | undefined { - return undefined; - } + function functionReturnsUndefined(): string | undefined { + return undefined; + } - function functionReturnsNull(): string | null { - return null; - } + function functionReturnsNull(): string | null { + return null; + } - function functionGivenNullReturnsUndefined(): string | null | undefined { - return undefined; - } + function functionGivenNullReturnsUndefined(): string | null | undefined { + return undefined; + } - function functionGivenUndefinedReturnsNull(): string | undefined | null { - return null; - } + function functionGivenUndefinedReturnsNull(): string | undefined | null { + return null; + } - function functionReturnsUndefinedAsExpression(): string | undefined { - return undefined as undefined; - } + function functionReturnsUndefinedAsExpression(): string | undefined { + return undefined as undefined; + } - function functionReturnsUndefinedBinaryExpression(): string | undefined { - return true && undefined; - } + function functionReturnsUndefinedBinaryExpression(): string | undefined { + return true && undefined; + } - function functionReturnsUndefinedExpression(): string | undefined { - return true ? "" : undefined; - } + function functionReturnsUndefinedExpression(): string | undefined { + return true ? "" : undefined; + } - function functionReturnsUndefinedVariable(): string | undefined { - const text: string | undefined = undefined; + function functionReturnsUndefinedVariable(): string | undefined { + const text: string | undefined = undefined; - return text; - } + return text; + } - function functionReturnsVoidExpression(): string | undefined { - return void 0; - } + function functionReturnsVoidExpression(): string | undefined { + return void 0; + } - function functionIgnoresInnerMethods(): string { - (function (): string | undefined { - return undefined; - })(); + function functionIgnoresInnerMethods(): string { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - } + return ""; + } - function functionReturnsNullAsAny(): any { - return null; - } + function functionReturnsNullAsAny(): any { + return null; + } - function functionReturnsUndefinedAsAny(): any { - return undefined; - } + function functionReturnsUndefinedAsAny(): any { + return undefined; + } - const lambdaReturnsUndefined = (): string | undefined => { - return undefined; - }; + const lambdaReturnsUndefined = (): string | undefined => { + return undefined; + }; - const lambdaReturnsNull = (): string | null => { - return null; - }; + const lambdaReturnsNull = (): string | null => { + return null; + }; - const lambdaGivenNullReturnsUndefined = (): string | null | undefined => { - return undefined; - }; + const lambdaGivenNullReturnsUndefined = (): string | null | undefined => { + return undefined; + }; - const lambdaGivenUndefinedReturnsNull = (): string | undefined | null => { - return null; - }; + const lambdaGivenUndefinedReturnsNull = (): string | undefined | null => { + return null; + }; - const lambdaIgnoresInnerMethods = (): string => { - (function (): string | undefined { - return undefined; - })(); + const lambdaIgnoresInnerMethods = (): string => { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - }; -})(); \ No newline at end of file + return ""; + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/returnTypes/original.ts b/test/cases/fixes/incompleteTypes/returnTypes/original.ts index 8fcc80e4d..e2fe376bf 100644 --- a/test/cases/fixes/incompleteTypes/returnTypes/original.ts +++ b/test/cases/fixes/incompleteTypes/returnTypes/original.ts @@ -1,87 +1,87 @@ (function () { - function functionReturnsString(): string { - return ""; - } + function functionReturnsString(): string { + return ""; + } - function functionReturnsUndefined(): string { - return undefined; - } + function functionReturnsUndefined(): string { + return undefined; + } - function functionReturnsNull(): string { - return null; - } + function functionReturnsNull(): string { + return null; + } - function functionGivenNullReturnsUndefined(): string | null { - return undefined; - } + function functionGivenNullReturnsUndefined(): string | null { + return undefined; + } - function functionGivenUndefinedReturnsNull(): string | undefined { - return null; - } + function functionGivenUndefinedReturnsNull(): string | undefined { + return null; + } - function functionReturnsUndefinedAsExpression(): string { - return undefined as undefined; - } + function functionReturnsUndefinedAsExpression(): string { + return undefined as undefined; + } - function functionReturnsUndefinedBinaryExpression(): string { - return true && undefined; - } + function functionReturnsUndefinedBinaryExpression(): string { + return true && undefined; + } - function functionReturnsUndefinedExpression(): string { - return true ? "" : undefined; - } + function functionReturnsUndefinedExpression(): string { + return true ? "" : undefined; + } - function functionReturnsUndefinedVariable(): string { - const text: string | undefined = undefined; + function functionReturnsUndefinedVariable(): string { + const text: string | undefined = undefined; - return text; - } + return text; + } - function functionReturnsVoidExpression(): string { - return void 0; - } + function functionReturnsVoidExpression(): string { + return void 0; + } - function functionIgnoresInnerMethods(): string { - (function (): string | undefined { - return undefined; - })(); + function functionIgnoresInnerMethods(): string { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - } + return ""; + } - function functionReturnsNullAsAny(): any { - return null; - } + function functionReturnsNullAsAny(): any { + return null; + } - function functionReturnsUndefinedAsAny(): any { - return undefined; - } + function functionReturnsUndefinedAsAny(): any { + return undefined; + } - const lambdaReturnsUndefined = (): string => { - return undefined; - }; + const lambdaReturnsUndefined = (): string => { + return undefined; + }; - const lambdaReturnsNull = (): string => { - return null; - }; + const lambdaReturnsNull = (): string => { + return null; + }; - const lambdaGivenNullReturnsUndefined = (): string | null => { - return undefined; - }; + const lambdaGivenNullReturnsUndefined = (): string | null => { + return undefined; + }; - const lambdaGivenUndefinedReturnsNull = (): string | undefined => { - return null; - }; + const lambdaGivenUndefinedReturnsNull = (): string | undefined => { + return null; + }; - const lambdaIgnoresInnerMethods = (): string => { - (function (): string | undefined { - return undefined; - })(); + const lambdaIgnoresInnerMethods = (): string => { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - }; -})(); \ No newline at end of file + return ""; + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/returnTypes/tsconfig.json b/test/cases/fixes/incompleteTypes/returnTypes/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/incompleteTypes/returnTypes/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/returnTypes/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/incompleteTypes/returnTypes/typestat.json b/test/cases/fixes/incompleteTypes/returnTypes/typestat.json index fc9d52c20..e11c754df 100644 --- a/test/cases/fixes/incompleteTypes/returnTypes/typestat.json +++ b/test/cases/fixes/incompleteTypes/returnTypes/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "incompleteTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "incompleteTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/incompleteTypes/variableTypes/expected.tsx b/test/cases/fixes/incompleteTypes/variableTypes/expected.tsx index 8bfa264a6..40b70bc21 100644 --- a/test/cases/fixes/incompleteTypes/variableTypes/expected.tsx +++ b/test/cases/fixes/incompleteTypes/variableTypes/expected.tsx @@ -1,194 +1,200 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - // Primitives + // Primitives - let givenUndefined = ""; - givenUndefined = undefined; + let givenUndefined = ""; + givenUndefined = undefined; - let givenUndefinedAsString: string | undefined = ""; - givenUndefinedAsString = undefined; + let givenUndefinedAsString: string | undefined = ""; + givenUndefinedAsString = undefined; - let givenUndefinedHasNull: string | null | undefined = ""; - givenUndefinedHasNull = undefined; + let givenUndefinedHasNull: string | null | undefined = ""; + givenUndefinedHasNull = undefined; - let givenNullAndUndefinedHasNull: string | null | undefined = ""; - givenNullAndUndefinedHasNull = null; - givenNullAndUndefinedHasNull = undefined; + let givenNullAndUndefinedHasNull: string | null | undefined = ""; + givenNullAndUndefinedHasNull = null; + givenNullAndUndefinedHasNull = undefined; - let givenNull = ""; - givenNull = null; + let givenNull = ""; + givenNull = null; - let givenNullAsString: string | null = ""; - givenNullAsString = null; + let givenNullAsString: string | null = ""; + givenNullAsString = null; - let givenNullHasUndefined: string | undefined | null = ""; - givenNullHasUndefined = null; + let givenNullHasUndefined: string | undefined | null = ""; + givenNullHasUndefined = null; - let givenNullAndUndefinedHasUndefined: string | undefined | null = ""; - givenNullAndUndefinedHasUndefined = null; - givenNullHasUndefined = undefined; + let givenNullAndUndefinedHasUndefined: string | undefined | null = ""; + givenNullAndUndefinedHasUndefined = null; + givenNullHasUndefined = undefined; - let givenString; - givenString = ""; + let givenString; + givenString = ""; - let givenStringAsString: string = ""; - givenStringAsString = ""; + let givenStringAsString: string = ""; + givenStringAsString = ""; - let givenStringHasNull: string | null = ""; - givenStringHasNull = ""; + let givenStringHasNull: string | null = ""; + givenStringHasNull = ""; - let givenStringHasUndefined: string | undefined = ""; - givenStringHasNull = ""; + let givenStringHasUndefined: string | undefined = ""; + givenStringHasNull = ""; - let setToUndefined: string | undefined = undefined; + let setToUndefined: string | undefined = undefined; - let setToUndefinedHasNull: string | null | undefined = undefined; + let setToUndefinedHasNull: string | null | undefined = undefined; - let setToNull: string | null = null; + let setToNull: string | null = null; - let setToNullAsNull = null; + let setToNullAsNull = null; - let setToNullHasUndefined: string | undefined | null = null; + let setToNullHasUndefined: string | undefined | null = null; - let setToString = ""; + let setToString = ""; - let setToStringAsString: string = ""; + let setToStringAsString: string = ""; - let setToStringHasUndefined: string | undefined = ""; + let setToStringHasUndefined: string | undefined = ""; - let setToStringHasNull: string | null = ""; + let setToStringHasNull: string | null = ""; - // Any + // Any - let startsAnyWithString: any = ""; + let startsAnyWithString: any = ""; - let startsAnyGivenString: any; - startsAnyGivenString = ""; + let startsAnyGivenString: any; + startsAnyGivenString = ""; - let startsAnyWithStringGivenString: any = ""; - startsAnyWithStringGivenString = ""; + let startsAnyWithStringGivenString: any = ""; + startsAnyWithStringGivenString = ""; - let startsStringWithAny: string = {} as any; + let startsStringWithAny: string = {} as any; - let startsStringGivenAny: string; - startsStringGivenAny = {} as any; + let startsStringGivenAny: string; + startsStringGivenAny = {} as any; - // Async + // Async - async function _() { - let stringFromNullImmediate: string = await Promise.resolve(null); + async function _() { + let stringFromNullImmediate: string = await Promise.resolve(null); - let stringFromUndefinedLater: string; - stringFromUndefinedLater = await Promise.resolve(undefined); - } + let stringFromUndefinedLater: string; + stringFromUndefinedLater = await Promise.resolve(undefined); + } - // Interfaces and classes + // Interfaces and classes - interface SampleInterface { - readonly optional?: boolean; - readonly required: number; - } + interface SampleInterface { + readonly optional?: boolean; + readonly required: number; + } - class SampleClassOne implements SampleInterface { - readonly required = 1; - } + class SampleClassOne implements SampleInterface { + readonly required = 1; + } - class SampleClassTwo implements SampleInterface { - readonly optional = false; - readonly required = 2; - } + class SampleClassTwo implements SampleInterface { + readonly optional = false; + readonly required = 2; + } - let onlyInterfaceImplicit = { required: 1 }; - let onlyInterfaceExplicit: SampleInterface = { required: 1 }; + let onlyInterfaceImplicit = { required: 1 }; + let onlyInterfaceExplicit: SampleInterface = { required: 1 }; - let onlyClassOneImplicit = new SampleClassOne(); - let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); - let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); + let onlyClassOneImplicit = new SampleClassOne(); + let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); + let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); - let eitherClassImplicit = new SampleClassOne(); - eitherClassImplicit = new SampleClassTwo(); + let eitherClassImplicit = new SampleClassOne(); + eitherClassImplicit = new SampleClassTwo(); - let eitherClassExplicit: SampleInterface = new SampleClassOne(); - eitherClassExplicit = new SampleClassTwo(); + let eitherClassExplicit: SampleInterface = new SampleClassOne(); + eitherClassExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionImplicit = new SampleClassOne(); - eitherClassNeedsUnionImplicit = new SampleClassTwo(); + let eitherClassNeedsUnionImplicit = new SampleClassOne(); + eitherClassNeedsUnionImplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicit: SampleClassOne | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsUnionExplicit = new SampleClassTwo(); + let eitherClassNeedsUnionExplicit: SampleClassOne | SampleClassTwo = new SampleClassOne(); + eitherClassNeedsUnionExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); + let eitherClassNeedsUnionExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); - let eitherClassNeedsNullImplicit = new SampleClassOne(); - eitherClassNeedsNullImplicit = new SampleClassTwo(); - eitherClassNeedsNullImplicit = null; + let eitherClassNeedsNullImplicit = new SampleClassOne(); + eitherClassNeedsNullImplicit = new SampleClassTwo(); + eitherClassNeedsNullImplicit = null; - let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsNullAndClassExplicit = null; + let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null | SampleClassTwo = + new SampleClassOne(); + eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsNullAndClassExplicit = null; - let eitherClassNeedsUndefinedExplicit: SampleClassOne | SampleClassTwo | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicit = undefined; + let eitherClassNeedsUndefinedExplicit: SampleClassOne | SampleClassTwo | undefined = new SampleClassOne(); + eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicit = undefined; - let eitherClassNeedsUndefinedExplicitInterface: SampleInterface | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicitInterface = undefined; + let eitherClassNeedsUndefinedExplicitInterface: SampleInterface | undefined = + new SampleClassOne(); + eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicitInterface = undefined; - let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedAndClassExplicit = undefined; + let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined | SampleClassTwo = + new SampleClassOne(); + eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedAndClassExplicit = undefined; - // Array setting - let numberImplicit = [1]; - numberImplicit = [1]; + // Array setting + let numberImplicit = [1]; + numberImplicit = [1]; - let numberExplicitPrimitive: number[] = [1]; - numberExplicitPrimitive = [1]; + let numberExplicitPrimitive: number[] = [1]; + numberExplicitPrimitive = [1]; - let numberExplicitTemplated: Array = [1]; - numberExplicitTemplated = [1] as Array; + let numberExplicitTemplated: Array = [1]; + numberExplicitTemplated = [1] as Array; - // Array Iteration + // Array Iteration - const iterableStrings = ["abc", "def", "ghi"]; - for (const string of iterableStrings) { - } + const iterableStrings = ["abc", "def", "ghi"]; + for (const string of iterableStrings) { + } - const iterableStringOrUndefineds: (string | undefined)[] = ["abc", "def", "ghi"]; - for (const stringOrUndefined of iterableStringOrUndefineds) { - } + const iterableStringOrUndefineds: (string | undefined)[] = [ + "abc", + "def", + "ghi", + ]; + for (const stringOrUndefined of iterableStringOrUndefineds) { + } - // Object iteration + // Object iteration - const containsStrings = { a: "a", b: "b" }; - for (const key in containsStrings) { - } + const containsStrings = { a: "a", b: "b" }; + for (const key in containsStrings) { + } - const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; - for (const key in containsStringOrUndefineds) { - } + const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; + for (const key in containsStringOrUndefineds) { + } - // Functions + // Functions - let returnsString: (() => string); - returnsString = () => ""; + let returnsString: (() => string); + returnsString = () => ""; - let returnsStringOrNumber: (() => string) | (() => number); - returnsStringOrNumber = () => ""; - returnsStringOrNumber = () => 0; + let returnsStringOrNumber: (() => string) | (() => number); + returnsStringOrNumber = () => ""; + returnsStringOrNumber = () => 0; - // Predeclared functions (React FCs) - - interface MyComponentProps { - text: string; - } + // Predeclared functions (React FCs) - const MyComponent: React.FC = ({ - text - }) => { - return {text}; - } -})(); \ No newline at end of file + interface MyComponentProps { + text: string; + } + + const MyComponent: React.FC = ({ text }) => { + return {text}; + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/variableTypes/original.tsx b/test/cases/fixes/incompleteTypes/variableTypes/original.tsx index b9e3eb836..00532aca4 100644 --- a/test/cases/fixes/incompleteTypes/variableTypes/original.tsx +++ b/test/cases/fixes/incompleteTypes/variableTypes/original.tsx @@ -1,194 +1,200 @@ -import * as React from 'react'; +import * as React from "react"; (function () { - // Primitives + // Primitives - let givenUndefined = ""; - givenUndefined = undefined; + let givenUndefined = ""; + givenUndefined = undefined; - let givenUndefinedAsString: string = ""; - givenUndefinedAsString = undefined; + let givenUndefinedAsString: string = ""; + givenUndefinedAsString = undefined; - let givenUndefinedHasNull: string | null = ""; - givenUndefinedHasNull = undefined; + let givenUndefinedHasNull: string | null = ""; + givenUndefinedHasNull = undefined; - let givenNullAndUndefinedHasNull: string | null = ""; - givenNullAndUndefinedHasNull = null; - givenNullAndUndefinedHasNull = undefined; + let givenNullAndUndefinedHasNull: string | null = ""; + givenNullAndUndefinedHasNull = null; + givenNullAndUndefinedHasNull = undefined; - let givenNull = ""; - givenNull = null; + let givenNull = ""; + givenNull = null; - let givenNullAsString: string = ""; - givenNullAsString = null; + let givenNullAsString: string = ""; + givenNullAsString = null; - let givenNullHasUndefined: string | undefined = ""; - givenNullHasUndefined = null; + let givenNullHasUndefined: string | undefined = ""; + givenNullHasUndefined = null; - let givenNullAndUndefinedHasUndefined: string | undefined = ""; - givenNullAndUndefinedHasUndefined = null; - givenNullHasUndefined = undefined; + let givenNullAndUndefinedHasUndefined: string | undefined = ""; + givenNullAndUndefinedHasUndefined = null; + givenNullHasUndefined = undefined; - let givenString; - givenString = ""; + let givenString; + givenString = ""; - let givenStringAsString: string = ""; - givenStringAsString = ""; + let givenStringAsString: string = ""; + givenStringAsString = ""; - let givenStringHasNull: string | null = ""; - givenStringHasNull = ""; + let givenStringHasNull: string | null = ""; + givenStringHasNull = ""; - let givenStringHasUndefined: string | undefined = ""; - givenStringHasNull = ""; + let givenStringHasUndefined: string | undefined = ""; + givenStringHasNull = ""; - let setToUndefined: string = undefined; + let setToUndefined: string = undefined; - let setToUndefinedHasNull: string | null = undefined; + let setToUndefinedHasNull: string | null = undefined; - let setToNull: string = null; + let setToNull: string = null; - let setToNullAsNull = null; + let setToNullAsNull = null; - let setToNullHasUndefined: string | undefined = null; + let setToNullHasUndefined: string | undefined = null; - let setToString = ""; + let setToString = ""; - let setToStringAsString: string = ""; + let setToStringAsString: string = ""; - let setToStringHasUndefined: string | undefined = ""; + let setToStringHasUndefined: string | undefined = ""; - let setToStringHasNull: string | null = ""; + let setToStringHasNull: string | null = ""; - // Any + // Any - let startsAnyWithString: any = ""; + let startsAnyWithString: any = ""; - let startsAnyGivenString: any; - startsAnyGivenString = ""; + let startsAnyGivenString: any; + startsAnyGivenString = ""; - let startsAnyWithStringGivenString: any = ""; - startsAnyWithStringGivenString = ""; + let startsAnyWithStringGivenString: any = ""; + startsAnyWithStringGivenString = ""; - let startsStringWithAny: string = {} as any; + let startsStringWithAny: string = {} as any; - let startsStringGivenAny: string; - startsStringGivenAny = {} as any; + let startsStringGivenAny: string; + startsStringGivenAny = {} as any; - // Async + // Async - async function _() { - let stringFromNullImmediate: string = await Promise.resolve(null); + async function _() { + let stringFromNullImmediate: string = await Promise.resolve(null); - let stringFromUndefinedLater: string; - stringFromUndefinedLater = await Promise.resolve(undefined); - } + let stringFromUndefinedLater: string; + stringFromUndefinedLater = await Promise.resolve(undefined); + } - // Interfaces and classes + // Interfaces and classes - interface SampleInterface { - readonly optional?: boolean; - readonly required: number; - } + interface SampleInterface { + readonly optional?: boolean; + readonly required: number; + } - class SampleClassOne implements SampleInterface { - readonly required = 1; - } + class SampleClassOne implements SampleInterface { + readonly required = 1; + } - class SampleClassTwo implements SampleInterface { - readonly optional = false; - readonly required = 2; - } + class SampleClassTwo implements SampleInterface { + readonly optional = false; + readonly required = 2; + } - let onlyInterfaceImplicit = { required: 1 }; - let onlyInterfaceExplicit: SampleInterface = { required: 1 }; + let onlyInterfaceImplicit = { required: 1 }; + let onlyInterfaceExplicit: SampleInterface = { required: 1 }; - let onlyClassOneImplicit = new SampleClassOne(); - let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); - let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); + let onlyClassOneImplicit = new SampleClassOne(); + let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); + let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); - let eitherClassImplicit = new SampleClassOne(); - eitherClassImplicit = new SampleClassTwo(); + let eitherClassImplicit = new SampleClassOne(); + eitherClassImplicit = new SampleClassTwo(); - let eitherClassExplicit: SampleInterface = new SampleClassOne(); - eitherClassExplicit = new SampleClassTwo(); + let eitherClassExplicit: SampleInterface = new SampleClassOne(); + eitherClassExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionImplicit = new SampleClassOne(); - eitherClassNeedsUnionImplicit = new SampleClassTwo(); + let eitherClassNeedsUnionImplicit = new SampleClassOne(); + eitherClassNeedsUnionImplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicit: SampleClassOne = new SampleClassOne(); - eitherClassNeedsUnionExplicit = new SampleClassTwo(); + let eitherClassNeedsUnionExplicit: SampleClassOne = new SampleClassOne(); + eitherClassNeedsUnionExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); + let eitherClassNeedsUnionExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); - let eitherClassNeedsNullImplicit = new SampleClassOne(); - eitherClassNeedsNullImplicit = new SampleClassTwo(); - eitherClassNeedsNullImplicit = null; + let eitherClassNeedsNullImplicit = new SampleClassOne(); + eitherClassNeedsNullImplicit = new SampleClassTwo(); + eitherClassNeedsNullImplicit = null; - let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null = new SampleClassOne(); - eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsNullAndClassExplicit = null; + let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null = + new SampleClassOne(); + eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsNullAndClassExplicit = null; - let eitherClassNeedsUndefinedExplicit: SampleClassOne = new SampleClassOne(); - eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicit = undefined; + let eitherClassNeedsUndefinedExplicit: SampleClassOne = new SampleClassOne(); + eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicit = undefined; - let eitherClassNeedsUndefinedExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicitInterface = undefined; + let eitherClassNeedsUndefinedExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicitInterface = undefined; - let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedAndClassExplicit = undefined; + let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined = + new SampleClassOne(); + eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedAndClassExplicit = undefined; - // Array setting - let numberImplicit = [1]; - numberImplicit = [1]; + // Array setting + let numberImplicit = [1]; + numberImplicit = [1]; - let numberExplicitPrimitive: number[] = [1]; - numberExplicitPrimitive = [1]; + let numberExplicitPrimitive: number[] = [1]; + numberExplicitPrimitive = [1]; - let numberExplicitTemplated: Array = [1]; - numberExplicitTemplated = [1] as Array; + let numberExplicitTemplated: Array = [1]; + numberExplicitTemplated = [1] as Array; - // Array Iteration + // Array Iteration - const iterableStrings = ["abc", "def", "ghi"]; - for (const string of iterableStrings) { - } + const iterableStrings = ["abc", "def", "ghi"]; + for (const string of iterableStrings) { + } - const iterableStringOrUndefineds: (string | undefined)[] = ["abc", "def", "ghi"]; - for (const stringOrUndefined of iterableStringOrUndefineds) { - } + const iterableStringOrUndefineds: (string | undefined)[] = [ + "abc", + "def", + "ghi", + ]; + for (const stringOrUndefined of iterableStringOrUndefineds) { + } - // Object iteration + // Object iteration - const containsStrings = { a: "a", b: "b" }; - for (const key in containsStrings) { - } + const containsStrings = { a: "a", b: "b" }; + for (const key in containsStrings) { + } - const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; - for (const key in containsStringOrUndefineds) { - } + const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; + for (const key in containsStringOrUndefineds) { + } - // Functions + // Functions - let returnsString: Function; - returnsString = () => ""; + let returnsString: Function; + returnsString = () => ""; - let returnsStringOrNumber: Function; - returnsStringOrNumber = () => ""; - returnsStringOrNumber = () => 0; + let returnsStringOrNumber: Function; + returnsStringOrNumber = () => ""; + returnsStringOrNumber = () => 0; - // Predeclared functions (React FCs) - - interface MyComponentProps { - text: string; - } + // Predeclared functions (React FCs) - const MyComponent: React.FC = ({ - text - }) => { - return {text}; - } -})(); \ No newline at end of file + interface MyComponentProps { + text: string; + } + + const MyComponent: React.FC = ({ text }) => { + return {text}; + }; +})(); diff --git a/test/cases/fixes/incompleteTypes/variableTypes/tsconfig.json b/test/cases/fixes/incompleteTypes/variableTypes/tsconfig.json index fe5a4791a..8dd234eaf 100644 --- a/test/cases/fixes/incompleteTypes/variableTypes/tsconfig.json +++ b/test/cases/fixes/incompleteTypes/variableTypes/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.tsx"] + "files": ["actual.tsx"] } diff --git a/test/cases/fixes/incompleteTypes/variableTypes/typestat.json b/test/cases/fixes/incompleteTypes/variableTypes/typestat.json index fc9d52c20..e11c754df 100644 --- a/test/cases/fixes/incompleteTypes/variableTypes/typestat.json +++ b/test/cases/fixes/incompleteTypes/variableTypes/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "incompleteTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "incompleteTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/missingProperties/missingPropertyAccesses/expected.ts b/test/cases/fixes/missingProperties/missingPropertyAccesses/expected.ts index 2762b9c68..8d6e3c08d 100644 --- a/test/cases/fixes/missingProperties/missingPropertyAccesses/expected.ts +++ b/test/cases/fixes/missingProperties/missingPropertyAccesses/expected.ts @@ -1,30 +1,29 @@ (function () { - class Abc { + class Abc { givenNumber: number; givenNumberOrUndefined: number | undefined; givenUndefined: undefined; givenTwiceSame: number; givenTwiceDifferent: number; private _withGetterAndSetter: string; - def() { - this.givenNumber = 1; - this.givenNumberOrUndefined = 1 as number | undefined; - this.givenUndefined = undefined; + def() { + this.givenNumber = 1; + this.givenNumberOrUndefined = 1 as number | undefined; + this.givenUndefined = undefined; - this.givenTwiceSame = 1; - this.givenTwiceSame = 1; + this.givenTwiceSame = 1; + this.givenTwiceSame = 1; - this.givenTwiceDifferent = 1; - this.givenTwiceDifferent = undefined; - } + this.givenTwiceDifferent = 1; + this.givenTwiceDifferent = undefined; + } - set withGetterAndSetter(value: string) { - this._withGetterAndSetter = value; - } + set withGetterAndSetter(value: string) { + this._withGetterAndSetter = value; + } - get withGetterAndSetter() { - return this._withGetterAndSetter; - } - - } -})(); \ No newline at end of file + get withGetterAndSetter() { + return this._withGetterAndSetter; + } + } +})(); diff --git a/test/cases/fixes/missingProperties/missingPropertyAccesses/original.ts b/test/cases/fixes/missingProperties/missingPropertyAccesses/original.ts index 589bc0a9c..d596518ac 100644 --- a/test/cases/fixes/missingProperties/missingPropertyAccesses/original.ts +++ b/test/cases/fixes/missingProperties/missingPropertyAccesses/original.ts @@ -1,24 +1,23 @@ (function () { - class Abc { - def() { - this.givenNumber = 1; - this.givenNumberOrUndefined = 1 as number | undefined; - this.givenUndefined = undefined; + class Abc { + def() { + this.givenNumber = 1; + this.givenNumberOrUndefined = 1 as number | undefined; + this.givenUndefined = undefined; - this.givenTwiceSame = 1; - this.givenTwiceSame = 1; + this.givenTwiceSame = 1; + this.givenTwiceSame = 1; - this.givenTwiceDifferent = 1; - this.givenTwiceDifferent = undefined; - } + this.givenTwiceDifferent = 1; + this.givenTwiceDifferent = undefined; + } - set withGetterAndSetter(value: string) { - this._withGetterAndSetter = value; - } + set withGetterAndSetter(value: string) { + this._withGetterAndSetter = value; + } - get withGetterAndSetter() { - return this._withGetterAndSetter; - } - - } -})(); \ No newline at end of file + get withGetterAndSetter() { + return this._withGetterAndSetter; + } + } +})(); diff --git a/test/cases/fixes/missingProperties/missingPropertyAccesses/tsconfig.json b/test/cases/fixes/missingProperties/missingPropertyAccesses/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/missingProperties/missingPropertyAccesses/tsconfig.json +++ b/test/cases/fixes/missingProperties/missingPropertyAccesses/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/missingProperties/missingPropertyAccesses/typestat.json b/test/cases/fixes/missingProperties/missingPropertyAccesses/typestat.json index 27741724e..3426e9513 100644 --- a/test/cases/fixes/missingProperties/missingPropertyAccesses/typestat.json +++ b/test/cases/fixes/missingProperties/missingPropertyAccesses/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "missingProperties": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "missingProperties": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noImplicitAny/parameters/expected.ts b/test/cases/fixes/noImplicitAny/parameters/expected.ts index b391540c4..5bbb9fc21 100644 --- a/test/cases/fixes/noImplicitAny/parameters/expected.ts +++ b/test/cases/fixes/noImplicitAny/parameters/expected.ts @@ -1,67 +1,67 @@ (function () { - function givenStringTypeLater(abc: string): void { - console.log(abc); - } + function givenStringTypeLater(abc: string): void { + console.log(abc); + } - givenStringTypeLater(""); + givenStringTypeLater(""); - function givenStringOrNullTypeLater(abc: string | null): void { - console.log(abc); - } + function givenStringOrNullTypeLater(abc: string | null): void { + console.log(abc); + } - givenStringOrNullTypeLater("" as string | null); + givenStringOrNullTypeLater("" as string | null); - function givenStringOrNullOnStringTypeLater(abc: string): void { - console.log(abc); - } + function givenStringOrNullOnStringTypeLater(abc: string): void { + console.log(abc); + } - givenStringOrNullOnStringTypeLater("" as string | null); + givenStringOrNullOnStringTypeLater("" as string | null); - function givenStringOrUndefinedOnStringTypeLater(abc: string): void { - console.log(abc); - } + function givenStringOrUndefinedOnStringTypeLater(abc: string): void { + console.log(abc); + } - givenStringOrUndefinedOnStringTypeLater("" as string | undefined); + givenStringOrUndefinedOnStringTypeLater("" as string | undefined); - function givenNullTypeLater(abc): void { - console.log(abc); - } + function givenNullTypeLater(abc): void { + console.log(abc); + } - givenNullTypeLater(null); + givenNullTypeLater(null); - function givenUndefinedTypeLater(abc: undefined): void { - console.log(abc); - } + function givenUndefinedTypeLater(abc: undefined): void { + console.log(abc); + } - givenUndefinedTypeLater(undefined); + givenUndefinedTypeLater(undefined); - function givenAnyTypeLater(abc): void { - console.log(abc); - } + function givenAnyTypeLater(abc): void { + console.log(abc); + } - givenAnyTypeLater({} as any); + givenAnyTypeLater({} as any); - function givenEmptyObjectLiteralTypeLater(abc): void { - console.log(abc); - } + function givenEmptyObjectLiteralTypeLater(abc): void { + console.log(abc); + } - givenEmptyObjectLiteralTypeLater({}); + givenEmptyObjectLiteralTypeLater({}); - function givenObjectTypeLater(abc): void { - console.log(abc); - } + function givenObjectTypeLater(abc): void { + console.log(abc); + } - givenObjectTypeLater({} as Object); + givenObjectTypeLater({} as Object); - ['notGivenInferableType'].filter(char => console.log(char)); + ["notGivenInferableType"].filter((char) => console.log(char)); - ['notGivenInferableTypes'].forEach((char, index) => { - console.log(char, index); - }) + ["notGivenInferableTypes"].forEach((char, index) => { + console.log(char, index); + }); - const needsWrapping = (count: number) => `${count}lbs`; - needsWrapping(1.234567); + const needsWrapping = (count: number) => `${count}lbs`; + needsWrapping(1.234567); - const needsNoWrapping = (count: number) => `${count}lbs`; - needsNoWrapping(1.234567); -})(); \ No newline at end of file + const needsNoWrapping = (count: number) => `${count}lbs`; + needsNoWrapping(1.234567); +})(); diff --git a/test/cases/fixes/noImplicitAny/parameters/original.ts b/test/cases/fixes/noImplicitAny/parameters/original.ts index 1359ae787..fad8dcf4d 100644 --- a/test/cases/fixes/noImplicitAny/parameters/original.ts +++ b/test/cases/fixes/noImplicitAny/parameters/original.ts @@ -1,67 +1,67 @@ (function () { - function givenStringTypeLater(abc): void { - console.log(abc); - } + function givenStringTypeLater(abc): void { + console.log(abc); + } - givenStringTypeLater(""); + givenStringTypeLater(""); - function givenStringOrNullTypeLater(abc): void { - console.log(abc); - } + function givenStringOrNullTypeLater(abc): void { + console.log(abc); + } - givenStringOrNullTypeLater("" as string | null); + givenStringOrNullTypeLater("" as string | null); - function givenStringOrNullOnStringTypeLater(abc: string): void { - console.log(abc); - } + function givenStringOrNullOnStringTypeLater(abc: string): void { + console.log(abc); + } - givenStringOrNullOnStringTypeLater("" as string | null); + givenStringOrNullOnStringTypeLater("" as string | null); - function givenStringOrUndefinedOnStringTypeLater(abc: string): void { - console.log(abc); - } + function givenStringOrUndefinedOnStringTypeLater(abc: string): void { + console.log(abc); + } - givenStringOrUndefinedOnStringTypeLater("" as string | undefined); + givenStringOrUndefinedOnStringTypeLater("" as string | undefined); - function givenNullTypeLater(abc): void { - console.log(abc); - } + function givenNullTypeLater(abc): void { + console.log(abc); + } - givenNullTypeLater(null); + givenNullTypeLater(null); - function givenUndefinedTypeLater(abc): void { - console.log(abc); - } + function givenUndefinedTypeLater(abc): void { + console.log(abc); + } - givenUndefinedTypeLater(undefined); + givenUndefinedTypeLater(undefined); - function givenAnyTypeLater(abc): void { - console.log(abc); - } + function givenAnyTypeLater(abc): void { + console.log(abc); + } - givenAnyTypeLater({} as any); + givenAnyTypeLater({} as any); - function givenEmptyObjectLiteralTypeLater(abc): void { - console.log(abc); - } + function givenEmptyObjectLiteralTypeLater(abc): void { + console.log(abc); + } - givenEmptyObjectLiteralTypeLater({}); + givenEmptyObjectLiteralTypeLater({}); - function givenObjectTypeLater(abc): void { - console.log(abc); - } + function givenObjectTypeLater(abc): void { + console.log(abc); + } - givenObjectTypeLater({} as Object); + givenObjectTypeLater({} as Object); - ['notGivenInferableType'].filter(char => console.log(char)); + ["notGivenInferableType"].filter((char) => console.log(char)); - ['notGivenInferableTypes'].forEach((char, index) => { - console.log(char, index); - }) + ["notGivenInferableTypes"].forEach((char, index) => { + console.log(char, index); + }); - const needsWrapping = count => `${count}lbs`; - needsWrapping(1.234567); + const needsWrapping = (count) => `${count}lbs`; + needsWrapping(1.234567); - const needsNoWrapping = (count) => `${count}lbs`; - needsNoWrapping(1.234567); -})(); \ No newline at end of file + const needsNoWrapping = (count) => `${count}lbs`; + needsNoWrapping(1.234567); +})(); diff --git a/test/cases/fixes/noImplicitAny/parameters/tsconfig.json b/test/cases/fixes/noImplicitAny/parameters/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noImplicitAny/parameters/tsconfig.json +++ b/test/cases/fixes/noImplicitAny/parameters/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noImplicitAny/parameters/typestat.json b/test/cases/fixes/noImplicitAny/parameters/typestat.json index 1110963e2..1d3856325 100644 --- a/test/cases/fixes/noImplicitAny/parameters/typestat.json +++ b/test/cases/fixes/noImplicitAny/parameters/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "noImplicitAny": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "noImplicitAny": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noImplicitAny/propertyDeclarations/expected.ts b/test/cases/fixes/noImplicitAny/propertyDeclarations/expected.ts index c56351824..286bead94 100644 --- a/test/cases/fixes/noImplicitAny/propertyDeclarations/expected.ts +++ b/test/cases/fixes/noImplicitAny/propertyDeclarations/expected.ts @@ -1,41 +1,41 @@ (function () { - class Container { - givenUndefined: string | undefined = ""; + class Container { + givenUndefined: string | undefined = ""; - givenUndefinedHasNull: string | null | undefined = ""; + givenUndefinedHasNull: string | null | undefined = ""; - givenNull: string | null = ""; + givenNull: string | null = ""; - givenNullHasUndefined: string | undefined | null = ""; + givenNullHasUndefined: string | undefined | null = ""; - givenString: string = ""; + givenString: string = ""; - givenStringHasNull: string | null = ""; + givenStringHasNull: string | null = ""; - givenStringHasUndefined: string | undefined = ""; + givenStringHasUndefined: string | undefined = ""; - setToUndefined: string | undefined = undefined; + setToUndefined: string | undefined = undefined; - setToUndefinedHasNull: string | null | undefined = undefined; + setToUndefinedHasNull: string | null | undefined = undefined; - setToNull: string | null = null; + setToNull: string | null = null; - setToNullHasUndefined: string | undefined | null = null; + setToNullHasUndefined: string | undefined | null = null; - setToString: string = ""; + setToString: string = ""; - setToStringHasUndefined: string | undefined = ""; + setToStringHasUndefined: string | undefined = ""; - setToStringHasNull: string | null = ""; - } + setToStringHasNull: string | null = ""; + } - const container = new Container(); + const container = new Container(); - container.givenUndefined = undefined; - container.givenUndefinedHasNull = undefined; - container.givenNull = null; - container.givenNullHasUndefined = null; - container.givenString = ""; - container.givenStringHasNull = ""; - container.givenStringHasNull = ""; -})(); \ No newline at end of file + container.givenUndefined = undefined; + container.givenUndefinedHasNull = undefined; + container.givenNull = null; + container.givenNullHasUndefined = null; + container.givenString = ""; + container.givenStringHasNull = ""; + container.givenStringHasNull = ""; +})(); diff --git a/test/cases/fixes/noImplicitAny/propertyDeclarations/original.ts b/test/cases/fixes/noImplicitAny/propertyDeclarations/original.ts index aceb7c520..8b050b746 100644 --- a/test/cases/fixes/noImplicitAny/propertyDeclarations/original.ts +++ b/test/cases/fixes/noImplicitAny/propertyDeclarations/original.ts @@ -1,41 +1,41 @@ (function () { - class Container { - givenUndefined: string = ""; + class Container { + givenUndefined: string = ""; - givenUndefinedHasNull: string | null = ""; + givenUndefinedHasNull: string | null = ""; - givenNull: string = ""; + givenNull: string = ""; - givenNullHasUndefined: string | undefined = ""; + givenNullHasUndefined: string | undefined = ""; - givenString: string = ""; + givenString: string = ""; - givenStringHasNull: string | null = ""; + givenStringHasNull: string | null = ""; - givenStringHasUndefined: string | undefined = ""; + givenStringHasUndefined: string | undefined = ""; - setToUndefined: string = undefined; + setToUndefined: string = undefined; - setToUndefinedHasNull: string | null = undefined; + setToUndefinedHasNull: string | null = undefined; - setToNull: string = null; + setToNull: string = null; - setToNullHasUndefined: string | undefined = null; + setToNullHasUndefined: string | undefined = null; - setToString: string = ""; + setToString: string = ""; - setToStringHasUndefined: string | undefined = ""; + setToStringHasUndefined: string | undefined = ""; - setToStringHasNull: string | null = ""; - } + setToStringHasNull: string | null = ""; + } - const container = new Container(); + const container = new Container(); - container.givenUndefined = undefined; - container.givenUndefinedHasNull = undefined; - container.givenNull = null; - container.givenNullHasUndefined = null; - container.givenString = ""; - container.givenStringHasNull = ""; - container.givenStringHasNull = ""; -})(); \ No newline at end of file + container.givenUndefined = undefined; + container.givenUndefinedHasNull = undefined; + container.givenNull = null; + container.givenNullHasUndefined = null; + container.givenString = ""; + container.givenStringHasNull = ""; + container.givenStringHasNull = ""; +})(); diff --git a/test/cases/fixes/noImplicitAny/propertyDeclarations/tsconfig.json b/test/cases/fixes/noImplicitAny/propertyDeclarations/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noImplicitAny/propertyDeclarations/tsconfig.json +++ b/test/cases/fixes/noImplicitAny/propertyDeclarations/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noImplicitAny/propertyDeclarations/typestat.json b/test/cases/fixes/noImplicitAny/propertyDeclarations/typestat.json index fc9d52c20..e11c754df 100644 --- a/test/cases/fixes/noImplicitAny/propertyDeclarations/typestat.json +++ b/test/cases/fixes/noImplicitAny/propertyDeclarations/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "incompleteTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "incompleteTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noImplicitAny/variableDeclarations/expected.ts b/test/cases/fixes/noImplicitAny/variableDeclarations/expected.ts index 0d1d796b5..9659babf8 100644 --- a/test/cases/fixes/noImplicitAny/variableDeclarations/expected.ts +++ b/test/cases/fixes/noImplicitAny/variableDeclarations/expected.ts @@ -1,197 +1,205 @@ (function () { - // Primitives + // Primitives - let givenUndefined = ""; - givenUndefined = undefined; + let givenUndefined = ""; + givenUndefined = undefined; - let givenUndefinedAsString: string | undefined = ""; - givenUndefinedAsString = undefined; + let givenUndefinedAsString: string | undefined = ""; + givenUndefinedAsString = undefined; - let givenUndefinedHasNull: string | null | undefined = ""; - givenUndefinedHasNull = undefined; + let givenUndefinedHasNull: string | null | undefined = ""; + givenUndefinedHasNull = undefined; - let givenNullAndUndefinedHasNull: string | null | undefined = ""; - givenNullAndUndefinedHasNull = null; - givenNullAndUndefinedHasNull = undefined; + let givenNullAndUndefinedHasNull: string | null | undefined = ""; + givenNullAndUndefinedHasNull = null; + givenNullAndUndefinedHasNull = undefined; - let givenNull = ""; - givenNull = null; + let givenNull = ""; + givenNull = null; - let givenNullAsString: string | null = ""; - givenNullAsString = null; + let givenNullAsString: string | null = ""; + givenNullAsString = null; - let givenNullHasUndefined: string | undefined | null = ""; - givenNullHasUndefined = null; + let givenNullHasUndefined: string | undefined | null = ""; + givenNullHasUndefined = null; - let givenNullAndUndefinedHasUndefined: string | undefined | null = ""; - givenNullAndUndefinedHasUndefined = null; - givenNullHasUndefined = undefined; + let givenNullAndUndefinedHasUndefined: string | undefined | null = ""; + givenNullAndUndefinedHasUndefined = null; + givenNullHasUndefined = undefined; - let givenString; - givenString = ""; + let givenString; + givenString = ""; - let givenStringAsString: string = ""; - givenStringAsString = ""; + let givenStringAsString: string = ""; + givenStringAsString = ""; - let givenStringHasNull: string | null = ""; - givenStringHasNull = ""; + let givenStringHasNull: string | null = ""; + givenStringHasNull = ""; - let givenStringHasUndefined: string | undefined = ""; - givenStringHasNull = ""; + let givenStringHasUndefined: string | undefined = ""; + givenStringHasNull = ""; - let setToUndefined: string | undefined = undefined; + let setToUndefined: string | undefined = undefined; - let setToUndefinedHasNull: string | null | undefined = undefined; + let setToUndefinedHasNull: string | null | undefined = undefined; - let setToNull: string | null = null; + let setToNull: string | null = null; - let setToNullAsNull = null; + let setToNullAsNull = null; - let setToNullHasUndefined: string | undefined | null = null; + let setToNullHasUndefined: string | undefined | null = null; - let setToString = ""; + let setToString = ""; - let setToStringAsString: string = ""; + let setToStringAsString: string = ""; - let setToStringHasUndefined: string | undefined = ""; + let setToStringHasUndefined: string | undefined = ""; - let setToStringHasNull: string | null = ""; + let setToStringHasNull: string | null = ""; - // Any + // Any - let startsAnyWithString: any = ""; + let startsAnyWithString: any = ""; - let startsAnyGivenString: any; - startsAnyGivenString = ""; + let startsAnyGivenString: any; + startsAnyGivenString = ""; - let startsAnyWithStringGivenString: any = ""; - startsAnyWithStringGivenString = ""; + let startsAnyWithStringGivenString: any = ""; + startsAnyWithStringGivenString = ""; - let startsStringWithAny: string = {} as any; + let startsStringWithAny: string = {} as any; - let startsStringGivenAny: string; - startsStringGivenAny = {} as any; + let startsStringGivenAny: string; + startsStringGivenAny = {} as any; - // Void and undefined + // Void and undefined - let startsUndefinedWithVoid: undefined = ((): void => { })(); + let startsUndefinedWithVoid: undefined = ((): void => {})(); - let startsUndefinedGivenVoid: undefined; - startsUndefinedGivenVoid = ((): void => { })(); + let startsUndefinedGivenVoid: undefined; + startsUndefinedGivenVoid = ((): void => {})(); - let startsVoidWithUndefined: void = undefined; + let startsVoidWithUndefined: void = undefined; - let startsVoidGivenUndefined: void; - startsVoidGivenUndefined = undefined; + let startsVoidGivenUndefined: void; + startsVoidGivenUndefined = undefined; - let resolveDeclaredVoid: (v: void) => void; - new Promise((_resolve) => { - resolve = _resolve; - }); + let resolveDeclaredVoid: (v: void) => void; + new Promise((_resolve) => { + resolve = _resolve; + }); - // Async + // Async - async function _() { - let stringFromNullImmediate: string = await Promise.resolve(null); + async function _() { + let stringFromNullImmediate: string = await Promise.resolve(null); - let stringFromUndefinedLater: string; - stringFromUndefinedLater = await Promise.resolve(undefined); - } + let stringFromUndefinedLater: string; + stringFromUndefinedLater = await Promise.resolve(undefined); + } - // Interfaces and classes + // Interfaces and classes - interface SampleInterface { - readonly optional?: boolean; - readonly required: number; - } + interface SampleInterface { + readonly optional?: boolean; + readonly required: number; + } - class SampleClassOne implements SampleInterface { - readonly required = 1; - } + class SampleClassOne implements SampleInterface { + readonly required = 1; + } - class SampleClassTwo implements SampleInterface { - readonly optional = false; - readonly required = 2; - } + class SampleClassTwo implements SampleInterface { + readonly optional = false; + readonly required = 2; + } - let onlyInterfaceImplicit = { required: 1 }; - let onlyInterfaceExplicit: SampleInterface = { required: 1 }; + let onlyInterfaceImplicit = { required: 1 }; + let onlyInterfaceExplicit: SampleInterface = { required: 1 }; - let onlyClassOneImplicit = new SampleClassOne(); - let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); - let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); + let onlyClassOneImplicit = new SampleClassOne(); + let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); + let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); - let eitherClassImplicit = new SampleClassOne(); - eitherClassImplicit = new SampleClassTwo(); + let eitherClassImplicit = new SampleClassOne(); + eitherClassImplicit = new SampleClassTwo(); - let eitherClassExplicit: SampleInterface = new SampleClassOne(); - eitherClassExplicit = new SampleClassTwo(); + let eitherClassExplicit: SampleInterface = new SampleClassOne(); + eitherClassExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionImplicit = new SampleClassOne(); - eitherClassNeedsUnionImplicit = new SampleClassTwo(); + let eitherClassNeedsUnionImplicit = new SampleClassOne(); + eitherClassNeedsUnionImplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicit: SampleClassOne | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsUnionExplicit = new SampleClassTwo(); + let eitherClassNeedsUnionExplicit: SampleClassOne | SampleClassTwo = new SampleClassOne(); + eitherClassNeedsUnionExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); + let eitherClassNeedsUnionExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); - let eitherClassNeedsNullImplicit = new SampleClassOne(); - eitherClassNeedsNullImplicit = new SampleClassTwo(); - eitherClassNeedsNullImplicit = null; + let eitherClassNeedsNullImplicit = new SampleClassOne(); + eitherClassNeedsNullImplicit = new SampleClassTwo(); + eitherClassNeedsNullImplicit = null; - let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsNullAndClassExplicit = null; + let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null | SampleClassTwo = + new SampleClassOne(); + eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsNullAndClassExplicit = null; - let eitherClassNeedsUndefinedExplicit: SampleClassOne | SampleClassTwo | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicit = undefined; + let eitherClassNeedsUndefinedExplicit: SampleClassOne | SampleClassTwo | undefined = new SampleClassOne(); + eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicit = undefined; - let eitherClassNeedsUndefinedExplicitInterface: SampleInterface | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicitInterface = undefined; + let eitherClassNeedsUndefinedExplicitInterface: SampleInterface | undefined = + new SampleClassOne(); + eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicitInterface = undefined; - let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined | SampleClassTwo = new SampleClassOne(); - eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedAndClassExplicit = undefined; + let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined | SampleClassTwo = + new SampleClassOne(); + eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedAndClassExplicit = undefined; - // Array setting - let numberImplicit = [1]; - numberImplicit = [1]; + // Array setting + let numberImplicit = [1]; + numberImplicit = [1]; - let numberExplicitPrimitive: number[] = [1]; - numberExplicitPrimitive = [1]; + let numberExplicitPrimitive: number[] = [1]; + numberExplicitPrimitive = [1]; - let numberExplicitTemplated: Array = [1]; - numberExplicitTemplated = [1] as Array; + let numberExplicitTemplated: Array = [1]; + numberExplicitTemplated = [1] as Array; - // Array Iteration + // Array Iteration - const iterableStrings = ["abc", "def", "ghi"]; - for (const string of iterableStrings) { - } + const iterableStrings = ["abc", "def", "ghi"]; + for (const string of iterableStrings) { + } - const iterableStringOrUndefineds: (string | undefined)[] = ["abc", "def", "ghi"]; - for (const stringOrUndefined of iterableStringOrUndefineds) { - } + const iterableStringOrUndefineds: (string | undefined)[] = [ + "abc", + "def", + "ghi", + ]; + for (const stringOrUndefined of iterableStringOrUndefineds) { + } - // Object iteration + // Object iteration - const containsStrings = { a: "a", b: "b" }; - for (const key in containsStrings) { - } + const containsStrings = { a: "a", b: "b" }; + for (const key in containsStrings) { + } - const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; - for (const key in containsStringOrUndefineds) { - } + const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; + for (const key in containsStringOrUndefineds) { + } - // Functions + // Functions - let resolve; - resolve = () => { }; + let resolve; + resolve = () => {}; - new Promise((_resolve) => { - resolve = _resolve; - }); -})(); \ No newline at end of file + new Promise((_resolve) => { + resolve = _resolve; + }); +})(); diff --git a/test/cases/fixes/noImplicitAny/variableDeclarations/original.ts b/test/cases/fixes/noImplicitAny/variableDeclarations/original.ts index c1b39e8e2..64bbcfb16 100644 --- a/test/cases/fixes/noImplicitAny/variableDeclarations/original.ts +++ b/test/cases/fixes/noImplicitAny/variableDeclarations/original.ts @@ -1,197 +1,205 @@ (function () { - // Primitives + // Primitives - let givenUndefined = ""; - givenUndefined = undefined; + let givenUndefined = ""; + givenUndefined = undefined; - let givenUndefinedAsString: string = ""; - givenUndefinedAsString = undefined; + let givenUndefinedAsString: string = ""; + givenUndefinedAsString = undefined; - let givenUndefinedHasNull: string | null = ""; - givenUndefinedHasNull = undefined; + let givenUndefinedHasNull: string | null = ""; + givenUndefinedHasNull = undefined; - let givenNullAndUndefinedHasNull: string | null = ""; - givenNullAndUndefinedHasNull = null; - givenNullAndUndefinedHasNull = undefined; + let givenNullAndUndefinedHasNull: string | null = ""; + givenNullAndUndefinedHasNull = null; + givenNullAndUndefinedHasNull = undefined; - let givenNull = ""; - givenNull = null; + let givenNull = ""; + givenNull = null; - let givenNullAsString: string = ""; - givenNullAsString = null; + let givenNullAsString: string = ""; + givenNullAsString = null; - let givenNullHasUndefined: string | undefined = ""; - givenNullHasUndefined = null; + let givenNullHasUndefined: string | undefined = ""; + givenNullHasUndefined = null; - let givenNullAndUndefinedHasUndefined: string | undefined = ""; - givenNullAndUndefinedHasUndefined = null; - givenNullHasUndefined = undefined; + let givenNullAndUndefinedHasUndefined: string | undefined = ""; + givenNullAndUndefinedHasUndefined = null; + givenNullHasUndefined = undefined; - let givenString; - givenString = ""; + let givenString; + givenString = ""; - let givenStringAsString: string = ""; - givenStringAsString = ""; + let givenStringAsString: string = ""; + givenStringAsString = ""; - let givenStringHasNull: string | null = ""; - givenStringHasNull = ""; + let givenStringHasNull: string | null = ""; + givenStringHasNull = ""; - let givenStringHasUndefined: string | undefined = ""; - givenStringHasNull = ""; + let givenStringHasUndefined: string | undefined = ""; + givenStringHasNull = ""; - let setToUndefined: string = undefined; + let setToUndefined: string = undefined; - let setToUndefinedHasNull: string | null = undefined; + let setToUndefinedHasNull: string | null = undefined; - let setToNull: string = null; + let setToNull: string = null; - let setToNullAsNull = null; + let setToNullAsNull = null; - let setToNullHasUndefined: string | undefined = null; + let setToNullHasUndefined: string | undefined = null; - let setToString = ""; + let setToString = ""; - let setToStringAsString: string = ""; + let setToStringAsString: string = ""; - let setToStringHasUndefined: string | undefined = ""; + let setToStringHasUndefined: string | undefined = ""; - let setToStringHasNull: string | null = ""; + let setToStringHasNull: string | null = ""; - // Any + // Any - let startsAnyWithString: any = ""; + let startsAnyWithString: any = ""; - let startsAnyGivenString: any; - startsAnyGivenString = ""; + let startsAnyGivenString: any; + startsAnyGivenString = ""; - let startsAnyWithStringGivenString: any = ""; - startsAnyWithStringGivenString = ""; + let startsAnyWithStringGivenString: any = ""; + startsAnyWithStringGivenString = ""; - let startsStringWithAny: string = {} as any; + let startsStringWithAny: string = {} as any; - let startsStringGivenAny: string; - startsStringGivenAny = {} as any; + let startsStringGivenAny: string; + startsStringGivenAny = {} as any; - // Void and undefined + // Void and undefined - let startsUndefinedWithVoid: undefined = ((): void => { })(); + let startsUndefinedWithVoid: undefined = ((): void => {})(); - let startsUndefinedGivenVoid: undefined; - startsUndefinedGivenVoid = ((): void => { })(); + let startsUndefinedGivenVoid: undefined; + startsUndefinedGivenVoid = ((): void => {})(); - let startsVoidWithUndefined: void = undefined; + let startsVoidWithUndefined: void = undefined; - let startsVoidGivenUndefined: void; - startsVoidGivenUndefined = undefined; + let startsVoidGivenUndefined: void; + startsVoidGivenUndefined = undefined; - let resolveDeclaredVoid: (v: void) => void; - new Promise((_resolve) => { - resolve = _resolve; - }); + let resolveDeclaredVoid: (v: void) => void; + new Promise((_resolve) => { + resolve = _resolve; + }); - // Async + // Async - async function _() { - let stringFromNullImmediate: string = await Promise.resolve(null); + async function _() { + let stringFromNullImmediate: string = await Promise.resolve(null); - let stringFromUndefinedLater: string; - stringFromUndefinedLater = await Promise.resolve(undefined); - } + let stringFromUndefinedLater: string; + stringFromUndefinedLater = await Promise.resolve(undefined); + } - // Interfaces and classes + // Interfaces and classes - interface SampleInterface { - readonly optional?: boolean; - readonly required: number; - } + interface SampleInterface { + readonly optional?: boolean; + readonly required: number; + } - class SampleClassOne implements SampleInterface { - readonly required = 1; - } + class SampleClassOne implements SampleInterface { + readonly required = 1; + } - class SampleClassTwo implements SampleInterface { - readonly optional = false; - readonly required = 2; - } + class SampleClassTwo implements SampleInterface { + readonly optional = false; + readonly required = 2; + } - let onlyInterfaceImplicit = { required: 1 }; - let onlyInterfaceExplicit: SampleInterface = { required: 1 }; + let onlyInterfaceImplicit = { required: 1 }; + let onlyInterfaceExplicit: SampleInterface = { required: 1 }; - let onlyClassOneImplicit = new SampleClassOne(); - let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); - let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); + let onlyClassOneImplicit = new SampleClassOne(); + let onlyClassOneExplicitClass: SampleClassOne = new SampleClassOne(); + let onlyClassOneExplicitInterface: SampleInterface = new SampleClassOne(); - let eitherClassImplicit = new SampleClassOne(); - eitherClassImplicit = new SampleClassTwo(); + let eitherClassImplicit = new SampleClassOne(); + eitherClassImplicit = new SampleClassTwo(); - let eitherClassExplicit: SampleInterface = new SampleClassOne(); - eitherClassExplicit = new SampleClassTwo(); + let eitherClassExplicit: SampleInterface = new SampleClassOne(); + eitherClassExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionImplicit = new SampleClassOne(); - eitherClassNeedsUnionImplicit = new SampleClassTwo(); + let eitherClassNeedsUnionImplicit = new SampleClassOne(); + eitherClassNeedsUnionImplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicit: SampleClassOne = new SampleClassOne(); - eitherClassNeedsUnionExplicit = new SampleClassTwo(); + let eitherClassNeedsUnionExplicit: SampleClassOne = new SampleClassOne(); + eitherClassNeedsUnionExplicit = new SampleClassTwo(); - let eitherClassNeedsUnionExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); + let eitherClassNeedsUnionExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUnionExplicitInterface = new SampleClassTwo(); - let eitherClassNeedsNullImplicit = new SampleClassOne(); - eitherClassNeedsNullImplicit = new SampleClassTwo(); - eitherClassNeedsNullImplicit = null; + let eitherClassNeedsNullImplicit = new SampleClassOne(); + eitherClassNeedsNullImplicit = new SampleClassTwo(); + eitherClassNeedsNullImplicit = null; - let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null = new SampleClassOne(); - eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsNullAndClassExplicit = null; + let eitherClassNeedsNullAndClassExplicit: SampleClassOne | null = + new SampleClassOne(); + eitherClassNeedsNullAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsNullAndClassExplicit = null; - let eitherClassNeedsUndefinedExplicit: SampleClassOne = new SampleClassOne(); - eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicit = undefined; + let eitherClassNeedsUndefinedExplicit: SampleClassOne = new SampleClassOne(); + eitherClassNeedsUndefinedExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicit = undefined; - let eitherClassNeedsUndefinedExplicitInterface: SampleInterface = new SampleClassOne(); - eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); - eitherClassNeedsUndefinedExplicitInterface = undefined; + let eitherClassNeedsUndefinedExplicitInterface: SampleInterface = + new SampleClassOne(); + eitherClassNeedsUndefinedExplicitInterface = new SampleClassTwo(); + eitherClassNeedsUndefinedExplicitInterface = undefined; - let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined = new SampleClassOne(); - eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); - eitherClassNeedsUndefinedAndClassExplicit = undefined; + let eitherClassNeedsUndefinedAndClassExplicit: SampleClassOne | undefined = + new SampleClassOne(); + eitherClassNeedsUndefinedAndClassExplicit = new SampleClassTwo(); + eitherClassNeedsUndefinedAndClassExplicit = undefined; - // Array setting - let numberImplicit = [1]; - numberImplicit = [1]; + // Array setting + let numberImplicit = [1]; + numberImplicit = [1]; - let numberExplicitPrimitive: number[] = [1]; - numberExplicitPrimitive = [1]; + let numberExplicitPrimitive: number[] = [1]; + numberExplicitPrimitive = [1]; - let numberExplicitTemplated: Array = [1]; - numberExplicitTemplated = [1] as Array; + let numberExplicitTemplated: Array = [1]; + numberExplicitTemplated = [1] as Array; - // Array Iteration + // Array Iteration - const iterableStrings = ["abc", "def", "ghi"]; - for (const string of iterableStrings) { - } + const iterableStrings = ["abc", "def", "ghi"]; + for (const string of iterableStrings) { + } - const iterableStringOrUndefineds: (string | undefined)[] = ["abc", "def", "ghi"]; - for (const stringOrUndefined of iterableStringOrUndefineds) { - } + const iterableStringOrUndefineds: (string | undefined)[] = [ + "abc", + "def", + "ghi", + ]; + for (const stringOrUndefined of iterableStringOrUndefineds) { + } - // Object iteration + // Object iteration - const containsStrings = { a: "a", b: "b" }; - for (const key in containsStrings) { - } + const containsStrings = { a: "a", b: "b" }; + for (const key in containsStrings) { + } - const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; - for (const key in containsStringOrUndefineds) { - } + const containsStringOrUndefineds: { [i: string]: string | undefined } = {}; + for (const key in containsStringOrUndefineds) { + } - // Functions + // Functions - let resolve; - resolve = () => { }; + let resolve; + resolve = () => {}; - new Promise((_resolve) => { - resolve = _resolve; - }); -})(); \ No newline at end of file + new Promise((_resolve) => { + resolve = _resolve; + }); +})(); diff --git a/test/cases/fixes/noImplicitAny/variableDeclarations/tsconfig.json b/test/cases/fixes/noImplicitAny/variableDeclarations/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noImplicitAny/variableDeclarations/tsconfig.json +++ b/test/cases/fixes/noImplicitAny/variableDeclarations/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noImplicitAny/variableDeclarations/typestat.json b/test/cases/fixes/noImplicitAny/variableDeclarations/typestat.json index fc9d52c20..e11c754df 100644 --- a/test/cases/fixes/noImplicitAny/variableDeclarations/typestat.json +++ b/test/cases/fixes/noImplicitAny/variableDeclarations/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "incompleteTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "incompleteTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noImplicitThis/expected.ts b/test/cases/fixes/noImplicitThis/expected.ts index 4e468046d..9eb2da377 100644 --- a/test/cases/fixes/noImplicitThis/expected.ts +++ b/test/cases/fixes/noImplicitThis/expected.ts @@ -2,17 +2,17 @@ // https://github.com/microsoft/TypeScript/issues/36309 export interface NoImplicitThisContainer { - member: string; - returnThisMember: () => string; + member: string; + returnThisMember: () => string; } function returnThisMember(this: NoImplicitThisContainer) { - return this.member; + return this.member; } const container: NoImplicitThisContainer = { - member: "sample", - returnThisMember: returnThisMember, + member: "sample", + returnThisMember: returnThisMember, }; -container.returnThisMember(); \ No newline at end of file +container.returnThisMember(); diff --git a/test/cases/fixes/noImplicitThis/original.ts b/test/cases/fixes/noImplicitThis/original.ts index 365a7c153..27508a213 100644 --- a/test/cases/fixes/noImplicitThis/original.ts +++ b/test/cases/fixes/noImplicitThis/original.ts @@ -2,17 +2,17 @@ // https://github.com/microsoft/TypeScript/issues/36309 export interface NoImplicitThisContainer { - member: string; - returnThisMember: () => string; + member: string; + returnThisMember: () => string; } function returnThisMember() { - return this.member; + return this.member; } const container: NoImplicitThisContainer = { - member: "sample", - returnThisMember: returnThisMember, + member: "sample", + returnThisMember: returnThisMember, }; -container.returnThisMember(); \ No newline at end of file +container.returnThisMember(); diff --git a/test/cases/fixes/noImplicitThis/tsconfig.json b/test/cases/fixes/noImplicitThis/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noImplicitThis/tsconfig.json +++ b/test/cases/fixes/noImplicitThis/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noImplicitThis/typestat.json b/test/cases/fixes/noImplicitThis/typestat.json index 34e9b1714..3944d4ff5 100644 --- a/test/cases/fixes/noImplicitThis/typestat.json +++ b/test/cases/fixes/noImplicitThis/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "noImplicitThis": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "noImplicitThis": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noInferableTypes/parameters/expected.ts b/test/cases/fixes/noInferableTypes/parameters/expected.ts index 1b582b344..948b5bcf2 100644 --- a/test/cases/fixes/noInferableTypes/parameters/expected.ts +++ b/test/cases/fixes/noInferableTypes/parameters/expected.ts @@ -1,45 +1,60 @@ (function () { - // Inferable literals - const inferableBoolean = (input = false) => { }; - const inferableNull = (input = null) => { }; - const inferableNumber = (input = 0) => { }; - const inferableRegExp = (input = /./) => { }; - const inferableString = (input = "") => { }; - const inferableUndefined = (input = undefined) => { }; - - // Inferable arrays - const inferableBooleans = (input = [false]) => { }; - const inferableNulls = (input = [null]) => { }; - const inferableNumbers = (input = [0]) => { }; - const inferableRegExps = (input = [/./]) => { }; - const inferableStrings = (input = [""]) => { }; - const inferableUndefineds = (input = [undefined]) => { }; - - // Inferable multi-type arrays - const inferableNullOrStrings = (input = [null, ""]) => { }; - const inferableNumberOrRegExps = (input = [0, /./]) => { }; - - // Non-inferable multi-type arrays - const nonInferableNullOrStrings = (input: (null | string)[] = [null]) => { }; - const nonInferableNumberOrRegExps = (input: (number | RegExp)[] = [0]) => { }; - - - // Class instances - - class Parent { parent = true; } - class Child extends Parent { child = true; } - - // Inferable direct class instances - const takesParent = (parent = new Parent()) => { }; - const takesChild = (child = new Child()) => { }; - - // Non-inferable direct class instances - const takesParentAsChild = (child: Parent = new Child()) => { }; - - // Non-inferable union class instances - const takesParentOrChildAsParent = (either: Parent | Child = new Parent()) => { }; - const takesParentOrChildAsChild = (either: Parent | Child = new Child()) => { }; - const takesParentOrUndefinedAsParent = (child: Parent | undefined = new Parent()) => { }; - const takesParentOrUndefinedAsChild = (child: Parent | undefined = new Child()) => { }; - const takesChildOrUndefinedAsChild = (child: Child | undefined = new Child()) => { }; -})(); \ No newline at end of file + // Inferable literals + const inferableBoolean = (input = false) => {}; + const inferableNull = (input = null) => {}; + const inferableNumber = (input = 0) => {}; + const inferableRegExp = (input = /./) => {}; + const inferableString = (input = "") => {}; + const inferableUndefined = (input = undefined) => {}; + + // Inferable arrays + const inferableBooleans = (input = [false]) => {}; + const inferableNulls = (input = [null]) => {}; + const inferableNumbers = (input = [0]) => {}; + const inferableRegExps = (input = [/./]) => {}; + const inferableStrings = (input = [""]) => {}; + const inferableUndefineds = (input = [undefined]) => {}; + + // Inferable multi-type arrays + const inferableNullOrStrings = (input = [null, ""]) => {}; + const inferableNumberOrRegExps = ( + input = [0, /./], + ) => {}; + + // Non-inferable multi-type arrays + const nonInferableNullOrStrings = (input: (null | string)[] = [null]) => {}; + const nonInferableNumberOrRegExps = (input: (number | RegExp)[] = [0]) => {}; + + // Class instances + + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + // Inferable direct class instances + const takesParent = (parent = new Parent()) => {}; + const takesChild = (child = new Child()) => {}; + + // Non-inferable direct class instances + const takesParentAsChild = (child: Parent = new Child()) => {}; + + // Non-inferable union class instances + const takesParentOrChildAsParent = ( + either: Parent | Child = new Parent(), + ) => {}; + const takesParentOrChildAsChild = ( + either: Parent | Child = new Child(), + ) => {}; + const takesParentOrUndefinedAsParent = ( + child: Parent | undefined = new Parent(), + ) => {}; + const takesParentOrUndefinedAsChild = ( + child: Parent | undefined = new Child(), + ) => {}; + const takesChildOrUndefinedAsChild = ( + child: Child | undefined = new Child(), + ) => {}; +})(); diff --git a/test/cases/fixes/noInferableTypes/parameters/original.ts b/test/cases/fixes/noInferableTypes/parameters/original.ts index 08a182a9f..976af4ce4 100644 --- a/test/cases/fixes/noInferableTypes/parameters/original.ts +++ b/test/cases/fixes/noInferableTypes/parameters/original.ts @@ -1,45 +1,60 @@ (function () { - // Inferable literals - const inferableBoolean = (input: boolean = false) => { }; - const inferableNull = (input: null = null) => { }; - const inferableNumber = (input: number = 0) => { }; - const inferableRegExp = (input: RegExp = /./) => { }; - const inferableString = (input: string = "") => { }; - const inferableUndefined = (input: undefined = undefined) => { }; - - // Inferable arrays - const inferableBooleans = (input: boolean[] = [false]) => { }; - const inferableNulls = (input: null[] = [null]) => { }; - const inferableNumbers = (input: number[] = [0]) => { }; - const inferableRegExps = (input: RegExp[] = [/./]) => { }; - const inferableStrings = (input: string[] = [""]) => { }; - const inferableUndefineds = (input: undefined[] = [undefined]) => { }; - - // Inferable multi-type arrays - const inferableNullOrStrings = (input: (null | string)[] = [null, ""]) => { }; - const inferableNumberOrRegExps = (input: (number | RegExp)[] = [0, /./]) => { }; - - // Non-inferable multi-type arrays - const nonInferableNullOrStrings = (input: (null | string)[] = [null]) => { }; - const nonInferableNumberOrRegExps = (input: (number | RegExp)[] = [0]) => { }; - - - // Class instances - - class Parent { parent = true; } - class Child extends Parent { child = true; } - - // Inferable direct class instances - const takesParent = (parent: Parent = new Parent()) => { }; - const takesChild = (child: Child = new Child()) => { }; - - // Non-inferable direct class instances - const takesParentAsChild = (child: Parent = new Child()) => { }; - - // Non-inferable union class instances - const takesParentOrChildAsParent = (either: Parent | Child = new Parent()) => { }; - const takesParentOrChildAsChild = (either: Parent | Child = new Child()) => { }; - const takesParentOrUndefinedAsParent = (child: Parent | undefined = new Parent()) => { }; - const takesParentOrUndefinedAsChild = (child: Parent | undefined = new Child()) => { }; - const takesChildOrUndefinedAsChild = (child: Child | undefined = new Child()) => { }; -})(); \ No newline at end of file + // Inferable literals + const inferableBoolean = (input: boolean = false) => {}; + const inferableNull = (input: null = null) => {}; + const inferableNumber = (input: number = 0) => {}; + const inferableRegExp = (input: RegExp = /./) => {}; + const inferableString = (input: string = "") => {}; + const inferableUndefined = (input: undefined = undefined) => {}; + + // Inferable arrays + const inferableBooleans = (input: boolean[] = [false]) => {}; + const inferableNulls = (input: null[] = [null]) => {}; + const inferableNumbers = (input: number[] = [0]) => {}; + const inferableRegExps = (input: RegExp[] = [/./]) => {}; + const inferableStrings = (input: string[] = [""]) => {}; + const inferableUndefineds = (input: undefined[] = [undefined]) => {}; + + // Inferable multi-type arrays + const inferableNullOrStrings = (input: (null | string)[] = [null, ""]) => {}; + const inferableNumberOrRegExps = ( + input: (number | RegExp)[] = [0, /./], + ) => {}; + + // Non-inferable multi-type arrays + const nonInferableNullOrStrings = (input: (null | string)[] = [null]) => {}; + const nonInferableNumberOrRegExps = (input: (number | RegExp)[] = [0]) => {}; + + // Class instances + + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + // Inferable direct class instances + const takesParent = (parent: Parent = new Parent()) => {}; + const takesChild = (child: Child = new Child()) => {}; + + // Non-inferable direct class instances + const takesParentAsChild = (child: Parent = new Child()) => {}; + + // Non-inferable union class instances + const takesParentOrChildAsParent = ( + either: Parent | Child = new Parent(), + ) => {}; + const takesParentOrChildAsChild = ( + either: Parent | Child = new Child(), + ) => {}; + const takesParentOrUndefinedAsParent = ( + child: Parent | undefined = new Parent(), + ) => {}; + const takesParentOrUndefinedAsChild = ( + child: Parent | undefined = new Child(), + ) => {}; + const takesChildOrUndefinedAsChild = ( + child: Child | undefined = new Child(), + ) => {}; +})(); diff --git a/test/cases/fixes/noInferableTypes/parameters/tsconfig.json b/test/cases/fixes/noInferableTypes/parameters/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noInferableTypes/parameters/tsconfig.json +++ b/test/cases/fixes/noInferableTypes/parameters/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noInferableTypes/parameters/typestat.json b/test/cases/fixes/noInferableTypes/parameters/typestat.json index 1aed7fafe..474bec31a 100644 --- a/test/cases/fixes/noInferableTypes/parameters/typestat.json +++ b/test/cases/fixes/noInferableTypes/parameters/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "noInferableTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "noInferableTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noInferableTypes/propertyDeclarations/expected.ts b/test/cases/fixes/noInferableTypes/propertyDeclarations/expected.ts index 1147d07aa..f2c438b17 100644 --- a/test/cases/fixes/noInferableTypes/propertyDeclarations/expected.ts +++ b/test/cases/fixes/noInferableTypes/propertyDeclarations/expected.ts @@ -1,47 +1,50 @@ (function () { - class Parent { parent = true; } - class Child extends Parent { child = true; } - - class ContainsInferables { - // Inferable literals - public inferableBoolean = false; - public inferableNull = null; - public inferableNumber = 0; - public inferableRegExp = /./; - public inferableString = ""; - public inferableUndefined = undefined; - - // Inferable arrays - public inferableBooleans = [false]; - public inferableNulls = [null]; - public inferableNumbers = [0]; - public inferableRegExps = [/./]; - public inferableStrings = [""]; - public inferableUndefineds = [undefined]; - - // Inferable multi-type arrays - public inferableNullOrStrings = [null, ""]; - public inferableNumberOrRegExps = [0, /./]; - - // Non-inferable multi-type arrays - public nonInferableNullOrStrings: (null | string)[] = [null]; - public nonInferableNumberOrRegExps: (number | RegExp)[] = [0]; - - - // Class instances - - // Inferable direct class instances - public takesParent = new Parent(); - public takesChild = new Child(); - - // Non-inferable direct class instances - public takesParentAsChild: Parent = new Child(); - - // Non-inferable union class instances - public takesParentOrChildAsParent: Parent | Child = new Parent(); - public takesParentOrChildAsChild: Parent | Child = new Child(); - public takesParentOrUndefinedAsParent: Parent | undefined = new Parent(); - public takesParentOrUndefinedAsChild: Parent | undefined = new Child(); - public takesChildOrUndefinedAsChild: Child | undefined = new Child(); - } -})(); \ No newline at end of file + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + class ContainsInferables { + // Inferable literals + public inferableBoolean = false; + public inferableNull = null; + public inferableNumber = 0; + public inferableRegExp = /./; + public inferableString = ""; + public inferableUndefined = undefined; + + // Inferable arrays + public inferableBooleans = [false]; + public inferableNulls = [null]; + public inferableNumbers = [0]; + public inferableRegExps = [/./]; + public inferableStrings = [""]; + public inferableUndefineds = [undefined]; + + // Inferable multi-type arrays + public inferableNullOrStrings = [null, ""]; + public inferableNumberOrRegExps = [0, /./]; + + // Non-inferable multi-type arrays + public nonInferableNullOrStrings: (null | string)[] = [null]; + public nonInferableNumberOrRegExps: (number | RegExp)[] = [0]; + + // Class instances + + // Inferable direct class instances + public takesParent = new Parent(); + public takesChild = new Child(); + + // Non-inferable direct class instances + public takesParentAsChild: Parent = new Child(); + + // Non-inferable union class instances + public takesParentOrChildAsParent: Parent | Child = new Parent(); + public takesParentOrChildAsChild: Parent | Child = new Child(); + public takesParentOrUndefinedAsParent: Parent | undefined = new Parent(); + public takesParentOrUndefinedAsChild: Parent | undefined = new Child(); + public takesChildOrUndefinedAsChild: Child | undefined = new Child(); + } +})(); diff --git a/test/cases/fixes/noInferableTypes/propertyDeclarations/original.ts b/test/cases/fixes/noInferableTypes/propertyDeclarations/original.ts index 9aa82bbda..d227c49c7 100644 --- a/test/cases/fixes/noInferableTypes/propertyDeclarations/original.ts +++ b/test/cases/fixes/noInferableTypes/propertyDeclarations/original.ts @@ -1,47 +1,50 @@ (function () { - class Parent { parent = true; } - class Child extends Parent { child = true; } - - class ContainsInferables { - // Inferable literals - public inferableBoolean: boolean = false; - public inferableNull: null = null; - public inferableNumber: number = 0; - public inferableRegExp: RegExp = /./; - public inferableString: string = ""; - public inferableUndefined: undefined = undefined; - - // Inferable arrays - public inferableBooleans: boolean[] = [false]; - public inferableNulls: null[] = [null]; - public inferableNumbers: number[] = [0]; - public inferableRegExps: RegExp[] = [/./]; - public inferableStrings: string[] = [""]; - public inferableUndefineds: undefined[] = [undefined]; - - // Inferable multi-type arrays - public inferableNullOrStrings: (null | string)[] = [null, ""]; - public inferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; - - // Non-inferable multi-type arrays - public nonInferableNullOrStrings: (null | string)[] = [null]; - public nonInferableNumberOrRegExps: (number | RegExp)[] = [0]; - - - // Class instances - - // Inferable direct class instances - public takesParent: Parent = new Parent(); - public takesChild: Child = new Child(); - - // Non-inferable direct class instances - public takesParentAsChild: Parent = new Child(); - - // Non-inferable union class instances - public takesParentOrChildAsParent: Parent | Child = new Parent(); - public takesParentOrChildAsChild: Parent | Child = new Child(); - public takesParentOrUndefinedAsParent: Parent | undefined = new Parent(); - public takesParentOrUndefinedAsChild: Parent | undefined = new Child(); - public takesChildOrUndefinedAsChild: Child | undefined = new Child(); - } -})(); \ No newline at end of file + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + class ContainsInferables { + // Inferable literals + public inferableBoolean: boolean = false; + public inferableNull: null = null; + public inferableNumber: number = 0; + public inferableRegExp: RegExp = /./; + public inferableString: string = ""; + public inferableUndefined: undefined = undefined; + + // Inferable arrays + public inferableBooleans: boolean[] = [false]; + public inferableNulls: null[] = [null]; + public inferableNumbers: number[] = [0]; + public inferableRegExps: RegExp[] = [/./]; + public inferableStrings: string[] = [""]; + public inferableUndefineds: undefined[] = [undefined]; + + // Inferable multi-type arrays + public inferableNullOrStrings: (null | string)[] = [null, ""]; + public inferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; + + // Non-inferable multi-type arrays + public nonInferableNullOrStrings: (null | string)[] = [null]; + public nonInferableNumberOrRegExps: (number | RegExp)[] = [0]; + + // Class instances + + // Inferable direct class instances + public takesParent: Parent = new Parent(); + public takesChild: Child = new Child(); + + // Non-inferable direct class instances + public takesParentAsChild: Parent = new Child(); + + // Non-inferable union class instances + public takesParentOrChildAsParent: Parent | Child = new Parent(); + public takesParentOrChildAsChild: Parent | Child = new Child(); + public takesParentOrUndefinedAsParent: Parent | undefined = new Parent(); + public takesParentOrUndefinedAsChild: Parent | undefined = new Child(); + public takesChildOrUndefinedAsChild: Child | undefined = new Child(); + } +})(); diff --git a/test/cases/fixes/noInferableTypes/propertyDeclarations/tsconfig.json b/test/cases/fixes/noInferableTypes/propertyDeclarations/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noInferableTypes/propertyDeclarations/tsconfig.json +++ b/test/cases/fixes/noInferableTypes/propertyDeclarations/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noInferableTypes/propertyDeclarations/typestat.json b/test/cases/fixes/noInferableTypes/propertyDeclarations/typestat.json index 1aed7fafe..474bec31a 100644 --- a/test/cases/fixes/noInferableTypes/propertyDeclarations/typestat.json +++ b/test/cases/fixes/noInferableTypes/propertyDeclarations/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "noInferableTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "noInferableTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/noInferableTypes/variableDeclarations/expected.ts b/test/cases/fixes/noInferableTypes/variableDeclarations/expected.ts index 03f0f2615..da576f4e2 100644 --- a/test/cases/fixes/noInferableTypes/variableDeclarations/expected.ts +++ b/test/cases/fixes/noInferableTypes/variableDeclarations/expected.ts @@ -1,83 +1,86 @@ (function () { - class Parent { parent = true; } - class Child extends Parent { child = true; } - - // Inferable const literals - const constInferableBoolean = false; - const constInferableNull = null; - const constInferableNumber = 0; - const constInferableRegExp = /./; - const constInferableString = ""; - const constInferableUndefined = undefined; - - // Inferable let literals - let letInferableBoolean = false; - let letInferableNull = null; - let letInferableNumber = 0; - let letInferableRegExp = /./; - let letInferableString = ""; - let letInferableUndefined = undefined; - - // Inferable const arrays - const constInferableBooleans = [false]; - const constInferableNulls = [null]; - const constInferableNumbers = [0]; - const constInferableRegExps = [/./]; - const constInferableStrings = [""]; - const constInferableUndefineds = [undefined]; - - // Inferable let arrays - let letInferableBooleans = [false]; - let letInferableNulls = [null]; - let letInferableNumbers = [0]; - let letInferableRegExps = [/./]; - let letInferableStrings = [""]; - let letInferableUndefineds = [undefined]; - - // Inferable const multi-type arrays - const constInferableNullOrStrings = [null, ""]; - const constInferableNumberOrRegExps = [0, /./]; - - // Inferable let multi-type arrays - let letInferableNullOrStrings = [null, ""]; - let letInferableNumberOrRegExps = [0, /./]; - - // Non-inferable const multi-type arrays - const constNonInferableNullOrStrings = [null]; - const constNonInferableNumberOrRegExps = [0]; - - // Non-inferable let multi-type arrays - let letNonInferableNullOrStrings: (null | string)[] = [null]; - let letNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; - - - // Class instances - - // Inferable const direct class instances - const constTakesParent = new Parent(); - const constTakesChild = new Child(); - - // Inferable let direct class instances - let letTakesParent = new Parent(); - let letTakesChild = new Child(); - - // Non-inferable const direct class instances - const constTakesParentAsChild = new Child(); - - // Non-inferable let direct class instances - let letTakesParentAsChild: Parent = new Child(); - - // Non-inferable const union class instances - const constTakesParentOrChildAsParent = new Parent(); - const constTakesParentOrChildAsChild = new Child(); - const constTakesParentOrUndefinedAsParent = new Parent(); - const constTakesParentOrUndefinedAsChild = new Child(); - const constTakesChildOrUndefinedAsChild = new Child(); - - // Non-inferable let union class instances - let letTakesParentOrChildAsParent: Parent | Child = new Parent(); - let letTakesParentOrChildAsChild: Parent | Child = new Child(); - let letTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); - let letTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); - let letTakesChildOrUndefinedAsChild: Child | undefined = new Child(); -})(); \ No newline at end of file + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + // Inferable const literals + const constInferableBoolean = false; + const constInferableNull = null; + const constInferableNumber = 0; + const constInferableRegExp = /./; + const constInferableString = ""; + const constInferableUndefined = undefined; + + // Inferable let literals + let letInferableBoolean = false; + let letInferableNull = null; + let letInferableNumber = 0; + let letInferableRegExp = /./; + let letInferableString = ""; + let letInferableUndefined = undefined; + + // Inferable const arrays + const constInferableBooleans = [false]; + const constInferableNulls = [null]; + const constInferableNumbers = [0]; + const constInferableRegExps = [/./]; + const constInferableStrings = [""]; + const constInferableUndefineds = [undefined]; + + // Inferable let arrays + let letInferableBooleans = [false]; + let letInferableNulls = [null]; + let letInferableNumbers = [0]; + let letInferableRegExps = [/./]; + let letInferableStrings = [""]; + let letInferableUndefineds = [undefined]; + + // Inferable const multi-type arrays + const constInferableNullOrStrings = [null, ""]; + const constInferableNumberOrRegExps = [0, /./]; + + // Inferable let multi-type arrays + let letInferableNullOrStrings = [null, ""]; + let letInferableNumberOrRegExps = [0, /./]; + + // Non-inferable const multi-type arrays + const constNonInferableNullOrStrings = [null]; + const constNonInferableNumberOrRegExps = [0]; + + // Non-inferable let multi-type arrays + let letNonInferableNullOrStrings: (null | string)[] = [null]; + let letNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; + + // Class instances + + // Inferable const direct class instances + const constTakesParent = new Parent(); + const constTakesChild = new Child(); + + // Inferable let direct class instances + let letTakesParent = new Parent(); + let letTakesChild = new Child(); + + // Non-inferable const direct class instances + const constTakesParentAsChild = new Child(); + + // Non-inferable let direct class instances + let letTakesParentAsChild: Parent = new Child(); + + // Non-inferable const union class instances + const constTakesParentOrChildAsParent = new Parent(); + const constTakesParentOrChildAsChild = new Child(); + const constTakesParentOrUndefinedAsParent = new Parent(); + const constTakesParentOrUndefinedAsChild = new Child(); + const constTakesChildOrUndefinedAsChild = new Child(); + + // Non-inferable let union class instances + let letTakesParentOrChildAsParent: Parent | Child = new Parent(); + let letTakesParentOrChildAsChild: Parent | Child = new Child(); + let letTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); + let letTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); + let letTakesChildOrUndefinedAsChild: Child | undefined = new Child(); +})(); diff --git a/test/cases/fixes/noInferableTypes/variableDeclarations/original.ts b/test/cases/fixes/noInferableTypes/variableDeclarations/original.ts index f05d4feda..120e1f39c 100644 --- a/test/cases/fixes/noInferableTypes/variableDeclarations/original.ts +++ b/test/cases/fixes/noInferableTypes/variableDeclarations/original.ts @@ -1,83 +1,86 @@ (function () { - class Parent { parent = true; } - class Child extends Parent { child = true; } - - // Inferable const literals - const constInferableBoolean: boolean = false; - const constInferableNull: null = null; - const constInferableNumber: number = 0; - const constInferableRegExp: RegExp = /./; - const constInferableString: string = ""; - const constInferableUndefined: undefined = undefined; - - // Inferable let literals - let letInferableBoolean: boolean = false; - let letInferableNull: null = null; - let letInferableNumber: number = 0; - let letInferableRegExp: RegExp = /./; - let letInferableString: string = ""; - let letInferableUndefined: undefined = undefined; - - // Inferable const arrays - const constInferableBooleans: boolean[] = [false]; - const constInferableNulls: null[] = [null]; - const constInferableNumbers: number[] = [0]; - const constInferableRegExps: RegExp[] = [/./]; - const constInferableStrings: string[] = [""]; - const constInferableUndefineds: undefined[] = [undefined]; - - // Inferable let arrays - let letInferableBooleans: boolean[] = [false]; - let letInferableNulls: null[] = [null]; - let letInferableNumbers: number[] = [0]; - let letInferableRegExps: RegExp[] = [/./]; - let letInferableStrings: string[] = [""]; - let letInferableUndefineds: undefined[] = [undefined]; - - // Inferable const multi-type arrays - const constInferableNullOrStrings: (null | string)[] = [null, ""]; - const constInferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; - - // Inferable let multi-type arrays - let letInferableNullOrStrings: (null | string)[] = [null, ""]; - let letInferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; - - // Non-inferable const multi-type arrays - const constNonInferableNullOrStrings: (null | string)[] = [null]; - const constNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; - - // Non-inferable let multi-type arrays - let letNonInferableNullOrStrings: (null | string)[] = [null]; - let letNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; - - - // Class instances - - // Inferable const direct class instances - const constTakesParent: Parent = new Parent(); - const constTakesChild: Child = new Child(); - - // Inferable let direct class instances - let letTakesParent: Parent = new Parent(); - let letTakesChild: Child = new Child(); - - // Non-inferable const direct class instances - const constTakesParentAsChild: Parent = new Child(); - - // Non-inferable let direct class instances - let letTakesParentAsChild: Parent = new Child(); - - // Non-inferable const union class instances - const constTakesParentOrChildAsParent: Parent | Child = new Parent(); - const constTakesParentOrChildAsChild: Parent | Child = new Child(); - const constTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); - const constTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); - const constTakesChildOrUndefinedAsChild: Child | undefined = new Child(); - - // Non-inferable let union class instances - let letTakesParentOrChildAsParent: Parent | Child = new Parent(); - let letTakesParentOrChildAsChild: Parent | Child = new Child(); - let letTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); - let letTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); - let letTakesChildOrUndefinedAsChild: Child | undefined = new Child(); -})(); \ No newline at end of file + class Parent { + parent = true; + } + class Child extends Parent { + child = true; + } + + // Inferable const literals + const constInferableBoolean: boolean = false; + const constInferableNull: null = null; + const constInferableNumber: number = 0; + const constInferableRegExp: RegExp = /./; + const constInferableString: string = ""; + const constInferableUndefined: undefined = undefined; + + // Inferable let literals + let letInferableBoolean: boolean = false; + let letInferableNull: null = null; + let letInferableNumber: number = 0; + let letInferableRegExp: RegExp = /./; + let letInferableString: string = ""; + let letInferableUndefined: undefined = undefined; + + // Inferable const arrays + const constInferableBooleans: boolean[] = [false]; + const constInferableNulls: null[] = [null]; + const constInferableNumbers: number[] = [0]; + const constInferableRegExps: RegExp[] = [/./]; + const constInferableStrings: string[] = [""]; + const constInferableUndefineds: undefined[] = [undefined]; + + // Inferable let arrays + let letInferableBooleans: boolean[] = [false]; + let letInferableNulls: null[] = [null]; + let letInferableNumbers: number[] = [0]; + let letInferableRegExps: RegExp[] = [/./]; + let letInferableStrings: string[] = [""]; + let letInferableUndefineds: undefined[] = [undefined]; + + // Inferable const multi-type arrays + const constInferableNullOrStrings: (null | string)[] = [null, ""]; + const constInferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; + + // Inferable let multi-type arrays + let letInferableNullOrStrings: (null | string)[] = [null, ""]; + let letInferableNumberOrRegExps: (number | RegExp)[] = [0, /./]; + + // Non-inferable const multi-type arrays + const constNonInferableNullOrStrings: (null | string)[] = [null]; + const constNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; + + // Non-inferable let multi-type arrays + let letNonInferableNullOrStrings: (null | string)[] = [null]; + let letNonInferableNumberOrRegExps: (number | RegExp)[] = [0]; + + // Class instances + + // Inferable const direct class instances + const constTakesParent: Parent = new Parent(); + const constTakesChild: Child = new Child(); + + // Inferable let direct class instances + let letTakesParent: Parent = new Parent(); + let letTakesChild: Child = new Child(); + + // Non-inferable const direct class instances + const constTakesParentAsChild: Parent = new Child(); + + // Non-inferable let direct class instances + let letTakesParentAsChild: Parent = new Child(); + + // Non-inferable const union class instances + const constTakesParentOrChildAsParent: Parent | Child = new Parent(); + const constTakesParentOrChildAsChild: Parent | Child = new Child(); + const constTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); + const constTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); + const constTakesChildOrUndefinedAsChild: Child | undefined = new Child(); + + // Non-inferable let union class instances + let letTakesParentOrChildAsParent: Parent | Child = new Parent(); + let letTakesParentOrChildAsChild: Parent | Child = new Child(); + let letTakesParentOrUndefinedAsParent: Parent | undefined = new Parent(); + let letTakesParentOrUndefinedAsChild: Parent | undefined = new Child(); + let letTakesChildOrUndefinedAsChild: Child | undefined = new Child(); +})(); diff --git a/test/cases/fixes/noInferableTypes/variableDeclarations/tsconfig.json b/test/cases/fixes/noInferableTypes/variableDeclarations/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/noInferableTypes/variableDeclarations/tsconfig.json +++ b/test/cases/fixes/noInferableTypes/variableDeclarations/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/noInferableTypes/variableDeclarations/typestat.json b/test/cases/fixes/noInferableTypes/variableDeclarations/typestat.json index 1aed7fafe..474bec31a 100644 --- a/test/cases/fixes/noInferableTypes/variableDeclarations/typestat.json +++ b/test/cases/fixes/noInferableTypes/variableDeclarations/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "noInferableTypes": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "noInferableTypes": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/expected.ts b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/expected.ts index 68cd15aaa..69a201733 100644 --- a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/expected.ts +++ b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/expected.ts @@ -1,40 +1,40 @@ (function () { - let implicitAnyDirectUndefined; - implicitAnyDirectUndefined = undefined; - - let implicitAnyDirectNull; - implicitAnyDirectNull = null; - - let implicitAnyTernary; - implicitAnyTernary = Math.random() > 0.5 ? undefined : ''; - - function improperStringOrUndefined(text: string | undefined) { - let recipient = ''; - recipient = text!; - } - - function improperStringOrNull(text: string | null) { - let recipient = ''; - recipient = text!; - } - - function improperStringOrNullOrUndefined(text: string | null | undefined) { - let recipient = ''; - recipient = text!; - } - - function properStringOrUndefined(text: string | undefined) { - let recipient = Math.random() ? '' : undefined; - recipient = text; - } - - function properStringOrNull(text: string | null) { - let recipient = Math.random() ? '' : null; - recipient = text; - } - - function properStringOrNullOrUndefined(text: string | null | undefined) { - let recipient = Math.random() ? '' : undefined; - recipient = text!; - } + let implicitAnyDirectUndefined; + implicitAnyDirectUndefined = undefined; + + let implicitAnyDirectNull; + implicitAnyDirectNull = null; + + let implicitAnyTernary; + implicitAnyTernary = Math.random() > 0.5 ? undefined : ""; + + function improperStringOrUndefined(text: string | undefined) { + let recipient = ""; + recipient = text!; + } + + function improperStringOrNull(text: string | null) { + let recipient = ""; + recipient = text!; + } + + function improperStringOrNullOrUndefined(text: string | null | undefined) { + let recipient = ""; + recipient = text!; + } + + function properStringOrUndefined(text: string | undefined) { + let recipient = Math.random() ? "" : undefined; + recipient = text; + } + + function properStringOrNull(text: string | null) { + let recipient = Math.random() ? "" : null; + recipient = text; + } + + function properStringOrNullOrUndefined(text: string | null | undefined) { + let recipient = Math.random() ? "" : undefined; + recipient = text!; + } })(); diff --git a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/original.ts b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/original.ts index cbd06216f..c43ef42c4 100644 --- a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/original.ts +++ b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/original.ts @@ -1,40 +1,40 @@ (function () { - let implicitAnyDirectUndefined; - implicitAnyDirectUndefined = undefined; - - let implicitAnyDirectNull; - implicitAnyDirectNull = null; - - let implicitAnyTernary; - implicitAnyTernary = Math.random() > 0.5 ? undefined : ''; - - function improperStringOrUndefined(text: string | undefined) { - let recipient = ''; - recipient = text; - } - - function improperStringOrNull(text: string | null) { - let recipient = ''; - recipient = text; - } - - function improperStringOrNullOrUndefined(text: string | null | undefined) { - let recipient = ''; - recipient = text; - } - - function properStringOrUndefined(text: string | undefined) { - let recipient = Math.random() ? '' : undefined; - recipient = text; - } - - function properStringOrNull(text: string | null) { - let recipient = Math.random() ? '' : null; - recipient = text; - } - - function properStringOrNullOrUndefined(text: string | null | undefined) { - let recipient = Math.random() ? '' : undefined; - recipient = text; - } + let implicitAnyDirectUndefined; + implicitAnyDirectUndefined = undefined; + + let implicitAnyDirectNull; + implicitAnyDirectNull = null; + + let implicitAnyTernary; + implicitAnyTernary = Math.random() > 0.5 ? undefined : ""; + + function improperStringOrUndefined(text: string | undefined) { + let recipient = ""; + recipient = text; + } + + function improperStringOrNull(text: string | null) { + let recipient = ""; + recipient = text; + } + + function improperStringOrNullOrUndefined(text: string | null | undefined) { + let recipient = ""; + recipient = text; + } + + function properStringOrUndefined(text: string | undefined) { + let recipient = Math.random() ? "" : undefined; + recipient = text; + } + + function properStringOrNull(text: string | null) { + let recipient = Math.random() ? "" : null; + recipient = text; + } + + function properStringOrNullOrUndefined(text: string | null | undefined) { + let recipient = Math.random() ? "" : undefined; + recipient = text; + } })(); diff --git a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/tsconfig.json b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/tsconfig.json index 1099359f7..c633fdd11 100644 --- a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/tsconfig.json +++ b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/tsconfig.json @@ -1,6 +1,6 @@ { - "compilerOptions": { - "strictNullChecks": true - }, - "files": ["actual.ts"] + "compilerOptions": { + "strictNullChecks": true + }, + "files": ["actual.ts"] } diff --git a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/typestat.json b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/typestat.json index 5d1b6dd10..d8bca1f5b 100644 --- a/test/cases/fixes/strictNonNullAssertions/binaryExpressions/typestat.json +++ b/test/cases/fixes/strictNonNullAssertions/binaryExpressions/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "strictNonNullAssertions": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/strictNonNullAssertions/callExpressions/expected.ts b/test/cases/fixes/strictNonNullAssertions/callExpressions/expected.ts index f0ca66b40..cbb6d591a 100644 --- a/test/cases/fixes/strictNonNullAssertions/callExpressions/expected.ts +++ b/test/cases/fixes/strictNonNullAssertions/callExpressions/expected.ts @@ -1,77 +1,83 @@ (function () { - // Direct calls - - function oneParameterStringDirect(abc: string) { } - oneParameterStringDirect(""); - - function oneParameterStringBecomesNullDirect(abc: string) { } - oneParameterStringBecomesNullDirect(null!); - - function oneParameterStringBecomesNullOrUndefinedDirect(abc: string) { } - oneParameterStringBecomesNullOrUndefinedDirect(null!); - - function oneParameterStringBecomesUndefinedDirect(abc: string) { } - oneParameterStringBecomesUndefinedDirect(undefined!); - - function twoParametersStringDirect(abc: string, def: string) { } - twoParametersStringDirect("", ""); - - function twoParametersStringBecomesNullDirect(abc: string, def: string) { } - twoParametersStringBecomesNullDirect(null!, null!); - - function twoParametersStringBecomesNullOrUndefinedDirect(abc: string, def: string) { } - twoParametersStringBecomesNullOrUndefinedDirect(null!, undefined!); - - function twoParametersStringBecomesUndefinedDirect(abc: string, def: string) { } - twoParametersStringBecomesUndefinedDirect(undefined!, undefined!); - - function takesStringFromAny(value: string) { } - function givesAnyToString(maybe: any | undefined) { - takesStringFromAny(maybe); - } - - function takesAnyFromString(value: any) { } - function givesStringToAny(maybe: string | undefined) { - takesAnyFromString(maybe); - } - - function takesString(abc: string) { } - takesString(null!); - takesString(undefined!); - takesString((null as null | undefined)!); - takesString((undefined as null | undefined)!); - takesString(("" as string | null)!); - takesString(("" as string | undefined)!); - takesString(("" as string | null | undefined)!); - - let emptyExplicitSibling: undefined = undefined!; - let emptyImplicitSibling = undefined!; - let emptyExplicitChild: undefined = undefined; - let emptyImplicitChild = undefined; - let textSibling: string | undefined = ""; - let textChild: string | undefined = ""; - - takesString(emptyExplicitSibling); - takesString(emptyImplicitSibling); - takesString(textSibling); - - function innerCalling() { - takesString(emptyExplicitChild!); - takesString(emptyImplicitChild!); - takesString(textChild!); - } - - // Function results - - function createsStringOrNull(): string | null { - return null; - } - - const createsStringOrUndefined = (): string | undefined => undefined; - - function oneParameterStringBecomesNullIndirect(abc: string) { } - oneParameterStringBecomesNullIndirect(createsStringOrNull()!); - - const oneParameterStringBecomesUndefinedIndirect = (abc: string) => { }; - oneParameterStringBecomesUndefinedIndirect(createsStringOrUndefined()!); + // Direct calls + + function oneParameterStringDirect(abc: string) {} + oneParameterStringDirect(""); + + function oneParameterStringBecomesNullDirect(abc: string) {} + oneParameterStringBecomesNullDirect(null!); + + function oneParameterStringBecomesNullOrUndefinedDirect(abc: string) {} + oneParameterStringBecomesNullOrUndefinedDirect(null!); + + function oneParameterStringBecomesUndefinedDirect(abc: string) {} + oneParameterStringBecomesUndefinedDirect(undefined!); + + function twoParametersStringDirect(abc: string, def: string) {} + twoParametersStringDirect("", ""); + + function twoParametersStringBecomesNullDirect(abc: string, def: string) {} + twoParametersStringBecomesNullDirect(null!, null!); + + function twoParametersStringBecomesNullOrUndefinedDirect( + abc: string, + def: string, + ) {} + twoParametersStringBecomesNullOrUndefinedDirect(null!, undefined!); + + function twoParametersStringBecomesUndefinedDirect( + abc: string, + def: string, + ) {} + twoParametersStringBecomesUndefinedDirect(undefined!, undefined!); + + function takesStringFromAny(value: string) {} + function givesAnyToString(maybe: any | undefined) { + takesStringFromAny(maybe); + } + + function takesAnyFromString(value: any) {} + function givesStringToAny(maybe: string | undefined) { + takesAnyFromString(maybe); + } + + function takesString(abc: string) {} + takesString(null!); + takesString(undefined!); + takesString((null as null | undefined)!); + takesString((undefined as null | undefined)!); + takesString(("" as string | null)!); + takesString(("" as string | undefined)!); + takesString(("" as string | null | undefined)!); + + let emptyExplicitSibling: undefined = undefined!; + let emptyImplicitSibling = undefined!; + let emptyExplicitChild: undefined = undefined; + let emptyImplicitChild = undefined; + let textSibling: string | undefined = ""; + let textChild: string | undefined = ""; + + takesString(emptyExplicitSibling); + takesString(emptyImplicitSibling); + takesString(textSibling); + + function innerCalling() { + takesString(emptyExplicitChild!); + takesString(emptyImplicitChild!); + takesString(textChild!); + } + + // Function results + + function createsStringOrNull(): string | null { + return null; + } + + const createsStringOrUndefined = (): string | undefined => undefined; + + function oneParameterStringBecomesNullIndirect(abc: string) {} + oneParameterStringBecomesNullIndirect(createsStringOrNull()!); + + const oneParameterStringBecomesUndefinedIndirect = (abc: string) => {}; + oneParameterStringBecomesUndefinedIndirect(createsStringOrUndefined()!); })(); diff --git a/test/cases/fixes/strictNonNullAssertions/callExpressions/original.ts b/test/cases/fixes/strictNonNullAssertions/callExpressions/original.ts index 4f9e37cc7..f97bb839c 100644 --- a/test/cases/fixes/strictNonNullAssertions/callExpressions/original.ts +++ b/test/cases/fixes/strictNonNullAssertions/callExpressions/original.ts @@ -1,77 +1,83 @@ (function () { - // Direct calls - - function oneParameterStringDirect(abc: string) { } - oneParameterStringDirect(""); - - function oneParameterStringBecomesNullDirect(abc: string) { } - oneParameterStringBecomesNullDirect(null); - - function oneParameterStringBecomesNullOrUndefinedDirect(abc: string) { } - oneParameterStringBecomesNullOrUndefinedDirect(null); - - function oneParameterStringBecomesUndefinedDirect(abc: string) { } - oneParameterStringBecomesUndefinedDirect(undefined); - - function twoParametersStringDirect(abc: string, def: string) { } - twoParametersStringDirect("", ""); - - function twoParametersStringBecomesNullDirect(abc: string, def: string) { } - twoParametersStringBecomesNullDirect(null, null); - - function twoParametersStringBecomesNullOrUndefinedDirect(abc: string, def: string) { } - twoParametersStringBecomesNullOrUndefinedDirect(null, undefined); - - function twoParametersStringBecomesUndefinedDirect(abc: string, def: string) { } - twoParametersStringBecomesUndefinedDirect(undefined, undefined); - - function takesStringFromAny(value: string) { } - function givesAnyToString(maybe: any | undefined) { - takesStringFromAny(maybe); - } - - function takesAnyFromString(value: any) { } - function givesStringToAny(maybe: string | undefined) { - takesAnyFromString(maybe); - } - - function takesString(abc: string) { } - takesString(null); - takesString(undefined); - takesString(null as null | undefined); - takesString(undefined as null | undefined); - takesString("" as string | null); - takesString("" as string | undefined); - takesString("" as string | null | undefined); - - let emptyExplicitSibling: undefined = undefined; - let emptyImplicitSibling = undefined; - let emptyExplicitChild: undefined = undefined; - let emptyImplicitChild = undefined; - let textSibling: string | undefined = ""; - let textChild: string | undefined = ""; - - takesString(emptyExplicitSibling); - takesString(emptyImplicitSibling); - takesString(textSibling); - - function innerCalling() { - takesString(emptyExplicitChild); - takesString(emptyImplicitChild); - takesString(textChild); - } - - // Function results - - function createsStringOrNull(): string | null { - return null; - } - - const createsStringOrUndefined = (): string | undefined => undefined; - - function oneParameterStringBecomesNullIndirect(abc: string) { } - oneParameterStringBecomesNullIndirect(createsStringOrNull()); - - const oneParameterStringBecomesUndefinedIndirect = (abc: string) => { }; - oneParameterStringBecomesUndefinedIndirect(createsStringOrUndefined()); + // Direct calls + + function oneParameterStringDirect(abc: string) {} + oneParameterStringDirect(""); + + function oneParameterStringBecomesNullDirect(abc: string) {} + oneParameterStringBecomesNullDirect(null); + + function oneParameterStringBecomesNullOrUndefinedDirect(abc: string) {} + oneParameterStringBecomesNullOrUndefinedDirect(null); + + function oneParameterStringBecomesUndefinedDirect(abc: string) {} + oneParameterStringBecomesUndefinedDirect(undefined); + + function twoParametersStringDirect(abc: string, def: string) {} + twoParametersStringDirect("", ""); + + function twoParametersStringBecomesNullDirect(abc: string, def: string) {} + twoParametersStringBecomesNullDirect(null, null); + + function twoParametersStringBecomesNullOrUndefinedDirect( + abc: string, + def: string, + ) {} + twoParametersStringBecomesNullOrUndefinedDirect(null, undefined); + + function twoParametersStringBecomesUndefinedDirect( + abc: string, + def: string, + ) {} + twoParametersStringBecomesUndefinedDirect(undefined, undefined); + + function takesStringFromAny(value: string) {} + function givesAnyToString(maybe: any | undefined) { + takesStringFromAny(maybe); + } + + function takesAnyFromString(value: any) {} + function givesStringToAny(maybe: string | undefined) { + takesAnyFromString(maybe); + } + + function takesString(abc: string) {} + takesString(null); + takesString(undefined); + takesString(null as null | undefined); + takesString(undefined as null | undefined); + takesString("" as string | null); + takesString("" as string | undefined); + takesString("" as string | null | undefined); + + let emptyExplicitSibling: undefined = undefined; + let emptyImplicitSibling = undefined; + let emptyExplicitChild: undefined = undefined; + let emptyImplicitChild = undefined; + let textSibling: string | undefined = ""; + let textChild: string | undefined = ""; + + takesString(emptyExplicitSibling); + takesString(emptyImplicitSibling); + takesString(textSibling); + + function innerCalling() { + takesString(emptyExplicitChild); + takesString(emptyImplicitChild); + takesString(textChild); + } + + // Function results + + function createsStringOrNull(): string | null { + return null; + } + + const createsStringOrUndefined = (): string | undefined => undefined; + + function oneParameterStringBecomesNullIndirect(abc: string) {} + oneParameterStringBecomesNullIndirect(createsStringOrNull()); + + const oneParameterStringBecomesUndefinedIndirect = (abc: string) => {}; + oneParameterStringBecomesUndefinedIndirect(createsStringOrUndefined()); })(); diff --git a/test/cases/fixes/strictNonNullAssertions/callExpressions/tsconfig.json b/test/cases/fixes/strictNonNullAssertions/callExpressions/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/strictNonNullAssertions/callExpressions/tsconfig.json +++ b/test/cases/fixes/strictNonNullAssertions/callExpressions/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/strictNonNullAssertions/callExpressions/typestat.json b/test/cases/fixes/strictNonNullAssertions/callExpressions/typestat.json index 5d1b6dd10..d8bca1f5b 100644 --- a/test/cases/fixes/strictNonNullAssertions/callExpressions/typestat.json +++ b/test/cases/fixes/strictNonNullAssertions/callExpressions/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "strictNonNullAssertions": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/strictNonNullAssertions/objectLiterals/expected.ts b/test/cases/fixes/strictNonNullAssertions/objectLiterals/expected.ts index 0a60c80d9..c855ff25f 100644 --- a/test/cases/fixes/strictNonNullAssertions/objectLiterals/expected.ts +++ b/test/cases/fixes/strictNonNullAssertions/objectLiterals/expected.ts @@ -1,46 +1,46 @@ // Single value (function () { - type ContainedValue = { value: number }; - let value: number | null = Math.random() > 0.5 ? 0 : null; + type ContainedValue = { value: number }; + let value: number | null = Math.random() > 0.5 ? 0 : null; - // Setting in an object - const contained: ContainedValue = { value: value! }; - console.log(contained); + // Setting in an object + const contained: ContainedValue = { value: value! }; + console.log(contained); - // Passing as a function parameter - const takesContainedValue = (arg: ContainedValue) => { }; - takesContainedValue({ value: value! }); + // Passing as a function parameter + const takesContainedValue = (arg: ContainedValue) => {}; + takesContainedValue({ value: value! }); })(); // Multiple values (function () { - type ContainedValues = { first: number, ok: boolean, second: string }; - let first: number | null = Math.random() > 0.5 ? 0 : null; - let second: string | null = Math.random() > 0.5 ? "abc" : null; - let ok: boolean = true; - - // Setting in an object - const contained: ContainedValues = { first: first!, ok, second: second! }; - console.log(contained); - - // Passing as a function parameters - const takesContainedValue = (arg: ContainedValues) => { }; - takesContainedValue({ first: first!, ok, second: second! }); + type ContainedValues = { first: number; ok: boolean; second: string }; + let first: number | null = Math.random() > 0.5 ? 0 : null; + let second: string | null = Math.random() > 0.5 ? "abc" : null; + let ok: boolean = true; + + // Setting in an object + const contained: ContainedValues = { first: first!, ok, second: second! }; + console.log(contained); + + // Passing as a function parameters + const takesContainedValue = (arg: ContainedValues) => {}; + takesContainedValue({ first: first!, ok, second: second! }); })(); // Nested values (function () { - const A = { - id: undefined - } as { id: boolean | undefined } | undefined - - type B = { C: boolean } - - const B1: B = { - C: (A && A.id)! - } - - const B2: B = { - C: A?.id! - } + const A = { + id: undefined, + } as { id: boolean | undefined } | undefined; + + type B = { C: boolean }; + + const B1: B = { + C: (A && A.id)!, + }; + + const B2: B = { + C: A?.id!, + }; })(); diff --git a/test/cases/fixes/strictNonNullAssertions/objectLiterals/original.ts b/test/cases/fixes/strictNonNullAssertions/objectLiterals/original.ts index edf0ec1c1..e4b541670 100644 --- a/test/cases/fixes/strictNonNullAssertions/objectLiterals/original.ts +++ b/test/cases/fixes/strictNonNullAssertions/objectLiterals/original.ts @@ -1,46 +1,46 @@ // Single value (function () { - type ContainedValue = { value: number }; - let value: number | null = Math.random() > 0.5 ? 0 : null; + type ContainedValue = { value: number }; + let value: number | null = Math.random() > 0.5 ? 0 : null; - // Setting in an object - const contained: ContainedValue = { value }; - console.log(contained); + // Setting in an object + const contained: ContainedValue = { value }; + console.log(contained); - // Passing as a function parameter - const takesContainedValue = (arg: ContainedValue) => { }; - takesContainedValue({ value }); + // Passing as a function parameter + const takesContainedValue = (arg: ContainedValue) => {}; + takesContainedValue({ value }); })(); // Multiple values (function () { - type ContainedValues = { first: number, ok: boolean, second: string }; - let first: number | null = Math.random() > 0.5 ? 0 : null; - let second: string | null = Math.random() > 0.5 ? "abc" : null; - let ok: boolean = true; - - // Setting in an object - const contained: ContainedValues = { first, ok, second: second }; - console.log(contained); - - // Passing as a function parameters - const takesContainedValue = (arg: ContainedValues) => { }; - takesContainedValue({ first: first, ok, second }); + type ContainedValues = { first: number; ok: boolean; second: string }; + let first: number | null = Math.random() > 0.5 ? 0 : null; + let second: string | null = Math.random() > 0.5 ? "abc" : null; + let ok: boolean = true; + + // Setting in an object + const contained: ContainedValues = { first, ok, second: second }; + console.log(contained); + + // Passing as a function parameters + const takesContainedValue = (arg: ContainedValues) => {}; + takesContainedValue({ first: first, ok, second }); })(); // Nested values (function () { - const A = { - id: undefined - } as { id: boolean | undefined } | undefined - - type B = { C: boolean } - - const B1: B = { - C: A && A.id - } - - const B2: B = { - C: A?.id - } + const A = { + id: undefined, + } as { id: boolean | undefined } | undefined; + + type B = { C: boolean }; + + const B1: B = { + C: A && A.id, + }; + + const B2: B = { + C: A?.id, + }; })(); diff --git a/test/cases/fixes/strictNonNullAssertions/objectLiterals/tsconfig.json b/test/cases/fixes/strictNonNullAssertions/objectLiterals/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/strictNonNullAssertions/objectLiterals/tsconfig.json +++ b/test/cases/fixes/strictNonNullAssertions/objectLiterals/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/strictNonNullAssertions/objectLiterals/typestat.json b/test/cases/fixes/strictNonNullAssertions/objectLiterals/typestat.json index 5d1b6dd10..d8bca1f5b 100644 --- a/test/cases/fixes/strictNonNullAssertions/objectLiterals/typestat.json +++ b/test/cases/fixes/strictNonNullAssertions/objectLiterals/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "strictNonNullAssertions": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/expected.ts b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/expected.ts index 93bc2b5bf..59ad19dd9 100644 --- a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/expected.ts +++ b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/expected.ts @@ -1,283 +1,283 @@ (function () { - declare const value: string | undefined; + declare const value: string | undefined; - value!.length; - value?.length; - - declare const valueAny: any; + value!.length; + value?.length; - valueAny.length; - valueAny?.length; + declare const valueAny: any; - declare const valueAnyOrUndefined: any | undefined; + valueAny.length; + valueAny?.length; - valueAnyOrUndefined.length; - valueAnyOrUndefined?.length; - - // Internal declarations - class Abc { - givenNumber: number; - givenNumberOrUndefined: number; - givenUndefined: number; + declare const valueAnyOrUndefined: any | undefined; - givenTwiceSame: number; - - givenTwiceDifferent: number; + valueAnyOrUndefined.length; + valueAnyOrUndefined?.length; - givenAlreadyAsserted: number; + // Internal declarations + class Abc { + givenNumber: number; + givenNumberOrUndefined: number; + givenUndefined: number; - def() { - this.givenNumber = 1; - this.givenNumberOrUndefined = (1 as number | undefined)!; - this.givenUndefined = undefined!; + givenTwiceSame: number; - this.givenTwiceSame = 1; - this.givenTwiceSame = 1; + givenTwiceDifferent: number; - this.givenTwiceDifferent = 1; - this.givenTwiceDifferent = undefined!; + givenAlreadyAsserted: number; - this.givenAlreadyAsserted = undefined!; - } - } + def() { + this.givenNumber = 1; + this.givenNumberOrUndefined = (1 as number | undefined)!; + this.givenUndefined = undefined!; - // External declarations - - class Container { - givenUndefined: string = ""; + this.givenTwiceSame = 1; + this.givenTwiceSame = 1; - givenUndefinedHasNull: string | null = ""; - - givenNull: string = ""; - - givenNullHasUndefined: string | undefined = ""; - - givenString: string = ""; - - givenStringHasNull: string | null = ""; - - givenStringHasUndefined: string | undefined = ""; - - setToUndefined: string = undefined; - - setToUndefinedHasNull: string | null = undefined; - - setToNull: string = null; - - setToNullHasUndefined: string | undefined = null; - - setToString: string = ""; - - setToStringHasUndefined: string | undefined = ""; - - setToStringHasNull: string | null = ""; - } - - const container = new Container(); - - container.givenUndefined = undefined!; - container.givenUndefinedHasNull = undefined!; - container.givenNull = null!; - container.givenNullHasUndefined = null!; - container.givenString = ""; - container.givenStringHasNull = ""; - container.givenStringHasNull = ""; - - // Nested type shapes - - function withNullableString(value: string | undefined) { - value!.length; - } - - interface NotNullable { - a: { - b: { - c: number; - } - } - } - - function withNotNullable(value: NotNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalNotNullable(value?: NotNullable) { - value!.a.b.c.toPrecision(0); - value!.a?.b.c.toPrecision(0); - value!.a?.b?.c.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b.c?.toPrecision(0); - value!.a.b.c?.toPrecision(0); - value!.a.b?.c.toPrecision(0); - } - - function withPartialNotNullable(value: Partial) { - value.a!.b.c.toPrecision(0); - value.a?.b!.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a!.b.c?.toPrecision(0); - value.a!.b?.c.toPrecision(0); - } - - function withOptionalPartialNotNullable(value?: Partial) { - value!.a!.b.c.toPrecision(0); - value!.a?.b!.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a!.b.c?.toPrecision(0); - value!.a!.b?.c.toPrecision(0); - } - - interface OuterNullable { - a?: { - b: { - c: number; - } - } - } - - function withOuterNullable(value: OuterNullable) { - value.a!.b.c.toPrecision(0); - value.a?.b!.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a!.b.c?.toPrecision(0); - value.a!.b?.c.toPrecision(0); - } - - function withOptionalOuterNullable(value?: OuterNullable) { - value!.a!.b.c.toPrecision(0); - value!.a?.b!.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a!.b.c?.toPrecision(0); - value!.a!.b?.c.toPrecision(0); - } - - function withPartialOuterNullable(value: Partial) { - value.a!.b.c.toPrecision(0); - value.a?.b!.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a!.b.c?.toPrecision(0); - value.a!.b?.c.toPrecision(0); - } - - function withOptionalPartialOuterNullable(value?: Partial) { - value!.a!.b.c.toPrecision(0); - value!.a?.b!.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a!.b.c?.toPrecision(0); - value!.a!.b?.c.toPrecision(0); - } - - interface MiddleNullable { - a: { - b?: { - c: number; - } - } - } - - function withMiddleNullable(value: MiddleNullable) { - value.a.b!.c.toPrecision(0); - value.a?.b!.c.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a.b!.c?.toPrecision(0); - value.a.b?.c!.toPrecision(0); - } - - function withOptionalMiddleNullable(value?: MiddleNullable) { - value!.a.b!.c.toPrecision(0); - value!.a?.b!.c.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a.b!.c?.toPrecision(0); - value!.a.b?.c!.toPrecision(0); - } - - function withPartialMiddleNullable(value: Partial) { - value.a!.b!.c.toPrecision(0); - value.a?.b!.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a!.b!.c?.toPrecision(0); - value.a!.b?.c!.toPrecision(0); - } - - function withOptionalPartialMiddleNullable(value?: Partial) { - value!.a!.b!.c.toPrecision(0); - value!.a?.b!.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a!.b!.c?.toPrecision(0); - value!.a!.b?.c!.toPrecision(0); - } - - interface InnerNullable { - a: { - b: { - c?: number; - } - } - } - - function withInnerNullable(value: InnerNullable) { - value.a.b.c!.toPrecision(0); - value.a?.b.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c!.toPrecision(0); - } - - function withOptionalInnerNullable(value?: InnerNullable) { - value!.a.b.c!.toPrecision(0); - value!.a?.b.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b.c?.toPrecision(0); - value!.a.b.c?.toPrecision(0); - value!.a.b?.c!.toPrecision(0); - } - - function withPartialInnerNullable(value: Partial) { - value.a!.b.c!.toPrecision(0); - value.a?.b!.c!.toPrecision(0); - value.a?.b?.c!.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b!.c?.toPrecision(0); - value.a!.b.c?.toPrecision(0); - value.a!.b?.c!.toPrecision(0); - } - - function withOptionalPartialInnerNullable(value?: Partial) { - value!.a!.b.c!.toPrecision(0); - value!.a?.b!.c!.toPrecision(0); - value!.a?.b?.c!.toPrecision(0); - value!.a?.b?.c?.toPrecision(0); - value!.a?.b!.c?.toPrecision(0); - value!.a!.b.c?.toPrecision(0); - value!.a!.b?.c!.toPrecision(0); - } + this.givenTwiceDifferent = 1; + this.givenTwiceDifferent = undefined!; + + this.givenAlreadyAsserted = undefined!; + } + } + + // External declarations + + class Container { + givenUndefined: string = ""; + + givenUndefinedHasNull: string | null = ""; + + givenNull: string = ""; + + givenNullHasUndefined: string | undefined = ""; + + givenString: string = ""; + + givenStringHasNull: string | null = ""; + + givenStringHasUndefined: string | undefined = ""; + + setToUndefined: string = undefined; + + setToUndefinedHasNull: string | null = undefined; + + setToNull: string = null; + + setToNullHasUndefined: string | undefined = null; + + setToString: string = ""; + + setToStringHasUndefined: string | undefined = ""; + + setToStringHasNull: string | null = ""; + } + + const container = new Container(); + + container.givenUndefined = undefined!; + container.givenUndefinedHasNull = undefined!; + container.givenNull = null!; + container.givenNullHasUndefined = null!; + container.givenString = ""; + container.givenStringHasNull = ""; + container.givenStringHasNull = ""; + + // Nested type shapes + + function withNullableString(value: string | undefined) { + value!.length; + } + + interface NotNullable { + a: { + b: { + c: number; + }; + }; + } + + function withNotNullable(value: NotNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalNotNullable(value?: NotNullable) { + value!.a.b.c.toPrecision(0); + value!.a?.b.c.toPrecision(0); + value!.a?.b?.c.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b.c?.toPrecision(0); + value!.a.b.c?.toPrecision(0); + value!.a.b?.c.toPrecision(0); + } + + function withPartialNotNullable(value: Partial) { + value.a!.b.c.toPrecision(0); + value.a?.b!.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a!.b.c?.toPrecision(0); + value.a!.b?.c.toPrecision(0); + } + + function withOptionalPartialNotNullable(value?: Partial) { + value!.a!.b.c.toPrecision(0); + value!.a?.b!.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a!.b.c?.toPrecision(0); + value!.a!.b?.c.toPrecision(0); + } + + interface OuterNullable { + a?: { + b: { + c: number; + }; + }; + } + + function withOuterNullable(value: OuterNullable) { + value.a!.b.c.toPrecision(0); + value.a?.b!.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a!.b.c?.toPrecision(0); + value.a!.b?.c.toPrecision(0); + } + + function withOptionalOuterNullable(value?: OuterNullable) { + value!.a!.b.c.toPrecision(0); + value!.a?.b!.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a!.b.c?.toPrecision(0); + value!.a!.b?.c.toPrecision(0); + } + + function withPartialOuterNullable(value: Partial) { + value.a!.b.c.toPrecision(0); + value.a?.b!.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a!.b.c?.toPrecision(0); + value.a!.b?.c.toPrecision(0); + } + + function withOptionalPartialOuterNullable(value?: Partial) { + value!.a!.b.c.toPrecision(0); + value!.a?.b!.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a!.b.c?.toPrecision(0); + value!.a!.b?.c.toPrecision(0); + } + + interface MiddleNullable { + a: { + b?: { + c: number; + }; + }; + } + + function withMiddleNullable(value: MiddleNullable) { + value.a.b!.c.toPrecision(0); + value.a?.b!.c.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a.b!.c?.toPrecision(0); + value.a.b?.c!.toPrecision(0); + } + + function withOptionalMiddleNullable(value?: MiddleNullable) { + value!.a.b!.c.toPrecision(0); + value!.a?.b!.c.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a.b!.c?.toPrecision(0); + value!.a.b?.c!.toPrecision(0); + } + + function withPartialMiddleNullable(value: Partial) { + value.a!.b!.c.toPrecision(0); + value.a?.b!.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a!.b!.c?.toPrecision(0); + value.a!.b?.c!.toPrecision(0); + } + + function withOptionalPartialMiddleNullable(value?: Partial) { + value!.a!.b!.c.toPrecision(0); + value!.a?.b!.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a!.b!.c?.toPrecision(0); + value!.a!.b?.c!.toPrecision(0); + } + + interface InnerNullable { + a: { + b: { + c?: number; + }; + }; + } + + function withInnerNullable(value: InnerNullable) { + value.a.b.c!.toPrecision(0); + value.a?.b.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c!.toPrecision(0); + } + + function withOptionalInnerNullable(value?: InnerNullable) { + value!.a.b.c!.toPrecision(0); + value!.a?.b.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b.c?.toPrecision(0); + value!.a.b.c?.toPrecision(0); + value!.a.b?.c!.toPrecision(0); + } + + function withPartialInnerNullable(value: Partial) { + value.a!.b.c!.toPrecision(0); + value.a?.b!.c!.toPrecision(0); + value.a?.b?.c!.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b!.c?.toPrecision(0); + value.a!.b.c?.toPrecision(0); + value.a!.b?.c!.toPrecision(0); + } + + function withOptionalPartialInnerNullable(value?: Partial) { + value!.a!.b.c!.toPrecision(0); + value!.a?.b!.c!.toPrecision(0); + value!.a?.b?.c!.toPrecision(0); + value!.a?.b?.c?.toPrecision(0); + value!.a?.b!.c?.toPrecision(0); + value!.a!.b.c?.toPrecision(0); + value!.a!.b?.c!.toPrecision(0); + } })(); diff --git a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/original.ts b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/original.ts index 0b941f379..c89a90b76 100644 --- a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/original.ts +++ b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/original.ts @@ -1,283 +1,283 @@ (function () { - declare const value: string | undefined; + declare const value: string | undefined; - value.length; - value?.length; - - declare const valueAny: any; + value.length; + value?.length; - valueAny.length; - valueAny?.length; + declare const valueAny: any; - declare const valueAnyOrUndefined: any | undefined; + valueAny.length; + valueAny?.length; - valueAnyOrUndefined.length; - valueAnyOrUndefined?.length; - - // Internal declarations - class Abc { - givenNumber: number; - givenNumberOrUndefined: number; - givenUndefined: number; + declare const valueAnyOrUndefined: any | undefined; - givenTwiceSame: number; - - givenTwiceDifferent: number; + valueAnyOrUndefined.length; + valueAnyOrUndefined?.length; - givenAlreadyAsserted: number; + // Internal declarations + class Abc { + givenNumber: number; + givenNumberOrUndefined: number; + givenUndefined: number; - def() { - this.givenNumber = 1; - this.givenNumberOrUndefined = 1 as number | undefined; - this.givenUndefined = undefined; + givenTwiceSame: number; - this.givenTwiceSame = 1; - this.givenTwiceSame = 1; + givenTwiceDifferent: number; - this.givenTwiceDifferent = 1; - this.givenTwiceDifferent = undefined; + givenAlreadyAsserted: number; - this.givenAlreadyAsserted = undefined!; - } - } + def() { + this.givenNumber = 1; + this.givenNumberOrUndefined = 1 as number | undefined; + this.givenUndefined = undefined; - // External declarations - - class Container { - givenUndefined: string = ""; + this.givenTwiceSame = 1; + this.givenTwiceSame = 1; - givenUndefinedHasNull: string | null = ""; - - givenNull: string = ""; - - givenNullHasUndefined: string | undefined = ""; - - givenString: string = ""; - - givenStringHasNull: string | null = ""; - - givenStringHasUndefined: string | undefined = ""; - - setToUndefined: string = undefined; - - setToUndefinedHasNull: string | null = undefined; - - setToNull: string = null; - - setToNullHasUndefined: string | undefined = null; - - setToString: string = ""; - - setToStringHasUndefined: string | undefined = ""; - - setToStringHasNull: string | null = ""; - } - - const container = new Container(); - - container.givenUndefined = undefined; - container.givenUndefinedHasNull = undefined; - container.givenNull = null; - container.givenNullHasUndefined = null; - container.givenString = ""; - container.givenStringHasNull = ""; - container.givenStringHasNull = ""; - - // Nested type shapes - - function withNullableString(value: string | undefined) { - value.length; - } - - interface NotNullable { - a: { - b: { - c: number; - } - } - } - - function withNotNullable(value: NotNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalNotNullable(value?: NotNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withPartialNotNullable(value: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalPartialNotNullable(value?: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - interface OuterNullable { - a?: { - b: { - c: number; - } - } - } - - function withOuterNullable(value: OuterNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalOuterNullable(value?: OuterNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withPartialOuterNullable(value: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalPartialOuterNullable(value?: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - interface MiddleNullable { - a: { - b?: { - c: number; - } - } - } - - function withMiddleNullable(value: MiddleNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalMiddleNullable(value?: MiddleNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withPartialMiddleNullable(value: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalPartialMiddleNullable(value?: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - interface InnerNullable { - a: { - b: { - c?: number; - } - } - } - - function withInnerNullable(value: InnerNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalInnerNullable(value?: InnerNullable) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withPartialInnerNullable(value: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } - - function withOptionalPartialInnerNullable(value?: Partial) { - value.a.b.c.toPrecision(0); - value.a?.b.c.toPrecision(0); - value.a?.b?.c.toPrecision(0); - value.a?.b?.c?.toPrecision(0); - value.a?.b.c?.toPrecision(0); - value.a.b.c?.toPrecision(0); - value.a.b?.c.toPrecision(0); - } + this.givenTwiceDifferent = 1; + this.givenTwiceDifferent = undefined; + + this.givenAlreadyAsserted = undefined!; + } + } + + // External declarations + + class Container { + givenUndefined: string = ""; + + givenUndefinedHasNull: string | null = ""; + + givenNull: string = ""; + + givenNullHasUndefined: string | undefined = ""; + + givenString: string = ""; + + givenStringHasNull: string | null = ""; + + givenStringHasUndefined: string | undefined = ""; + + setToUndefined: string = undefined; + + setToUndefinedHasNull: string | null = undefined; + + setToNull: string = null; + + setToNullHasUndefined: string | undefined = null; + + setToString: string = ""; + + setToStringHasUndefined: string | undefined = ""; + + setToStringHasNull: string | null = ""; + } + + const container = new Container(); + + container.givenUndefined = undefined; + container.givenUndefinedHasNull = undefined; + container.givenNull = null; + container.givenNullHasUndefined = null; + container.givenString = ""; + container.givenStringHasNull = ""; + container.givenStringHasNull = ""; + + // Nested type shapes + + function withNullableString(value: string | undefined) { + value.length; + } + + interface NotNullable { + a: { + b: { + c: number; + }; + }; + } + + function withNotNullable(value: NotNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalNotNullable(value?: NotNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withPartialNotNullable(value: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalPartialNotNullable(value?: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + interface OuterNullable { + a?: { + b: { + c: number; + }; + }; + } + + function withOuterNullable(value: OuterNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalOuterNullable(value?: OuterNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withPartialOuterNullable(value: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalPartialOuterNullable(value?: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + interface MiddleNullable { + a: { + b?: { + c: number; + }; + }; + } + + function withMiddleNullable(value: MiddleNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalMiddleNullable(value?: MiddleNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withPartialMiddleNullable(value: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalPartialMiddleNullable(value?: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + interface InnerNullable { + a: { + b: { + c?: number; + }; + }; + } + + function withInnerNullable(value: InnerNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalInnerNullable(value?: InnerNullable) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withPartialInnerNullable(value: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } + + function withOptionalPartialInnerNullable(value?: Partial) { + value.a.b.c.toPrecision(0); + value.a?.b.c.toPrecision(0); + value.a?.b?.c.toPrecision(0); + value.a?.b?.c?.toPrecision(0); + value.a?.b.c?.toPrecision(0); + value.a.b.c?.toPrecision(0); + value.a.b?.c.toPrecision(0); + } })(); diff --git a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/tsconfig.json b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/tsconfig.json index c168322db..7de2b9de3 100644 --- a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/tsconfig.json +++ b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/tsconfig.json @@ -1,3 +1,3 @@ { - "files": ["actual.ts"] + "files": ["actual.ts"] } diff --git a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/typestat.json b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/typestat.json index 5d1b6dd10..d8bca1f5b 100644 --- a/test/cases/fixes/strictNonNullAssertions/propertyAccesses/typestat.json +++ b/test/cases/fixes/strictNonNullAssertions/propertyAccesses/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "strictNonNullAssertions": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/fixes/strictNonNullAssertions/returnTypes/expected.ts b/test/cases/fixes/strictNonNullAssertions/returnTypes/expected.ts index 5af4bfc32..1053dd5e4 100644 --- a/test/cases/fixes/strictNonNullAssertions/returnTypes/expected.ts +++ b/test/cases/fixes/strictNonNullAssertions/returnTypes/expected.ts @@ -1,87 +1,87 @@ (function () { - function functionReturnsString(): string { - return ""; - } + function functionReturnsString(): string { + return ""; + } - function functionReturnsUndefined(): string { - return undefined!; - } + function functionReturnsUndefined(): string { + return undefined!; + } - function functionReturnsNull(): string { - return null!; - } + function functionReturnsNull(): string { + return null!; + } - function functionGivenNullReturnsUndefined(): string | null { - return undefined!; - } + function functionGivenNullReturnsUndefined(): string | null { + return undefined!; + } - function functionGivenUndefinedReturnsNull(): string | undefined { - return null!; - } + function functionGivenUndefinedReturnsNull(): string | undefined { + return null!; + } - function functionReturnsUndefinedAsExpression(): string { - return (undefined as undefined)!; - } + function functionReturnsUndefinedAsExpression(): string { + return (undefined as undefined)!; + } - function functionReturnsUndefinedBinaryExpression(): string { - return (true && undefined)!; - } + function functionReturnsUndefinedBinaryExpression(): string { + return (true && undefined)!; + } - function functionReturnsUndefinedExpression(): string { - return (true ? "" : undefined)!; - } + function functionReturnsUndefinedExpression(): string { + return (true ? "" : undefined)!; + } - function functionReturnsUndefinedVariable(): string { - const text: string | undefined = undefined!; + function functionReturnsUndefinedVariable(): string { + const text: string | undefined = undefined!; - return text; - } + return text; + } - function functionReturnsVoidExpression(): string { - return (void 0)!; - } + function functionReturnsVoidExpression(): string { + return (void 0)!; + } - function functionIgnoresInnerMethods(): string { - (function (): string | undefined { - return undefined; - })(); + function functionIgnoresInnerMethods(): string { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - } + return ""; + } - function functionReturnsNullAsAny(): any { - return null; - } + function functionReturnsNullAsAny(): any { + return null; + } - function functionReturnsUndefinedAsAny(): any { - return undefined; - } + function functionReturnsUndefinedAsAny(): any { + return undefined; + } - const lambdaReturnsUndefined = (): string => { - return undefined!; - }; + const lambdaReturnsUndefined = (): string => { + return undefined!; + }; - const lambdaReturnsNull = (): string => { - return null!; - }; + const lambdaReturnsNull = (): string => { + return null!; + }; - const lambdaGivenNullReturnsUndefined = (): string | null => { - return undefined!; - }; + const lambdaGivenNullReturnsUndefined = (): string | null => { + return undefined!; + }; - const lambdaGivenUndefinedReturnsNull = (): string | undefined => { - return null!; - }; + const lambdaGivenUndefinedReturnsNull = (): string | undefined => { + return null!; + }; - const lambdaIgnoresInnerMethods = (): string => { - (function (): string | undefined { - return undefined; - })(); + const lambdaIgnoresInnerMethods = (): string => { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - }; + return ""; + }; })(); diff --git a/test/cases/fixes/strictNonNullAssertions/returnTypes/original.ts b/test/cases/fixes/strictNonNullAssertions/returnTypes/original.ts index 9193c8511..e2fe376bf 100644 --- a/test/cases/fixes/strictNonNullAssertions/returnTypes/original.ts +++ b/test/cases/fixes/strictNonNullAssertions/returnTypes/original.ts @@ -1,87 +1,87 @@ (function () { - function functionReturnsString(): string { - return ""; - } + function functionReturnsString(): string { + return ""; + } - function functionReturnsUndefined(): string { - return undefined; - } + function functionReturnsUndefined(): string { + return undefined; + } - function functionReturnsNull(): string { - return null; - } + function functionReturnsNull(): string { + return null; + } - function functionGivenNullReturnsUndefined(): string | null { - return undefined; - } + function functionGivenNullReturnsUndefined(): string | null { + return undefined; + } - function functionGivenUndefinedReturnsNull(): string | undefined { - return null; - } + function functionGivenUndefinedReturnsNull(): string | undefined { + return null; + } - function functionReturnsUndefinedAsExpression(): string { - return undefined as undefined; - } + function functionReturnsUndefinedAsExpression(): string { + return undefined as undefined; + } - function functionReturnsUndefinedBinaryExpression(): string { - return true && undefined; - } + function functionReturnsUndefinedBinaryExpression(): string { + return true && undefined; + } - function functionReturnsUndefinedExpression(): string { - return true ? "" : undefined; - } + function functionReturnsUndefinedExpression(): string { + return true ? "" : undefined; + } - function functionReturnsUndefinedVariable(): string { - const text: string | undefined = undefined; + function functionReturnsUndefinedVariable(): string { + const text: string | undefined = undefined; - return text; - } + return text; + } - function functionReturnsVoidExpression(): string { - return void 0; - } + function functionReturnsVoidExpression(): string { + return void 0; + } - function functionIgnoresInnerMethods(): string { - (function (): string | undefined { - return undefined; - })(); + function functionIgnoresInnerMethods(): string { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - } + return ""; + } - function functionReturnsNullAsAny(): any { - return null; - } + function functionReturnsNullAsAny(): any { + return null; + } - function functionReturnsUndefinedAsAny(): any { - return undefined; - } + function functionReturnsUndefinedAsAny(): any { + return undefined; + } - const lambdaReturnsUndefined = (): string => { - return undefined; - }; + const lambdaReturnsUndefined = (): string => { + return undefined; + }; - const lambdaReturnsNull = (): string => { - return null; - }; + const lambdaReturnsNull = (): string => { + return null; + }; - const lambdaGivenNullReturnsUndefined = (): string | null => { - return undefined; - }; + const lambdaGivenNullReturnsUndefined = (): string | null => { + return undefined; + }; - const lambdaGivenUndefinedReturnsNull = (): string | undefined => { - return null; - }; + const lambdaGivenUndefinedReturnsNull = (): string | undefined => { + return null; + }; - const lambdaIgnoresInnerMethods = (): string => { - (function (): string | undefined { - return undefined; - })(); + const lambdaIgnoresInnerMethods = (): string => { + (function (): string | undefined { + return undefined; + })(); - ((): string | undefined => undefined)(); + ((): string | undefined => undefined)(); - return ""; - }; + return ""; + }; })(); diff --git a/test/cases/fixes/strictNonNullAssertions/returnTypes/tsconfig.json b/test/cases/fixes/strictNonNullAssertions/returnTypes/tsconfig.json index 1099359f7..c633fdd11 100644 --- a/test/cases/fixes/strictNonNullAssertions/returnTypes/tsconfig.json +++ b/test/cases/fixes/strictNonNullAssertions/returnTypes/tsconfig.json @@ -1,6 +1,6 @@ { - "compilerOptions": { - "strictNullChecks": true - }, - "files": ["actual.ts"] + "compilerOptions": { + "strictNullChecks": true + }, + "files": ["actual.ts"] } diff --git a/test/cases/fixes/strictNonNullAssertions/returnTypes/typestat.json b/test/cases/fixes/strictNonNullAssertions/returnTypes/typestat.json index 5d1b6dd10..d8bca1f5b 100644 --- a/test/cases/fixes/strictNonNullAssertions/returnTypes/typestat.json +++ b/test/cases/fixes/strictNonNullAssertions/returnTypes/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "strictNonNullAssertions": true - }, - "types": { - "strictNullChecks": true - } + "fixes": { + "strictNonNullAssertions": true + }, + "types": { + "strictNullChecks": true + } } diff --git a/test/cases/include/asterisk/expected.ts b/test/cases/include/asterisk/expected.ts index c553057fd..a5d49c2d6 100644 --- a/test/cases/include/asterisk/expected.ts +++ b/test/cases/include/asterisk/expected.ts @@ -1,7 +1,7 @@ -/* foo */ (function() { - console.log("Hello, world!"); +/* foo */ (function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/include/asterisk/original.ts b/test/cases/include/asterisk/original.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/include/asterisk/original.ts +++ b/test/cases/include/asterisk/original.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/include/asterisk/sampleMutator.cjs b/test/cases/include/asterisk/sampleMutator.cjs new file mode 100644 index 000000000..6c1ea6fee --- /dev/null +++ b/test/cases/include/asterisk/sampleMutator.cjs @@ -0,0 +1,15 @@ +const prefix = "/* foo */ "; + +module.exports.fileMutator = (request) => { + return request.sourceFile.getFullText().indexOf(prefix) === -1 + ? [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ] + : []; +}; diff --git a/test/cases/include/asterisk/sampleMutator.js b/test/cases/include/asterisk/sampleMutator.js deleted file mode 100644 index 7b7452488..000000000 --- a/test/cases/include/asterisk/sampleMutator.js +++ /dev/null @@ -1,15 +0,0 @@ -const prefix = "/* foo */ "; - -module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().indexOf(prefix) === -1 - ? [ - { - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }, - ] - : []; -}; diff --git a/test/cases/include/asterisk/tsconfig.json b/test/cases/include/asterisk/tsconfig.json index 1d7693b12..0e552b862 100644 --- a/test/cases/include/asterisk/tsconfig.json +++ b/test/cases/include/asterisk/tsconfig.json @@ -1,3 +1,3 @@ { - "include": ["*"] + "include": ["*"] } diff --git a/test/cases/include/asterisk/typestat.json b/test/cases/include/asterisk/typestat.json index 5bc58d626..b24b1ee59 100644 --- a/test/cases/include/asterisk/typestat.json +++ b/test/cases/include/asterisk/typestat.json @@ -1,3 +1,3 @@ { - "mutators": ["./sampleMutator.js"] + "mutators": ["./sampleMutator.cjs"] } diff --git a/test/cases/include/directory/expected.ts b/test/cases/include/directory/expected.ts index c553057fd..a5d49c2d6 100644 --- a/test/cases/include/directory/expected.ts +++ b/test/cases/include/directory/expected.ts @@ -1,7 +1,7 @@ -/* foo */ (function() { - console.log("Hello, world!"); +/* foo */ (function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/include/directory/original.ts b/test/cases/include/directory/original.ts index f30d7a907..0148e8e85 100644 --- a/test/cases/include/directory/original.ts +++ b/test/cases/include/directory/original.ts @@ -1,7 +1,7 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); - function ignoreChanges(): string { - return undefined; - } + function ignoreChanges(): string { + return undefined; + } })(); diff --git a/test/cases/include/directory/sampleMutator.cjs b/test/cases/include/directory/sampleMutator.cjs new file mode 100644 index 000000000..6c1ea6fee --- /dev/null +++ b/test/cases/include/directory/sampleMutator.cjs @@ -0,0 +1,15 @@ +const prefix = "/* foo */ "; + +module.exports.fileMutator = (request) => { + return request.sourceFile.getFullText().indexOf(prefix) === -1 + ? [ + { + insertion: prefix, + range: { + begin: 0, + }, + type: "text-insert", + }, + ] + : []; +}; diff --git a/test/cases/include/directory/sampleMutator.js b/test/cases/include/directory/sampleMutator.js deleted file mode 100644 index 7b7452488..000000000 --- a/test/cases/include/directory/sampleMutator.js +++ /dev/null @@ -1,15 +0,0 @@ -const prefix = "/* foo */ "; - -module.exports.fileMutator = (request) => { - return request.sourceFile.getFullText().indexOf(prefix) === -1 - ? [ - { - insertion: prefix, - range: { - begin: 0, - }, - type: "text-insert", - }, - ] - : []; -}; diff --git a/test/cases/include/directory/tsconfig.json b/test/cases/include/directory/tsconfig.json index 82194fc7a..bbfad1345 100644 --- a/test/cases/include/directory/tsconfig.json +++ b/test/cases/include/directory/tsconfig.json @@ -1,3 +1,3 @@ { - "include": ["."] + "include": ["."] } diff --git a/test/cases/include/directory/typestat.json b/test/cases/include/directory/typestat.json index 5bc58d626..b24b1ee59 100644 --- a/test/cases/include/directory/typestat.json +++ b/test/cases/include/directory/typestat.json @@ -1,3 +1,3 @@ { - "mutators": ["./sampleMutator.js"] + "mutators": ["./sampleMutator.cjs"] } diff --git a/test/cases/infinite wave detection/expected.ts b/test/cases/infinite wave detection/expected.ts index ca1bf4860..ed24e32ab 100644 --- a/test/cases/infinite wave detection/expected.ts +++ b/test/cases/infinite wave detection/expected.ts @@ -18,6 +18,6 @@ /* This should extend only to line 20 */ /* This should extend only to line 20 */ /* This should extend only to line 20 */ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); })(); diff --git a/test/cases/infinite wave detection/infiniteMutator.cjs b/test/cases/infinite wave detection/infiniteMutator.cjs new file mode 100644 index 000000000..595b867d8 --- /dev/null +++ b/test/cases/infinite wave detection/infiniteMutator.cjs @@ -0,0 +1,11 @@ +module.exports.fileMutator = () => { + return [ + { + insertion: "/* This should extend only to line 20 */\n", + range: { + begin: 0, + }, + type: "text-insert", + }, + ]; +}; diff --git a/test/cases/infinite wave detection/infiniteMutator.js b/test/cases/infinite wave detection/infiniteMutator.js deleted file mode 100644 index c06e4ee3d..000000000 --- a/test/cases/infinite wave detection/infiniteMutator.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports.fileMutator = () => { - return [ - { - insertion: "/* This should extend only to line 20 */\n", - range: { - begin: 0, - }, - type: "text-insert", - }, - ]; -}; diff --git a/test/cases/infinite wave detection/original.ts b/test/cases/infinite wave detection/original.ts index 91d812e1d..cbd9896a8 100644 --- a/test/cases/infinite wave detection/original.ts +++ b/test/cases/infinite wave detection/original.ts @@ -1,3 +1,3 @@ -(function() { - console.log("Hello, world!"); +(function () { + console.log("Hello, world!"); })(); diff --git a/test/cases/infinite wave detection/tsconfig.json b/test/cases/infinite wave detection/tsconfig.json index 666d46256..5ee1dbd15 100644 --- a/test/cases/infinite wave detection/tsconfig.json +++ b/test/cases/infinite wave detection/tsconfig.json @@ -1,3 +1,3 @@ { - "include": ["actual.ts"] + "include": ["actual.ts"] } diff --git a/test/cases/infinite wave detection/typestat.json b/test/cases/infinite wave detection/typestat.json index 287ef0c59..dfe7867a0 100644 --- a/test/cases/infinite wave detection/typestat.json +++ b/test/cases/infinite wave detection/typestat.json @@ -1,3 +1,3 @@ { - "mutators": ["./infiniteMutator.js"] + "mutators": ["./infiniteMutator.cjs"] } diff --git a/test/cases/post processing/expected.ts b/test/cases/post processing/expected.ts index 3df85f232..dec736c80 100644 --- a/test/cases/post processing/expected.ts +++ b/test/cases/post processing/expected.ts @@ -1,7 +1,7 @@ // Processed! -(function() { - let missingNumber: string | number = "initial"; +(function () { + let missingNumber: string | number = "initial"; - missingNumber = 7; + missingNumber = 7; })(); diff --git a/test/cases/post processing/original.ts b/test/cases/post processing/original.ts index 5c5f32962..90d7d60c8 100644 --- a/test/cases/post processing/original.ts +++ b/test/cases/post processing/original.ts @@ -1,5 +1,5 @@ -(function() { - let missingNumber: string = "initial"; +(function () { + let missingNumber: string = "initial"; - missingNumber = 7; + missingNumber = 7; })(); diff --git a/test/cases/post processing/postProcess.cjs b/test/cases/post processing/postProcess.cjs new file mode 100644 index 000000000..b1e9fe315 --- /dev/null +++ b/test/cases/post processing/postProcess.cjs @@ -0,0 +1,13 @@ +const fs = require("node:fs/promises"); +const { EOL } = require("os"); + +const writeToFiles = async () => { + for (const filePath of process.argv.slice(2)) { + await fs.writeFile( + filePath, + ["// Processed!", await fs.readFile(filePath)].join(EOL.repeat(2)), + ); + } +}; + +writeToFiles(); diff --git a/test/cases/post processing/postProcess.js b/test/cases/post processing/postProcess.js deleted file mode 100644 index ad654164d..000000000 --- a/test/cases/post processing/postProcess.js +++ /dev/null @@ -1,10 +0,0 @@ -const fs = require("mz/fs"); -const { EOL } = require("os"); - -const writeToFiles = async () => { - for (const filePath of process.argv.slice(2)) { - await fs.writeFile(filePath, ["// Processed!", await fs.readFile(filePath)].join(EOL.repeat(2))); - } -}; - -writeToFiles(); diff --git a/test/cases/post processing/tsconfig.json b/test/cases/post processing/tsconfig.json index 666d46256..5ee1dbd15 100644 --- a/test/cases/post processing/tsconfig.json +++ b/test/cases/post processing/tsconfig.json @@ -1,3 +1,3 @@ { - "include": ["actual.ts"] + "include": ["actual.ts"] } diff --git a/test/cases/post processing/typestat.json b/test/cases/post processing/typestat.json index 8bcfa2302..3800881cd 100644 --- a/test/cases/post processing/typestat.json +++ b/test/cases/post processing/typestat.json @@ -1,8 +1,8 @@ { - "fixes": { - "incompleteTypes": true - }, - "postProcess": { - "shell": [["node", "./postProcess.js"]] - } + "fixes": { + "incompleteTypes": true + }, + "postProcess": { + "shell": [["node", "./postProcess.cjs"]] + } } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index c21d15ba0..3e219c8f9 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -1,4 +1 @@ -{ - "extends": "./tsconfig.json", - "include": ["src/**/*.ts", "./*.js", "./.*.js"] -} +{ "extends": "./tsconfig.json", "include": ["."] } diff --git a/tsconfig.json b/tsconfig.json index cbce7fd35..f0eaf1a8a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,20 +1,17 @@ { - "compilerOptions": { - "esModuleInterop": true, - "lib": ["es2020"], - "module": "commonjs", - "moduleResolution": "node", - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "pretty": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true, - "target": "es2020" - }, - "exclude": ["test/**/*.ts"], - "include": ["src"] + "compilerOptions": { + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "module": "NodeNext", + "moduleResolution": "NodeNext", + "noEmit": true, + "outDir": "lib", + "resolveJsonModule": true, + "skipLibCheck": true, + "sourceMap": true, + "strict": true, + "target": "ES2022" + }, + "include": ["src"] } diff --git a/tsup.config.ts b/tsup.config.ts new file mode 100644 index 000000000..43c6f24e0 --- /dev/null +++ b/tsup.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from "tsup"; + +export default defineConfig({ + bundle: false, + clean: true, + dts: true, + entry: ["src/**/*.ts", "!src/**/*.test.*"], + format: "esm", + outDir: "lib", + sourcemap: true, +}); diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 000000000..36fbb0321 --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + test: { + clearMocks: true, + coverage: { + all: true, + exclude: ["lib"], + include: ["src"], + reporter: ["html", "lcov"], + }, + exclude: ["lib", "node_modules"], + setupFiles: ["console-fail-test/setup"], + }, +}); diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 8d2545c37..000000000 --- a/yarn.lock +++ /dev/null @@ -1,5870 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - -"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== - dependencies: - "@babel/highlight" "^7.12.13" - -"@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" - integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== - dependencies: - "@babel/highlight" "^7.22.13" - chalk "^2.4.2" - -"@babel/code-frame@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" - integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== - dependencies: - "@babel/highlight" "^7.22.5" - -"@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== - dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" - -"@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" - integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== - -"@babel/compat-data@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.6.tgz#15606a20341de59ba02cd2fcc5086fcbe73bf544" - integrity sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg== - -"@babel/compat-data@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" - integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== - -"@babel/compat-data@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11" - integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ== - -"@babel/compat-data@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== - -"@babel/core@7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7" - integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.5" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.5" - "@babel/parser" "^7.23.5" - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.5" - "@babel/types" "^7.23.5" - convert-source-map "^2.0.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.3" - semver "^6.3.1" - -"@babel/core@^7.11.6": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" - integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.7" - "@babel/helpers" "^7.20.7" - "@babel/parser" "^7.20.7" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/core@^7.12.3": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113" - integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.0" - "@babel/helper-module-transforms" "^7.20.2" - "@babel/helpers" "^7.20.5" - "@babel/parser" "^7.20.5" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/generator@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95" - integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA== - dependencies: - "@babel/types" "^7.20.5" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" - integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== - dependencies: - "@babel/types" "^7.20.7" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/generator@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" - integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== - dependencies: - "@babel/types" "^7.23.5" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.7.2": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz" - integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== - dependencies: - "@babel/types" "^7.14.5" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956" - integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw== - dependencies: - "@babel/types" "^7.22.15" - -"@babel/helper-compilation-targets@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" - integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== - dependencies: - "@babel/compat-data" "^7.20.0" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== - dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - lru-cache "^5.1.1" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" - integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== - dependencies: - "@babel/compat-data" "^7.22.9" - "@babel/helper-validator-option" "^7.22.15" - browserslist "^4.21.9" - lru-cache "^5.1.1" - semver "^6.3.1" - -"@babel/helper-compilation-targets@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz#e30d61abe9480aa5a83232eb31c111be922d2e52" - integrity sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA== - dependencies: - "@babel/compat-data" "^7.22.6" - "@babel/helper-validator-option" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" - browserslist "^4.21.9" - lru-cache "^5.1.1" - -"@babel/helper-create-class-features-plugin@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4" - integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.15" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - semver "^6.3.1" - -"@babel/helper-create-regexp-features-plugin@^7.18.6": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca" - integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.2.1" - -"@babel/helper-create-regexp-features-plugin@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1" - integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - regexpu-core "^5.3.1" - semver "^6.3.1" - -"@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" - integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - regexpu-core "^5.3.1" - semver "^6.3.0" - -"@babel/helper-define-polyfill-provider@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba" - integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug== - dependencies: - "@babel/helper-compilation-targets" "^7.22.6" - "@babel/helper-plugin-utils" "^7.22.5" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-environment-visitor@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" - integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== - -"@babel/helper-environment-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" - integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== - -"@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" - integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== - dependencies: - "@babel/template" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-function-name@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" - integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== - dependencies: - "@babel/template" "^7.22.15" - "@babel/types" "^7.23.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-member-expression-to-functions@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz#b95a144896f6d491ca7863576f820f3628818621" - integrity sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA== - dependencies: - "@babel/types" "^7.22.15" - -"@babel/helper-member-expression-to-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" - integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== - dependencies: - "@babel/types" "^7.22.15" - -"@babel/helper-module-transforms@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" - integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.1" - "@babel/types" "^7.20.2" - -"@babel/helper-module-transforms@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" - integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" - -"@babel/helper-optimise-call-expression@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" - integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== - -"@babel/helper-plugin-utils@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== - -"@babel/helper-remap-async-to-generator@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0" - integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-wrap-function" "^7.22.20" - -"@babel/helper-replace-supers@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793" - integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-member-expression-to-functions" "^7.22.15" - "@babel/helper-optimise-call-expression" "^7.22.5" - -"@babel/helper-replace-supers@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779" - integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== - dependencies: - "@babel/types" "^7.20.2" - -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" - integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== - dependencies: - "@babel/types" "^7.20.0" - -"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" - integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== - -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== - -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz" - integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-identifier@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" - integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== - -"@babel/helper-validator-identifier@^7.22.19": - version "7.22.19" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz#2f34ab1e445f5b95e2e6edfe50ea2449e610583a" - integrity sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg== - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-identifier@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" - integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-validator-option@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" - integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== - -"@babel/helper-validator-option@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" - integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== - -"@babel/helper-validator-option@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" - integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== - -"@babel/helper-wrap-function@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" - integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw== - dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.15" - "@babel/types" "^7.22.19" - -"@babel/helpers@^7.20.5": - version "7.20.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763" - integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" - -"@babel/helpers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" - integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/helpers@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e" - integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg== - dependencies: - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.5" - "@babel/types" "^7.23.5" - -"@babel/highlight@^7.12.13": - version "7.13.10" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz" - integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" - integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/highlight@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" - integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13": - version "7.13.15" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz" - integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ== - -"@babel/parser@^7.14.7": - version "7.14.7" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz" - integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== - -"@babel/parser@^7.18.10", "@babel/parser@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8" - integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA== - -"@babel/parser@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" - integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== - -"@babel/parser@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.15.tgz#d34592bfe288a32e741aa0663dbc4829fcd55160" - integrity sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA== - -"@babel/parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" - integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== - -"@babel/parser@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" - integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a" - integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d" - integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-transform-optional-chaining" "^7.23.3" - -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098" - integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-proposal-nullish-coalescing-operator@7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" - integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2": - version "7.21.0-placeholder-for-preset-env.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" - integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-import-assertions@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc" - integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-syntax-import-attributes@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06" - integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" - integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-syntax-jsx@^7.7.2": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.4" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-typescript@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f" - integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz" - integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-unicode-sets-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357" - integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-arrow-functions@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b" - integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-async-generator-functions@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a" - integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.20" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-transform-async-to-generator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa" - integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw== - dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.20" - -"@babel/plugin-transform-block-scoped-functions@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77" - integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-block-scoping@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" - integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-class-properties@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48" - integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-class-static-block@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5" - integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-transform-classes@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2" - integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" - "@babel/helper-split-export-declaration" "^7.22.6" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474" - integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/template" "^7.22.15" - -"@babel/plugin-transform-destructuring@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311" - integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-dotall-regex@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50" - integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-duplicate-keys@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce" - integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-dynamic-import@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143" - integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-transform-exponentiation-operator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18" - integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-export-namespace-from@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191" - integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-transform-for-of@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz#afe115ff0fbce735e02868d41489093c63e15559" - integrity sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-function-name@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc" - integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw== - dependencies: - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-json-strings@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d" - integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-transform-literals@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4" - integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-logical-assignment-operators@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5" - integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-transform-member-expression-literals@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc" - integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-modules-amd@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d" - integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw== - dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-modules-commonjs@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4" - integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA== - dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" - -"@babel/plugin-transform-modules-systemjs@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81" - integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ== - dependencies: - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.20" - -"@babel/plugin-transform-modules-umd@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9" - integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg== - dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" - integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-new-target@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980" - integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e" - integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-transform-numeric-separator@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29" - integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-transform-object-rest-spread@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83" - integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g== - dependencies: - "@babel/compat-data" "^7.23.3" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.23.3" - -"@babel/plugin-transform-object-super@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd" - integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" - -"@babel/plugin-transform-optional-catch-binding@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017" - integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-transform-optional-chaining@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz#92fc83f54aa3adc34288933fa27e54c13113f4be" - integrity sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-transform-optional-chaining@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017" - integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-transform-parameters@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af" - integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-private-methods@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4" - integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-private-property-in-object@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5" - integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-transform-property-literals@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875" - integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-regenerator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c" - integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - regenerator-transform "^0.15.2" - -"@babel/plugin-transform-reserved-words@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8" - integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-shorthand-properties@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210" - integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-spread@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c" - integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - -"@babel/plugin-transform-sticky-regex@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04" - integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-template-literals@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07" - integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-typeof-symbol@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4" - integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-typescript@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.3.tgz#ce806e6cb485d468c48c4f717696719678ab0138" - integrity sha512-ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-typescript" "^7.23.3" - -"@babel/plugin-transform-unicode-escapes@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925" - integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-unicode-property-regex@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad" - integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-unicode-regex@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc" - integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-unicode-sets-regex@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e" - integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/preset-env@7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.5.tgz#350a3aedfa9f119ad045b068886457e895ba0ca1" - integrity sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A== - dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3" - "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.23.3" - "@babel/plugin-syntax-import-attributes" "^7.23.3" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.4" - "@babel/plugin-transform-async-to-generator" "^7.23.3" - "@babel/plugin-transform-block-scoped-functions" "^7.23.3" - "@babel/plugin-transform-block-scoping" "^7.23.4" - "@babel/plugin-transform-class-properties" "^7.23.3" - "@babel/plugin-transform-class-static-block" "^7.23.4" - "@babel/plugin-transform-classes" "^7.23.5" - "@babel/plugin-transform-computed-properties" "^7.23.3" - "@babel/plugin-transform-destructuring" "^7.23.3" - "@babel/plugin-transform-dotall-regex" "^7.23.3" - "@babel/plugin-transform-duplicate-keys" "^7.23.3" - "@babel/plugin-transform-dynamic-import" "^7.23.4" - "@babel/plugin-transform-exponentiation-operator" "^7.23.3" - "@babel/plugin-transform-export-namespace-from" "^7.23.4" - "@babel/plugin-transform-for-of" "^7.23.3" - "@babel/plugin-transform-function-name" "^7.23.3" - "@babel/plugin-transform-json-strings" "^7.23.4" - "@babel/plugin-transform-literals" "^7.23.3" - "@babel/plugin-transform-logical-assignment-operators" "^7.23.4" - "@babel/plugin-transform-member-expression-literals" "^7.23.3" - "@babel/plugin-transform-modules-amd" "^7.23.3" - "@babel/plugin-transform-modules-commonjs" "^7.23.3" - "@babel/plugin-transform-modules-systemjs" "^7.23.3" - "@babel/plugin-transform-modules-umd" "^7.23.3" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.23.3" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4" - "@babel/plugin-transform-numeric-separator" "^7.23.4" - "@babel/plugin-transform-object-rest-spread" "^7.23.4" - "@babel/plugin-transform-object-super" "^7.23.3" - "@babel/plugin-transform-optional-catch-binding" "^7.23.4" - "@babel/plugin-transform-optional-chaining" "^7.23.4" - "@babel/plugin-transform-parameters" "^7.23.3" - "@babel/plugin-transform-private-methods" "^7.23.3" - "@babel/plugin-transform-private-property-in-object" "^7.23.4" - "@babel/plugin-transform-property-literals" "^7.23.3" - "@babel/plugin-transform-regenerator" "^7.23.3" - "@babel/plugin-transform-reserved-words" "^7.23.3" - "@babel/plugin-transform-shorthand-properties" "^7.23.3" - "@babel/plugin-transform-spread" "^7.23.3" - "@babel/plugin-transform-sticky-regex" "^7.23.3" - "@babel/plugin-transform-template-literals" "^7.23.3" - "@babel/plugin-transform-typeof-symbol" "^7.23.3" - "@babel/plugin-transform-unicode-escapes" "^7.23.3" - "@babel/plugin-transform-unicode-property-regex" "^7.23.3" - "@babel/plugin-transform-unicode-regex" "^7.23.3" - "@babel/plugin-transform-unicode-sets-regex" "^7.23.3" - "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" - core-js-compat "^3.31.0" - semver "^6.3.1" - -"@babel/preset-modules@0.1.6-no-external-plugins": - version "0.1.6-no-external-plugins" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a" - integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - -"@babel/preset-typescript@7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913" - integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-syntax-jsx" "^7.23.3" - "@babel/plugin-transform-modules-commonjs" "^7.23.3" - "@babel/plugin-transform-typescript" "^7.23.3" - -"@babel/regjsgen@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" - integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== - -"@babel/runtime@^7.8.4": - version "7.13.10" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz" - integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/template@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" - -"@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/template@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== - dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" - -"@babel/template@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" - integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== - dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133" - integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.5" - "@babel/types" "^7.20.5" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz#114f992fa989a390896ea72db5220780edab509c" - integrity sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec" - integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.5" - "@babel/types" "^7.23.5" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.13.14" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz" - integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.14.5": - version "7.14.5" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz" - integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - to-fast-properties "^2.0.0" - -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" - integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282" - integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.15" - to-fast-properties "^2.0.0" - -"@babel/types@^7.22.19": - version "7.22.19" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684" - integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" - integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" - to-fast-properties "^2.0.0" - -"@babel/types@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" - integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - -"@babel/types@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" - integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== - dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== - -"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.5.1": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== - -"@eslint-community/regexpp@^4.6.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005" - integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg== - -"@eslint/eslintrc@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" - integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.6.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@eslint/js@8.55.0": - version "8.55.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6" - integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA== - -"@humanwhocodes/config-array@^0.11.13": - version "0.11.13" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== - dependencies: - "@humanwhocodes/object-schema" "^2.0.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== - -"@isaacs/cliui@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" - integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== - dependencies: - string-width "^5.1.2" - string-width-cjs "npm:string-width@^4.2.0" - strip-ansi "^7.0.1" - strip-ansi-cjs "npm:strip-ansi@^6.0.1" - wrap-ansi "^8.1.0" - wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" - -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz" - integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - get-package-type "^0.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.3" - resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== - -"@jest/console@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc" - integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - slash "^3.0.0" - -"@jest/core@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f" - integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg== - dependencies: - "@jest/console" "^29.7.0" - "@jest/reporters" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - ci-info "^3.2.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-changed-files "^29.7.0" - jest-config "^29.7.0" - jest-haste-map "^29.7.0" - jest-message-util "^29.7.0" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-resolve-dependencies "^29.7.0" - jest-runner "^29.7.0" - jest-runtime "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - jest-watcher "^29.7.0" - micromatch "^4.0.4" - pretty-format "^29.7.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7" - integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw== - dependencies: - "@jest/fake-timers" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-mock "^29.7.0" - -"@jest/expect-utils@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6" - integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g== - dependencies: - jest-get-type "^29.2.0" - -"@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/expect@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2" - integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ== - dependencies: - expect "^29.7.0" - jest-snapshot "^29.7.0" - -"@jest/fake-timers@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565" - integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ== - dependencies: - "@jest/types" "^29.6.3" - "@sinonjs/fake-timers" "^10.0.2" - "@types/node" "*" - jest-message-util "^29.7.0" - jest-mock "^29.7.0" - jest-util "^29.7.0" - -"@jest/globals@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d" - integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/expect" "^29.7.0" - "@jest/types" "^29.6.3" - jest-mock "^29.7.0" - -"@jest/reporters@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7" - integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@jridgewell/trace-mapping" "^0.3.18" - "@types/node" "*" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^6.0.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.1.3" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - jest-worker "^29.7.0" - slash "^3.0.0" - string-length "^4.0.1" - strip-ansi "^6.0.0" - v8-to-istanbul "^9.0.1" - -"@jest/schemas@^29.0.0": - version "29.0.0" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" - integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== - dependencies: - "@sinclair/typebox" "^0.24.1" - -"@jest/schemas@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03" - integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA== - dependencies: - "@sinclair/typebox" "^0.27.8" - -"@jest/source-map@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4" - integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw== - dependencies: - "@jridgewell/trace-mapping" "^0.3.18" - callsites "^3.0.0" - graceful-fs "^4.2.9" - -"@jest/test-result@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c" - integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA== - dependencies: - "@jest/console" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce" - integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw== - dependencies: - "@jest/test-result" "^29.7.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - slash "^3.0.0" - -"@jest/transform@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c" - integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^29.6.3" - "@jridgewell/trace-mapping" "^0.3.18" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^2.0.0" - fast-json-stable-stringify "^2.1.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-regex-util "^29.6.3" - jest-util "^29.7.0" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - write-file-atomic "^4.0.2" - -"@jest/types@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3" - integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@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/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@jridgewell/trace-mapping@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" - integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@nicolo-ribaudo/semver-v6@^6.3.3": - version "6.3.3" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz#ea6d23ade78a325f7a52750aab1526b02b628c29" - integrity sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg== - -"@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", "@nodelib/fs.walk@^1.2.8": - 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" - -"@phenomnomnominal/tsquery@^6.0.0": - version "6.1.3" - resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-6.1.3.tgz#5e819403da2fa6a64b009f1876278fb105ec6b55" - integrity sha512-CEqpJ872StsxRmwv9ePCZ4BCisrJSlREUC5XxIRYxhvODt4aQoJFFmjTgaP6meyKiiXxxN/VWPZ58j4yHXRkmw== - dependencies: - "@types/esquery" "^1.5.0" - esquery "^1.5.0" - -"@pkgjs/parseargs@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" - integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== - -"@sinclair/typebox@^0.24.1": - version "0.24.51" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" - integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== - -"@sinclair/typebox@^0.27.8": - version "0.27.8" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" - integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== - -"@sinonjs/commons@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" - integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^10.0.2": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c" - integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw== - dependencies: - "@sinonjs/commons" "^2.0.0" - -"@types/babel__core@^7.1.14": - version "7.1.14" - resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz" - integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.4.0" - resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.11.1" - resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz" - integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== - dependencies: - "@babel/types" "^7.3.0" - -"@types/esquery@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@types/esquery/-/esquery-1.5.0.tgz#928ccc6e61786dcd7c0759c06b803589855dd75a" - integrity sha512-MNQ5gCt3j1idWHlj/dEF+WPS1kl6Woe0Agzwy96JvrwDQdDadqeIBhY7mUca51CCUzxf7BsnXzcyKi6ENpEtmQ== - dependencies: - "@types/estree" "*" - -"@types/estree@*": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - -"@types/glob@8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" - integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== - dependencies: - "@types/minimatch" "^5.1.2" - "@types/node" "*" - -"@types/graceful-fs@^4.1.3": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jest@29.5.11": - version "29.5.11" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.11.tgz#0c13aa0da7d0929f078ab080ae5d4ced80fa2f2c" - integrity sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ== - dependencies: - expect "^29.0.0" - pretty-format "^29.0.0" - -"@types/json-schema@^7.0.12": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== - -"@types/minimatch@^5.0.0", "@types/minimatch@^5.1.2": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - -"@types/mz@2.7.8": - version "2.7.8" - resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.8.tgz#5ac05b34f08e6225d7ad9b05e158b03d9ca9e2d4" - integrity sha512-mGLNqqwt8yu4pDw9rEphAiyWnEdok0GzOGrwi5EiTuDFxw7H3ZaEI4ASFKq4HaZtemtjQ8MkcmtWcrU4V0WkIw== - dependencies: - "@types/node" "*" - -"@types/node@*": - version "16.0.0" - resolved "https://registry.npmjs.org/@types/node/-/node-16.0.0.tgz" - integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg== - -"@types/node@20.10.3": - version "20.10.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.3.tgz#4900adcc7fc189d5af5bb41da8f543cea6962030" - integrity sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg== - dependencies: - undici-types "~5.26.4" - -"@types/prop-types@*": - version "15.7.3" - resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== - -"@types/prop-types@15.7.11": - version "15.7.11" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" - integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng== - -"@types/react@18.2.69": - version "18.2.69" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.69.tgz#313ec21891b22bb7646a54cb4bdb8cddb0880271" - integrity sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/scheduler@*": - version "0.16.1" - resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz" - integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== - -"@types/semver@^7.5.0": - version "7.5.6" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" - integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== - -"@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== - -"@types/yargs-parser@*": - version "20.2.0" - resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz" - integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== - -"@types/yargs@^17.0.8": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" - integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== - dependencies: - "@types/yargs-parser" "*" - -"@typescript-eslint/eslint-plugin@^6.4.0": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz#2e03506c5362a65e43cb132c37c9ce2d3cb51470" - integrity sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ== - dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.13.2" - "@typescript-eslint/type-utils" "6.13.2" - "@typescript-eslint/utils" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" - debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.4" - natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/parser@^6.4.0": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9" - integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg== - dependencies: - "@typescript-eslint/scope-manager" "6.13.2" - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/typescript-estree" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052" - integrity sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA== - dependencies: - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" - -"@typescript-eslint/scope-manager@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz#6b3c22187976e2bf5ed0dc0d9095f1f2cbd1d106" - integrity sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA== - dependencies: - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - -"@typescript-eslint/type-utils@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102" - integrity sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw== - dependencies: - "@typescript-eslint/typescript-estree" "6.13.2" - "@typescript-eslint/utils" "6.13.2" - debug "^4.3.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/types@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6" - integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg== - -"@typescript-eslint/types@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.0.tgz#8de8ba9cafadc38e89003fe303e219c9250089ae" - integrity sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q== - -"@typescript-eslint/typescript-estree@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258" - integrity sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w== - dependencies: - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/visitor-keys" "6.13.2" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/typescript-estree@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz#20ce2801733bd46f02cc0f141f5b63fbbf2afb63" - integrity sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ== - dependencies: - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/utils@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89" - integrity sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.13.2" - "@typescript-eslint/types" "6.13.2" - "@typescript-eslint/typescript-estree" "6.13.2" - semver "^7.5.4" - -"@typescript-eslint/utils@^6.0.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.0.tgz#61b6f1f1b82ad529abfcee074d21764e880886fb" - integrity sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.7.0" - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/typescript-estree" "6.7.0" - semver "^7.5.4" - -"@typescript-eslint/visitor-keys@6.13.2": - version "6.13.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c" - integrity sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw== - dependencies: - "@typescript-eslint/types" "6.13.2" - eslint-visitor-keys "^3.4.1" - -"@typescript-eslint/visitor-keys@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz#34140ac76dfb6316d17012e4469acf3366ad3f44" - integrity sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ== - dependencies: - "@typescript-eslint/types" "6.7.0" - eslint-visitor-keys "^3.4.1" - -"@ungap/structured-clone@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" - integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^8.9.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" - integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== - -ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-colors@^4.1.1: - version "4.1.3" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" - integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== - -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-escapes@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" - integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== - dependencies: - type-fest "^1.0.2" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - -ansi-styles@^6.0.0, ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - -anymatch@^3.0.3, anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -automutate-tests@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/automutate-tests/-/automutate-tests-0.5.0.tgz" - integrity sha512-MqYx7tloN0HhwE/1uaow81ld8URhm9UJ6j6SIlFTLLqDjtj3qAL0FfeFsfz4yidrxGIvSX5RNMs8NwZ63RtJJg== - dependencies: - automutate "^0.9.0" - chai "^4.2.0" - chalk "^2.4.2" - glob "^7.1.3" - mz "^2.7.0" - -automutate@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/automutate/-/automutate-0.9.0.tgz" - integrity sha512-A1AydgfyQCGAihiu3NciBtRAbVw0HPHfwz7wRow3rYRSpT3BrTGSWX7vFJlXjbF1On3hKfzsa4ZWsAcAnAgTVg== - -babel-jest@29.7.0, babel-jest@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5" - integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg== - dependencies: - "@jest/transform" "^29.7.0" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.6.3" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-plugin-istanbul@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626" - integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.1.14" - "@types/babel__traverse" "^7.0.6" - -babel-plugin-polyfill-corejs2@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" - integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q== - dependencies: - "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.4.3" - semver "^6.3.1" - -babel-plugin-polyfill-corejs3@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1" - integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" - core-js-compat "^3.32.2" - -babel-plugin-polyfill-regenerator@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5" - integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" - -babel-preset-current-node-syntax@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" - -babel-preset-jest@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c" - integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA== - dependencies: - babel-plugin-jest-hoist "^29.6.3" - babel-preset-current-node-syntax "^1.0.0" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -browserslist@^4.21.3: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== - dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" - -browserslist@^4.21.5: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== - dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" - -browserslist@^4.21.9: - version "4.21.9" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" - integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== - dependencies: - caniuse-lite "^1.0.30001503" - electron-to-chromium "^1.4.431" - node-releases "^2.0.12" - update-browserslist-db "^1.0.11" - -browserslist@^4.22.1: - version "4.22.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" - integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== - dependencies: - caniuse-lite "^1.0.30001541" - electron-to-chromium "^1.4.535" - node-releases "^2.0.13" - update-browserslist-db "^1.0.13" - -bser@2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz" - integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== - dependencies: - node-int64 "^0.4.0" - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== - -builtin-modules@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.0.0, camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caniuse-lite@^1.0.30001400: - version "1.0.30001439" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb" - integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A== - -caniuse-lite@^1.0.30001449: - version "1.0.30001489" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001489.tgz#ca82ee2d4e4dbf2bd2589c9360d3fcc2c7ba3bd8" - integrity sha512-x1mgZEXK8jHIfAxm+xgdpHpk50IN3z3q3zP261/WS+uvePxW8izXuCu6AHz0lkuYTlATDehiZ/tNyYBdSQsOUQ== - -caniuse-lite@^1.0.30001503: - version "1.0.30001512" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz#7450843fb581c39f290305a83523c7a9ef0d4cb4" - integrity sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw== - -caniuse-lite@^1.0.30001541: - version "1.0.30001547" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b" - integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA== - -chai@4.3.10: - version "4.3.10" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384" - integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.3" - deep-eql "^4.1.3" - get-func-name "^2.0.2" - loupe "^2.3.6" - pathval "^1.1.1" - type-detect "^4.0.8" - -chai@^4.2.0: - version "4.3.4" - resolved "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz" - integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - pathval "^1.1.1" - type-detect "^4.0.5" - -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@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -char-regex@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - -check-error@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694" - integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg== - dependencies: - get-func-name "^2.0.2" - -chokidar@3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -ci-info@^3.2.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" - integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== - -cjs-module-lexer@^1.0.0: - version "1.2.1" - resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz" - integrity sha512-jVamGdJPDeuQilKhvVn1h3knuMOZzr8QDnpk+M9aMlCaMkTDd6fBWPhiDqFvFZ07pL0liqabAiuy8SY4jGHeaw== - -cli-cursor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" - integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== - dependencies: - restore-cursor "^4.0.0" - -cli-truncate@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" - integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== - dependencies: - slice-ansi "^5.0.0" - string-width "^5.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz" - integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colorette@^2.0.20: - version "2.0.20" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" - integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== - -commander@11.0.0, commander@~11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67" - integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ== - -commander@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" - integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" - -convert-source-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" - integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== - -core-js-compat@^3.31.0: - version "3.31.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" - integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw== - dependencies: - browserslist "^4.21.5" - -core-js-compat@^3.32.2: - version "3.33.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966" - integrity sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw== - dependencies: - browserslist "^4.22.1" - -create-jest@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320" - integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q== - dependencies: - "@jest/types" "^29.6.3" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-config "^29.7.0" - jest-util "^29.7.0" - prompts "^2.0.1" - -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -csstype@^3.0.2: - version "3.0.7" - resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz" - integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g== - -debug@4.3.4, debug@^4.3.2, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -dedent@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.2.0.tgz#32039cd75c035f684e01c4a07cb88c0ecbeb57be" - integrity sha512-i4tcg0ClgvMUSxwHpt+NHQ01ZJmAkl6eBvDNrSZG9e+oLRTCSHv0wpr/Bzjpf6CwKeIHGevE1M34Y1Axdms5VQ== - -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - -deep-eql@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" - integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== - dependencies: - type-detect "^4.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - -diff-sequences@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" - integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== - -diff-sequences@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" - integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -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" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -electron-to-chromium@^1.4.284: - version "1.4.411" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.411.tgz#8cb7787f0442fcb4209590e9951bdb482caa93b2" - integrity sha512-5VXLW4Qw89vM2WTICHua/y8v7fKGDRVa2VPOtBB9IpLvW316B+xd8yD1wTmLPY2ot/00P/qt87xdolj4aG/Lzg== - -electron-to-chromium@^1.4.431: - version "1.4.449" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.449.tgz#79ffe4514c81c35d4eb13030a63ff3383a8cc655" - integrity sha512-TxLRpRUj/107ATefeP8VIUWNOv90xJxZZbCW/eIbSZQiuiFANCx2b7u+GbVc9X4gU+xnbvypNMYVM/WArE1DNQ== - -electron-to-chromium@^1.4.535: - version "1.4.551" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.551.tgz#14db6660a88f66ce095ea2657abe5653bc7f42ed" - integrity sha512-/Ng/W/kFv7wdEHYzxdK7Cv0BHEGSkSB3M0Ssl8Ndr1eMiYeas/+Mv4cNaDqamqWx6nd2uQZfPz6g25z25M/sdw== - -emittery@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" - integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -enquirer@^2.3.6: - version "2.4.1" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" - integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ== - dependencies: - ansi-colors "^4.1.1" - strip-ansi "^6.0.1" - -entities@~1.1.1: - version "1.1.2" - resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - -entities@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.2" - is-callable "^1.2.3" - is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.0" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -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-plugin-deprecation@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-2.0.0.tgz#9804707a4c19f3a53615c6babc0ced3d429d69cf" - integrity sha512-OAm9Ohzbj11/ZFyICyR5N6LbOIvQMp7ZU2zI7Ej0jIc8kiGUERXPNMfw2QqqHD1ZHtjMub3yPZILovYEYucgoQ== - dependencies: - "@typescript-eslint/utils" "^6.0.0" - tslib "^2.3.1" - tsutils "^3.21.0" - -eslint-plugin-no-only-tests@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-3.1.0.tgz#f38e4935c6c6c4842bf158b64aaa20c366fe171b" - integrity sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw== - -eslint-scope@^7.2.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" - integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: - version "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@8.55.0: - version "8.55.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8" - integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.55.0" - "@humanwhocodes/config-array" "^0.11.13" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - "@ungap/structured-clone" "^1.2.0" - ajv "^6.12.4" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.2.2" - eslint-visitor-keys "^3.4.3" - espree "^9.6.1" - esquery "^1.4.2" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - graphemer "^1.4.0" - ignore "^5.2.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" - -espree@^9.6.0, espree@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" - integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== - dependencies: - acorn "^8.9.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.1" - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.2, esquery@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^5.1.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -eventemitter3@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" - integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== - -execa@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9" - integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.1" - human-signals "^4.3.0" - is-stream "^3.0.0" - merge-stream "^2.0.0" - npm-run-path "^5.1.0" - onetime "^6.0.0" - signal-exit "^3.0.7" - strip-final-newline "^3.0.0" - -execa@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expect@^29.0.0: - version "29.3.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6" - integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA== - dependencies: - "@jest/expect-utils" "^29.3.1" - jest-get-type "^29.2.0" - jest-matcher-utils "^29.3.1" - jest-message-util "^29.3.1" - jest-util "^29.3.1" - -expect@^29.7.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" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.2.9: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== - 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.4" - -fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6: - version "2.0.6" - resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== - dependencies: - reusify "^1.0.4" - -fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== - dependencies: - bser "2.1.1" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@5.0.0, find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== - -foreground-child@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" - integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== - dependencies: - cross-spawn "^7.0.0" - signal-exit "^4.0.1" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@^2.3.2, fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - -get-func-name@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" - integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-package-type@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz" - integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== - -get-stdin@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575" - integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA== - -get-stream@^6.0.0, get-stream@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -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== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^10.0.0: - version "10.3.10" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" - integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.3.5" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - -glob@^7.1.3, glob@^7.1.4: - version "7.1.7" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~10.3.4: - version "10.3.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.4.tgz#c85c9c7ab98669102b6defda76d35c5b1ef9766f" - integrity sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.0.3" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.19.0: - version "13.21.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" - integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== - dependencies: - type-fest "^0.20.2" - -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" - -graceful-fs@^4.1.2: - version "4.2.6" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== - -graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -graphemer@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" - integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== - -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -he@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -human-signals@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.0.tgz#2095c3cd5afae40049403d4b811235b03879db50" - integrity sha512-zyzVyMjpGBX2+6cDVZeFPCdtOtdsxOeseRhB9tkQ6xXmGUNrcnBzdEKPy3VPNYz+4gy1oukVOXcrJCunSyc6QQ== - -husky@8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" - integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== - -ignore@^5.2.0, ignore@^5.2.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== - -ignore@~5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - -import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1" - integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== - dependencies: - call-bind "^1.0.0" - -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== - -is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== - dependencies: - has "^1.0.3" - -is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-fullwidth-code-point@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" - integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== - -is-generator-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz" - integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== - -is-glob@^4.0.0, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.1, is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== - -is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== - dependencies: - call-bind "^1.0.2" - has-symbols "^1.0.1" - -is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - -is-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" - integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== - -is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== - dependencies: - has-symbols "^1.0.1" - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - -istanbul-lib-coverage@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" - integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== - -istanbul-lib-instrument@^5.0.4: - version "5.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" - integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - -istanbul-lib-instrument@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz#7a8af094cbfff1d5bb280f62ce043695ae8dd5b8" - integrity sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^7.5.4" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" - integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - -jackspeak@^2.0.3: - version "2.1.1" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd" - integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw== - dependencies: - cliui "^8.0.1" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - -jackspeak@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068" - integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - -jest-changed-files@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a" - integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w== - dependencies: - execa "^5.0.0" - jest-util "^29.7.0" - p-limit "^3.1.0" - -jest-circus@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a" - integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/expect" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^1.0.0" - is-generator-fn "^2.0.0" - jest-each "^29.7.0" - jest-matcher-utils "^29.7.0" - jest-message-util "^29.7.0" - jest-runtime "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - p-limit "^3.1.0" - pretty-format "^29.7.0" - pure-rand "^6.0.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-cli@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995" - integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg== - dependencies: - "@jest/core" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - chalk "^4.0.0" - create-jest "^29.7.0" - exit "^0.1.2" - import-local "^3.0.2" - jest-config "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - yargs "^17.3.1" - -jest-config@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f" - integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ== - dependencies: - "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^29.7.0" - "@jest/types" "^29.6.3" - babel-jest "^29.7.0" - chalk "^4.0.0" - ci-info "^3.2.0" - deepmerge "^4.2.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-circus "^29.7.0" - jest-environment-node "^29.7.0" - jest-get-type "^29.6.3" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-runner "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - micromatch "^4.0.4" - parse-json "^5.2.0" - pretty-format "^29.7.0" - slash "^3.0.0" - strip-json-comments "^3.1.1" - -jest-diff@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527" - integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.3.1" - jest-get-type "^29.2.0" - pretty-format "^29.3.1" - -jest-diff@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a" - integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.6.3" - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-docblock@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a" - integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g== - dependencies: - detect-newline "^3.0.0" - -jest-each@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1" - integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ== - dependencies: - "@jest/types" "^29.6.3" - chalk "^4.0.0" - jest-get-type "^29.6.3" - jest-util "^29.7.0" - pretty-format "^29.7.0" - -jest-environment-node@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376" - integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/fake-timers" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-mock "^29.7.0" - jest-util "^29.7.0" - -jest-get-type@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" - integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== - -jest-get-type@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" - integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== - -jest-haste-map@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104" - integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA== - dependencies: - "@jest/types" "^29.6.3" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^29.6.3" - jest-util "^29.7.0" - jest-worker "^29.7.0" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.2" - -jest-leak-detector@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728" - integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw== - dependencies: - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-matcher-utils@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572" - integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ== - dependencies: - chalk "^4.0.0" - jest-diff "^29.3.1" - jest-get-type "^29.2.0" - pretty-format "^29.3.1" - -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.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb" - integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.3.1" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.3.1" - slash "^3.0.0" - stack-utils "^2.0.3" - -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-mock@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347" - integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-util "^29.7.0" - -jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== - -jest-regex-util@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52" - integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg== - -jest-resolve-dependencies@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428" - integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA== - dependencies: - jest-regex-util "^29.6.3" - jest-snapshot "^29.7.0" - -jest-resolve@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30" - integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA== - dependencies: - chalk "^4.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-pnp-resolver "^1.2.2" - jest-util "^29.7.0" - jest-validate "^29.7.0" - resolve "^1.20.0" - resolve.exports "^2.0.0" - slash "^3.0.0" - -jest-runner@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e" - integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ== - dependencies: - "@jest/console" "^29.7.0" - "@jest/environment" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.13.1" - graceful-fs "^4.2.9" - jest-docblock "^29.7.0" - jest-environment-node "^29.7.0" - jest-haste-map "^29.7.0" - jest-leak-detector "^29.7.0" - jest-message-util "^29.7.0" - jest-resolve "^29.7.0" - jest-runtime "^29.7.0" - jest-util "^29.7.0" - jest-watcher "^29.7.0" - jest-worker "^29.7.0" - p-limit "^3.1.0" - source-map-support "0.5.13" - -jest-runtime@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817" - integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/fake-timers" "^29.7.0" - "@jest/globals" "^29.7.0" - "@jest/source-map" "^29.6.3" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - cjs-module-lexer "^1.0.0" - collect-v8-coverage "^1.0.0" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-message-util "^29.7.0" - jest-mock "^29.7.0" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - slash "^3.0.0" - strip-bom "^4.0.0" - -jest-snapshot@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5" - integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw== - dependencies: - "@babel/core" "^7.11.6" - "@babel/generator" "^7.7.2" - "@babel/plugin-syntax-jsx" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/types" "^7.3.3" - "@jest/expect-utils" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - babel-preset-current-node-syntax "^1.0.0" - chalk "^4.0.0" - expect "^29.7.0" - graceful-fs "^4.2.9" - jest-diff "^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" - natural-compare "^1.4.0" - pretty-format "^29.7.0" - semver "^7.5.3" - -jest-util@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1" - integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ== - dependencies: - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.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" - -jest-validate@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c" - integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw== - dependencies: - "@jest/types" "^29.6.3" - camelcase "^6.2.0" - chalk "^4.0.0" - jest-get-type "^29.6.3" - leven "^3.1.0" - pretty-format "^29.7.0" - -jest-watcher@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2" - integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g== - dependencies: - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - emittery "^0.13.1" - jest-util "^29.7.0" - string-length "^4.0.1" - -jest-worker@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a" - integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw== - dependencies: - "@types/node" "*" - jest-util "^29.7.0" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest@29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613" - integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw== - dependencies: - "@jest/core" "^29.7.0" - "@jest/types" "^29.6.3" - import-local "^3.0.2" - jest-cli "^29.7.0" - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@4.1.0, js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -json5@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" - integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== - -json5@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - -jsonc-parser@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" - integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== - -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== - -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -lilconfig@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -linkify-it@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz" - integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== - dependencies: - uc.micro "^1.0.1" - -linkify-it@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" - integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== - dependencies: - uc.micro "^1.0.1" - -lint-staged@14.0.1: - version "14.0.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232" - integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw== - dependencies: - chalk "5.3.0" - commander "11.0.0" - debug "4.3.4" - execa "7.2.0" - lilconfig "2.1.0" - listr2 "6.6.1" - micromatch "4.0.5" - pidtree "0.6.0" - string-argv "0.3.2" - yaml "2.3.1" - -listr2@6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d" - integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg== - dependencies: - cli-truncate "^3.1.0" - colorette "^2.0.20" - eventemitter3 "^5.0.1" - log-update "^5.0.1" - rfdc "^1.3.0" - wrap-ansi "^8.1.0" - -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash@^4.17.19: - version "4.17.21" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log-update@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" - integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== - dependencies: - ansi-escapes "^5.0.0" - cli-cursor "^4.0.0" - slice-ansi "^5.0.0" - strip-ansi "^7.0.1" - wrap-ansi "^8.0.1" - -loupe@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" - integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== - dependencies: - get-func-name "^2.0.0" - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -"lru-cache@^9.1.1 || ^10.0.0": - version "10.0.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" - integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== - -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -makeerror@1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" - integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== - dependencies: - tmpl "1.0.5" - -markdown-it@13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430" - integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q== - dependencies: - argparse "^2.0.1" - entities "~3.0.1" - linkify-it "^4.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -markdown-it@13.0.2: - version "13.0.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536" - integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w== - dependencies: - argparse "^2.0.1" - entities "~3.0.1" - linkify-it "^4.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -markdown-it@8.4.2: - version "8.4.2" - resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz" - integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== - dependencies: - argparse "^1.0.7" - entities "~1.1.1" - linkify-it "^2.0.0" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -markdownlint-cli@0.37.0: - version "0.37.0" - resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.37.0.tgz#6b1331d0e9822627268774f6ec72e8138fcbfb1a" - integrity sha512-hNKAc0bWBBuVhJbSWbUhRzavstiB4o1jh3JeSpwC4/dt6eJ54lRfYHRxVdzVp4qGWBKbeE6Pg490PFEfrKjqSg== - dependencies: - commander "~11.0.0" - get-stdin "~9.0.0" - glob "~10.3.4" - ignore "~5.2.4" - js-yaml "^4.1.0" - jsonc-parser "~3.2.0" - markdownlint "~0.31.1" - minimatch "~9.0.3" - run-con "~1.3.2" - -markdownlint-micromark@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/markdownlint-micromark/-/markdownlint-micromark-0.1.7.tgz#c465091b30d61a56027ccbfb981c80c96448c165" - integrity sha512-BbRPTC72fl5vlSKv37v/xIENSRDYL/7X/XoFzZ740FGEbs9vZerLrIkFRY0rv7slQKxDczToYuMmqQFN61fi4Q== - -markdownlint@0.32.1: - version "0.32.1" - resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.32.1.tgz#14b3ff548e437487ae393ad5bc9092ca2858adde" - integrity sha512-3sx9xpi4xlHlokGyHO9k0g3gJbNY4DI6oNEeEYq5gQ4W7UkiJ90VDAnuDl2U+yyXOUa6BX+0gf69ZlTUGIBp6A== - dependencies: - markdown-it "13.0.2" - markdownlint-micromark "0.1.7" - -markdownlint@^0.11.0: - version "0.11.0" - resolved "https://registry.npmjs.org/markdownlint/-/markdownlint-0.11.0.tgz" - integrity sha512-wE5WdKD6zW2DQaPQ5TFBTXh5j76DnWd/IFffnDQgHmi6Y61DJXBDfLftZ/suJHuv6cwPjM6gKw2GaRLJMOR+Mg== - dependencies: - markdown-it "8.4.2" - -markdownlint@~0.31.1: - version "0.31.1" - resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.31.1.tgz#f014ed2d3614c5dbc351b7f65641ccc0a5facdb7" - integrity sha512-CKMR2hgcIBrYlIUccDCOvi966PZ0kJExDrUi1R+oF9PvqQmCrTqjOsgIvf2403OmJ+CWomuzDoylr6KbuMyvHA== - dependencies: - markdown-it "13.0.1" - markdownlint-micromark "0.1.7" - -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= - -memorystream@^0.3.1: - version "0.3.1" - resolved "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz" - integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI= - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" - 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.5, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" - integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== - -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^8.0.0: - version "8.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" - integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^9.0.1, minimatch@~9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": - version "7.0.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974" - integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg== - -mocha@10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" - integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -mz@^2.7.0: - version "2.7.0" - resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - -node-releases@^2.0.12, node-releases@^2.0.8: - version "2.0.12" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" - integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== - -node-releases@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" - integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== - -node-releases@^2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" - integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== - -normalize-package-data@^2.3.2: - version "2.5.0" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-run-all@4.1.5: - version "4.1.5" - resolved "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz" - integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ== - dependencies: - ansi-styles "^3.2.1" - chalk "^2.4.1" - cross-spawn "^6.0.5" - memorystream "^0.3.1" - minimatch "^3.0.4" - pidtree "^0.3.0" - read-pkg "^3.0.0" - shell-quote "^1.6.1" - string.prototype.padend "^3.0.0" - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npm-run-path@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" - integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== - dependencies: - path-key "^4.0.0" - -object-assign@^4.0.1: - version "4.1.1" - resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-inspect@^1.9.0: - version "1.9.0" - resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz" - integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -onetime@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" - integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== - dependencies: - mimic-fn "^4.0.0" - -optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== - dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - -parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-key@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" - integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== - -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-scurry@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== - dependencies: - lru-cache "^9.1.1 || ^10.0.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - 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@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.3" - resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz" - integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== - -picomatch@^2.2.3, 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: - version "0.6.0" - resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" - integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== - -pidtree@^0.3.0: - version "0.3.1" - resolved "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz" - integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA== - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pirates@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prettier@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" - integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== - -pretty-format@^29.0.0, pretty-format@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da" - integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg== - dependencies: - "@jest/schemas" "^29.0.0" - ansi-styles "^5.0.0" - react-is "^18.0.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== - dependencies: - "@jest/schemas" "^29.6.3" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -prompts@^2.0.1: - version "2.4.1" - resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz" - integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== - dependencies: - kleur "^3.0.3" - sisteransi "^1.0.5" - -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -pure-rand@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.0.tgz#701996ceefa253507923a0e864c17ab421c04a7c" - integrity sha512-rLSBxJjP+4DQOgcJAx6RZHT2he2pkhQdSnofG5VWyVl6GRq/K02ISOuOLcsMOrtKDIJb8JN2zm3FFzWNbezdPw== - -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== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -regenerate-unicode-properties@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" - integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== - dependencies: - regenerate "^1.4.2" - -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.4: - version "0.13.7" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== - -regenerator-transform@^0.15.2: - version "0.15.2" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" - integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg== - dependencies: - "@babel/runtime" "^7.8.4" - -regexpu-core@^5.2.1: - version "5.2.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" - integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw== - dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsgen "^0.7.1" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" - -regexpu-core@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" - integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== - dependencies: - "@babel/regjsgen" "^0.8.0" - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" - -regjsgen@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6" - integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA== - -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== - dependencies: - jsesc "~0.5.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve.exports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e" - integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg== - -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -restore-cursor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" - integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-con@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/run-con/-/run-con-1.3.2.tgz#755860a10ce326a96b509485fcea50b4d03754e8" - integrity sha512-CcfE+mYiTcKEzg0IqS08+efdnH0oJ3zV0wSUFBNrMHMuxCtXvBCLzCJHatwuXDcu/RlhjTziTo/a1ruQik6/Yg== - dependencies: - deep-extend "^0.6.0" - ini "~4.1.0" - minimist "^1.2.8" - strip-json-comments "~3.1.1" - -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" - -safe-buffer@^5.1.0: - version "5.2.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -"semver@2 || 3 || 4 || 5", semver@^5.5.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^7.5.3: - version "7.5.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" - integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== - dependencies: - lru-cache "^6.0.0" - -semver@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -sentences-per-line@0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/sentences-per-line/-/sentences-per-line-0.2.1.tgz" - integrity sha512-6hlyKBwqoaZJ5+RBTKNNem2kBGAboh9e9KfFw5KYKA+64xaTYWbv5C6XnOudx8xk1Sg6f/4yalhJtCZFSLWIsQ== - dependencies: - markdownlint "^0.11.0" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@^1.6.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - -signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -signal-exit@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" - integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== - -sisteransi@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" - integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== - dependencies: - ansi-styles "^6.0.0" - is-fullwidth-code-point "^4.0.0" - -source-map-support@0.5.13: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -stack-utils@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz" - integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== - dependencies: - escape-string-regexp "^2.0.0" - -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== - -string-length@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz" - integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== - dependencies: - char-regex "^1.0.2" - strip-ansi "^6.0.0" - -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - -string.prototype.padend@^3.0.0: - version "3.1.2" - resolved "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz" - integrity sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== - dependencies: - ansi-regex "^6.0.1" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-final-newline@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" - integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== - -strip-json-comments@3.1.1, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.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== - dependencies: - has-flag "^4.0.0" - -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.1" - resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz" - integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== - dependencies: - any-promise "^1.0.0" - -tmpl@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -ts-api-utils@^1.0.1, ts-api-utils@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" - integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== - -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.3.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" - integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8: - version "4.0.8" - resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - -typescript@^5.1.6: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== - -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - -unbox-primitive@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" - -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== - -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== - dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" - -unicode-match-property-value-ecmascript@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" - integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== - -unicode-property-aliases-ecmascript@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" - integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== - -update-browserslist-db@^1.0.10, update-browserslist-db@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" - integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -update-browserslist-db@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -v8-to-istanbul@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" - integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== - dependencies: - "@jridgewell/trace-mapping" "^0.3.12" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -walker@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" - integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== - dependencies: - makeerror "1.0.12" - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" - integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== - dependencies: - ansi-styles "^6.1.0" - string-width "^5.0.1" - strip-ansi "^7.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -write-file-atomic@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" - integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" - integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.3.1: - version "17.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==