+
+ i Using the
![]()
can lead to slower LCP and higher bandwidth. Consider using
from next/image to automatically optimize images.
+
+
+```
+
+```
+invalid.jsx:5:3 lint/nursery/noImgElement ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Don't use
![]()
element.
+
+ 4 β
+ > 5 β
![Foo]()
+ β ^^^^^^^^^^^^^^^^^
+ 6 β
+ 7 β
+
+ i Using the
![]()
can lead to slower LCP and higher bandwidth. Consider using
from next/image to automatically optimize images.
+
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx b/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx
new file mode 100644
index 000000000000..f47d1e4ada55
--- /dev/null
+++ b/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx
@@ -0,0 +1,7 @@
+<>
+
![]()
+
+
+ ![Foo]()
+
+
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx.snap b/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx.snap
new file mode 100644
index 000000000000..2fb934209539
--- /dev/null
+++ b/crates/biome_js_analyze/tests/specs/nursery/noImgElement/valid.jsx.snap
@@ -0,0 +1,16 @@
+---
+source: crates/biome_js_analyze/tests/spec_tests.rs
+assertion_line: 86
+expression: valid.jsx
+---
+# Input
+```jsx
+<>
+
![]()
+
+
+ ![Foo]()
+
+
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js
index f9a465f17bcf..c64c6425d3a7 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js
+++ b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js
@@ -1,13 +1,24 @@
-const awsApiKey = "AKIA1234567890EXAMPLE"
+const JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+const awsApiKey = "AKIA1234567890EXAMPLE"
const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
-const clientSecret = "abcdefghijklmnopqrstuvwxyz"
-const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
-const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
-const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
const dbUrl = "postgres://user:password123@example.com:5432/dbname";
+const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
+const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+const VAULT = {
+ token: "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F"
+};
+
+// TODO: Get these to work, they seem common and important
+// const herokuApiKey = "abcd1234-5678-90ef-ghij-klmnopqrstuv";
+// const BASIC_AUTH_HEADER = "Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l";
+// const password = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js.snap b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js.snap
index fde82b9501ff..8ddf29a626ce 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js.snap
+++ b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/invalid.js.snap
@@ -4,39 +4,51 @@ expression: invalid.js
---
# Input
```jsx
-const awsApiKey = "AKIA1234567890EXAMPLE"
+const JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+const awsApiKey = "AKIA1234567890EXAMPLE"
const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
-const clientSecret = "abcdefghijklmnopqrstuvwxyz"
-const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
-const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
-const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
const dbUrl = "postgres://user:password123@example.com:5432/dbname";
+const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
+const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+const VAULT = {
+ token: "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F"
+};
+
+// TODO: Get these to work, they seem common and important
+// const herokuApiKey = "abcd1234-5678-90ef-ghij-klmnopqrstuv";
+// const BASIC_AUTH_HEADER = "Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l";
+// const password = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
```
# Diagnostics
```
-invalid.js:1:19 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:1:13 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- > 1 β const awsApiKey = "AKIA1234567890EXAMPLE"
- β ^^^^^^^^^^^^^^^^^^^^^^^
- 2 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
- 3 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
+ > 1 β const JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 2 β const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
+ 3 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
- i Type of secret detected: AWS API Key
+ i Type of secret detected: JSON Web Token (JWT)
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
@@ -46,172 +58,203 @@ invalid.js:2:20 lint/nursery/noSecrets βββββββββββββ
! Potential secret found.
- 1 β const awsApiKey = "AKIA1234567890EXAMPLE"
- > 2 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+ 1 β const JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+ > 2 β const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 3 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+ 4 β const awsApiKey = "AKIA1234567890EXAMPLE"
+
+ i Type of secret detected: Base64-encoded JWT
+
+ i Storing secrets in source code is a security risk. Consider the following steps:
+ 1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
+ 2. If needed, use environment variables or a secure secret management system to store sensitive data.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
+
+
+```
+
+```
+invalid.js:3:20 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Potential secret found.
+
+ 1 β const JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
+ 2 β const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
+ > 3 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 3 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
- 4 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
+ 4 β const awsApiKey = "AKIA1234567890EXAMPLE"
+ 5 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
i Type of secret detected: Slack Token
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:3:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:4:19 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 1 β const awsApiKey = "AKIA1234567890EXAMPLE"
- 2 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
- > 3 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 4 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
- 5 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 2 β const JWT_BASE64 = "ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbXRwWkNJNkltRmtaVzUwYVdGc0lpd2laR1ZtYjNkellUWXpJaXdpYVdGMElqb3hPREF3T0RNeE9UZzFPVGs1TkN3aWZRPT0"
+ 3 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+ > 4 β const awsApiKey = "AKIA1234567890EXAMPLE"
+ β ^^^^^^^^^^^^^^^^^^^^^^^
+ 5 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
+ 6 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
- i Type of secret detected: RSA Private Key
+ i Type of secret detected: AWS API Key
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:4:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:5:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 2 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
- 3 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
- > 4 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 5 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- 6 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
+ 3 β const slackToken = "xoxb-not-a-real-token-this-will-not-work";
+ 4 β const awsApiKey = "AKIA1234567890EXAMPLE"
+ > 5 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 6 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
+ 7 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- i Type of secret detected: Facebook OAuth
+ i Type of secret detected: RSA Private Key
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:5:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:6:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 3 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
- 4 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
- > 5 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 6 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
- 7 β const clientSecret = "abcdefghijklmnopqrstuvwxyz"
+ 4 β const awsApiKey = "AKIA1234567890EXAMPLE"
+ 5 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
+ > 6 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 7 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 8 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
- i Type of secret detected: Twitter OAuth
+ i Type of secret detected: Facebook OAuth
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:6:21 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:7:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 4 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
- 5 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- > 6 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 7 β const clientSecret = "abcdefghijklmnopqrstuvwxyz"
- 8 β const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
+ 5 β const rsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA1234567890..."
+ 6 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
+ > 7 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 8 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
+ 9 β const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
- i Type of secret detected: GitHub
+ i Type of secret detected: Twitter OAuth
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:7:22 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:8:21 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 5 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- 6 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
- > 7 β const clientSecret = "abcdefghijklmnopqrstuvwxyz"
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 8 β const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
- 9 β const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
+ 6 β const facebookToken = "facebook_app_id_12345abcde67890fghij12345";
+ 7 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ > 8 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 9 β const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+ 10 β const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
- i Type of secret detected: The string has a high entropy value
+ i Type of secret detected: GitHub
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:9:23 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:9:26 lint/nursery/noSecrets βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 7 β const clientSecret = "abcdefghijklmnopqrstuvwxyz"
- 8 β const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
- > 9 β const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 10 β const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 7 β const twitterApiKey = "twitter_api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 8 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
+ > 9 β const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 10 β const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
11 β const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
- i Type of secret detected: The string has a high entropy value
+ i Type of secret detected: Detected high entropy string
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
```
-invalid.js:10:23 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.js:10:22 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
! Potential secret found.
- 8 β const herokuApiKey = "heroku_api_key_1234abcd-1234-1234-1234-1234abcd5678";
- 9 β const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
- > 10 β const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 8 β const githubToken = "github_pat_1234567890abcdefghijklmnopqrstuvwxyz";
+ 9 β const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+ > 10 β const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11 β const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
12 β const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
- i Type of secret detected: The string has a high entropy value
+ i Type of secret detected: Detected high entropy string
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
@@ -221,8 +264,8 @@ invalid.js:11:18 lint/nursery/noSecrets βββββββββββββ
! Potential secret found.
- 9 β const genericSecret = "secret_1234567890abcdefghijklmnopqrstuvwxyz";
- 10 β const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 9 β const hexEncodedSecret = "4d79207365706f7261746f722068656c6c6f20776f726c6421";
+ 10 β const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
> 11 β const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12 β const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
@@ -233,7 +276,8 @@ invalid.js:11:18 lint/nursery/noSecrets βββββββββββββ
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
@@ -243,19 +287,20 @@ invalid.js:12:22 lint/nursery/noSecrets βββββββββββββ
! Potential secret found.
- 10 β const genericApiKey = "api_key_1234567890abcdefghijklmnopqrstuvwxyz";
+ 10 β const base64Secret = "TXkgc2VjcmV0IGtleSBwYXNzd29yZA==";
11 β const slackKey = "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx"
> 12 β const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
13 β const dbUrl = "postgres://user:password123@example.com:5432/dbname";
- 14 β
+ 14 β const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
i Type of secret detected: Twilio API Key
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
@@ -269,14 +314,108 @@ invalid.js:13:15 lint/nursery/noSecrets βββββββββββββ
12 β const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
> 13 β const dbUrl = "postgres://user:password123@example.com:5432/dbname";
β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 14 β
+ 14 β const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+ 15 β const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
i Type of secret detected: Password in URL
i Storing secrets in source code is a security risk. Consider the following steps:
1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
2. If needed, use environment variables or a secure secret management system to store sensitive data.
- 3. If this is a false positive, consider adding an inline disable comment.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
+
+
+```
+
+```
+invalid.js:14:18 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Potential secret found.
+
+ 12 β const twilioApiKey = "SK1234567890abcdefghijklmnopqrstuv";
+ 13 β const dbUrl = "postgres://user:password123@example.com:5432/dbname";
+ > 14 β const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 15 β const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
+ 16 β const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+
+ i Type of secret detected: Detected high entropy string
+
+ i Storing secrets in source code is a security risk. Consider the following steps:
+ 1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
+ 2. If needed, use environment variables or a secure secret management system to store sensitive data.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
+
+
+```
+
+```
+invalid.js:15:28 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Potential secret found.
+
+ 13 β const dbUrl = "postgres://user:password123@example.com:5432/dbname";
+ 14 β const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+ > 15 β const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 16 β const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+ 17 β const VAULT = {
+
+ i Type of secret detected: Detected high entropy string
+
+ i Storing secrets in source code is a security risk. Consider the following steps:
+ 1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
+ 2. If needed, use environment variables or a secure secret management system to store sensitive data.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
+
+
+```
+
+```
+invalid.js:16:24 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Potential secret found.
+
+ 14 β const A_SECRET = "ZWVTjPQSdhwRgl204Hc51YCsritMIzn8B=/p9UyeX7xu6KkAGqfm3FJ+oObLDNEva";
+ 15 β const A_LOWERCASE_SECRET = "zwvtjpqsdhwrgl204hc51ycsritmizn8b=/p9uyex7xu6kkagqfm3fj+oobldneva";
+ > 16 β const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 17 β const VAULT = {
+ 18 β token: "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F"
+
+ i Type of secret detected: Detected high entropy string
+
+ i Storing secrets in source code is a security risk. Consider the following steps:
+ 1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
+ 2. If needed, use environment variables or a secure secret management system to store sensitive data.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
+
+
+```
+
+```
+invalid.js:18:10 lint/nursery/noSecrets ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! Potential secret found.
+
+ 16 β const A_BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F";
+ 17 β const VAULT = {
+ > 18 β token: "AAAAAAAAAAAAAAAAAAAAAMLheAAAAAAA0%2BuSeid%2BULvsea4JtiGRiSDSJSI%3DEUifiRBkKG5E2XzMDjRfl76ZC9Ub0wnz4XsNiRVBChTYbJcE3F"
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 19 β };
+ 20 β
+
+ i Type of secret detected: Detected high entropy string
+
+ i Storing secrets in source code is a security risk. Consider the following steps:
+ 1. Remove the secret from your code. If you've already committed it, consider removing the commit entirely from your git tree.
+ 2. If needed, use environment variables or a secure secret management system to store sensitive data.
+ 3. If this is a false positive, consider adding an inline disable comment, or tweak the entropy threshold. See options in our docs.
+ This rule only catches basic vulnerabilities. For more robust, proper solutions, check out our recommendations at: https://biomejs.dev/linter/rules/no-secrets/#recommendations
```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js
index 0f4cb540dee8..81c61b9c1444 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js
+++ b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js
@@ -4,3 +4,39 @@ const count = 10;
const nonSecret = "hello world"
const nonSecretLong = "hello world, this is a looong string which I needed to create for some reason"
const dbUrl = `postgres://user:${process.env.DB_PASSWORD}@example.com:5432/dbname`;
+const NOT_A_SECRET = "I'm not a secret, I think";
+const NOT_A_SECRET_TEMPLATE = `A template that isn't a secret. ${1+1} = 2`;
+const CSS_CLASSNAME = "hey-it-s-a-css-class-not-a-secret and-neither-this-one";
+
+// From user tests
+const codeCheck = "\nconst DEFAULT_CONFIG = /* @__PURE__ */ bare.Config({})\n";
+const otpCheck = 'Verify OTP Google Mobile Authenticator (2FAS)'
+const bitcoinString = {
+ key: "0 USD,,. for {bitlocus|string}.",
+};
+const textString = {
+ key: 'Verifying takes 15 approved the following 3.'
+};
+const facebookAndAwsString = {
+ key: 'facebook.com |console.aws.amazon.com'
+};
+const IsoString = {
+ key: 'ISO-27001 information , GDPR'
+};
+
+// Postgres json path query
+const isNumeric = '@.scoreDisplayMode == "numeric" || @.scoreDisplayMode == "metricSavings"'
+const tailwindClassNames = 'whitespace-nowrap bg-base-4 px-1 text-[0.65rem] group-hover:w-auto group-hover:overflow-visible'
+const tailwindConfigOptions = {
+ theme: {
+ animation: {
+ slideDown: 'slideDown 300ms cubic-bezier(0.87, 0, 0.13, 1)',
+ }
+ }
+}
+export const url = 'https://www.nytimes.com/2024/03/05/arts/design/pritzker-prize-riken-yamamoto-architecture.html'
+
+// TODO: Remove these false positives, they unfortunately hurt the user experience.
+// const NAMESPACE_CLASSNAME = 'Validation.JSONSchemaValidationUtilsImplFactory';
+// const BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+// const webpackFriendlyConsole = require('./config/webpack/webpackFriendlyConsole');
\ No newline at end of file
diff --git a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js.snap b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js.snap
index 6a72ffebcdcd..a973ab6979aa 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js.snap
+++ b/crates/biome_js_analyze/tests/specs/nursery/noSecrets/valid.js.snap
@@ -10,5 +10,40 @@ const count = 10;
const nonSecret = "hello world"
const nonSecretLong = "hello world, this is a looong string which I needed to create for some reason"
const dbUrl = `postgres://user:${process.env.DB_PASSWORD}@example.com:5432/dbname`;
+const NOT_A_SECRET = "I'm not a secret, I think";
+const NOT_A_SECRET_TEMPLATE = `A template that isn't a secret. ${1+1} = 2`;
+const CSS_CLASSNAME = "hey-it-s-a-css-class-not-a-secret and-neither-this-one";
+// From user tests
+const codeCheck = "\nconst DEFAULT_CONFIG = /* @__PURE__ */ bare.Config({})\n";
+const otpCheck = 'Verify OTP Google Mobile Authenticator (2FAS)'
+const bitcoinString = {
+ key: "0 USD,,. for {bitlocus|string}.",
+};
+const textString = {
+ key: 'Verifying takes 15 approved the following 3.'
+};
+const facebookAndAwsString = {
+ key: 'facebook.com |console.aws.amazon.com'
+};
+const IsoString = {
+ key: 'ISO-27001 information , GDPR'
+};
+
+// Postgres json path query
+const isNumeric = '@.scoreDisplayMode == "numeric" || @.scoreDisplayMode == "metricSavings"'
+const tailwindClassNames = 'whitespace-nowrap bg-base-4 px-1 text-[0.65rem] group-hover:w-auto group-hover:overflow-visible'
+const tailwindConfigOptions = {
+ theme: {
+ animation: {
+ slideDown: 'slideDown 300ms cubic-bezier(0.87, 0, 0.13, 1)',
+ }
+ }
+}
+export const url = 'https://www.nytimes.com/2024/03/05/arts/design/pritzker-prize-riken-yamamoto-architecture.html'
+
+// TODO: Remove these false positives, they unfortunately hurt the user experience.
+// const NAMESPACE_CLASSNAME = 'Validation.JSONSchemaValidationUtilsImplFactory';
+// const BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+// const webpackFriendlyConsole = require('./config/webpack/webpackFriendlyConsole');
```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts
index 16fe67e58b09..1cb6ba5f394e 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts
+++ b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts
@@ -89,4 +89,7 @@ function fn() {
return function (): string {
return str;
};
-}
\ No newline at end of file
+}
+
+const x = { prop: () => {} }
+const x = { bar: { prop: () => {} } }
\ No newline at end of file
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts.snap b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts.snap
index 9b84cc810709..f64962a5730d 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/invalid.ts.snap
@@ -96,6 +96,9 @@ function fn() {
return str;
};
}
+
+const x = { prop: () => {} }
+const x = { bar: { prop: () => {} } }
```
# Diagnostics
@@ -527,3 +530,37 @@ invalid.ts:85:2 lint/nursery/useExplicitFunctionReturnType βββββββ
```
+
+```
+invalid.ts:94:19 lint/nursery/useExplicitFunctionReturnType ββββββββββββββββββββββββββββββββββββββββ
+
+ ! Missing return type on function.
+
+ 92 β }
+ 93 β
+ > 94 β const x = { prop: () => {} }
+ β ^^^^^^^^^
+ 95 β const x = { bar: { prop: () => {} } }
+
+ i Declaring the return type makes the code self-documenting and can speed up TypeScript type checking.
+
+ i Add a return type annotation.
+
+
+```
+
+```
+invalid.ts:95:26 lint/nursery/useExplicitFunctionReturnType ββββββββββββββββββββββββββββββββββββββββ
+
+ ! Missing return type on function.
+
+ 94 β const x = { prop: () => {} }
+ > 95 β const x = { bar: { prop: () => {} } }
+ β ^^^^^^^^^
+
+ i Declaring the return type makes the code self-documenting and can speed up TypeScript type checking.
+
+ i Add a return type annotation.
+
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts
index 0c381b08a967..41f4283c04c6 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts
+++ b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts
@@ -47,6 +47,8 @@ node.addEventListener('click', function () {});
const foo = arr.map(i => i * i);
fn(() => {});
fn(function () {});
+new Promise(resolve => {});
+new Foo(1, () => {});
[function () {}, () => {}];
(function () {
console.log("This is an IIFE");
@@ -62,4 +64,42 @@ const arrowFn = () => (): void => {};
const arrowFn = () => function(): void {}
const arrowFn = () => {
return (): void => { };
-}
\ No newline at end of file
+}
+
+
+// type assertion
+const asTyped = (() => '') as () => string;
+const castTyped = <() => string>(() => '');
+
+// variable declarator with a type annotation
+type FuncType = () => string;
+const arrowFn: FuncType = () => 'test';
+const funcExpr: FuncType = function () {
+ return 'test';
+};
+
+// default parameter with a type annotation
+type CallBack = () => void;
+const f = (gotcha: CallBack = () => { }): void => { };
+function f(gotcha: CallBack = () => {}): void {}
+
+// class property with a type annotation
+type MethodType = () => void;
+class App {
+ private method: MethodType = () => { };
+}
+
+// function as a property or a nested property of a typed object
+const x: Foo = { prop: () => {} }
+const x = { prop: () => {} } as Foo
+const x =
{ prop: () => {} }
+
+const x: Foo = { bar: { prop: () => {} } }
+
+class Accumulator {
+ private count: number = 0;
+ public accumulate(fn: () => number): void {
+ this.count += fn();
+ }
+}
+new Accumulator().accumulate(() => 1);
\ No newline at end of file
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts.snap b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts.snap
index 80b8221a7297..45a4d83905d7 100644
--- a/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/nursery/useExplicitFunctionReturnType/valid.ts.snap
@@ -53,6 +53,8 @@ node.addEventListener('click', function () {});
const foo = arr.map(i => i * i);
fn(() => {});
fn(function () {});
+new Promise(resolve => {});
+new Foo(1, () => {});
[function () {}, () => {}];
(function () {
console.log("This is an IIFE");
@@ -69,4 +71,42 @@ const arrowFn = () => function(): void {}
const arrowFn = () => {
return (): void => { };
}
+
+
+// type assertion
+const asTyped = (() => '') as () => string;
+const castTyped = <() => string>(() => '');
+
+// variable declarator with a type annotation
+type FuncType = () => string;
+const arrowFn: FuncType = () => 'test';
+const funcExpr: FuncType = function () {
+ return 'test';
+};
+
+// default parameter with a type annotation
+type CallBack = () => void;
+const f = (gotcha: CallBack = () => { }): void => { };
+function f(gotcha: CallBack = () => {}): void {}
+
+// class property with a type annotation
+type MethodType = () => void;
+class App {
+ private method: MethodType = () => { };
+}
+
+// function as a property or a nested property of a typed object
+const x: Foo = { prop: () => {} }
+const x = { prop: () => {} } as Foo
+const x = { prop: () => {} }
+
+const x: Foo = { bar: { prop: () => {} } }
+
+class Accumulator {
+ private count: number = 0;
+ public accumulate(fn: () => number): void {
+ this.count += fn();
+ }
+}
+new Accumulator().accumulate(() => 1);
```
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx b/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx
new file mode 100644
index 000000000000..2983f707b47b
--- /dev/null
+++ b/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx
@@ -0,0 +1 @@
+
diff --git a/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx.snap b/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx.snap
new file mode 100644
index 000000000000..6852ac4f2f56
--- /dev/null
+++ b/crates/biome_js_analyze/tests/specs/nursery/useSortedClasses/issue_4041.jsx.snap
@@ -0,0 +1,9 @@
+---
+source: crates/biome_js_analyze/tests/spec_tests.rs
+expression: issue_4041.jsx
+---
+# Input
+```jsx
+
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts b/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts
index 901be26b8335..b02368290d37 100644
--- a/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts
+++ b/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts
@@ -38,3 +38,8 @@ export {
import type * as Ns from ""
export { Ns }
+
+import { type T9, type T10 } from "./mod.ts";
+export { type T9, type T10 };
+
+export { type T11, type T12 } from "./mod.ts";
diff --git a/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts.snap b/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts.snap
index cb7624470d80..65831e5f9e06 100644
--- a/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useExportType/invalid.ts.snap
@@ -45,13 +45,26 @@ export {
import type * as Ns from ""
export { Ns }
+import { type T9, type T10 } from "./mod.ts";
+export { type T9, type T10 };
+
+export { type T11, type T12 } from "./mod.ts";
+
```
# Diagnostics
```
-invalid.ts:2:10 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.ts:2:8 lint/style/useExportType FIXABLE ββββββββββββββββββββββββββββββββββββββββββββββββββ
- ! Several exports are only types and should thus use export type.
+ ! Some exports are only types.
+
+ 1 β import { type T1, V1 } from "./mod.ts";
+ > 2 β export { T1, V1 };
+ β ^^^^^^^^^^^
+ 3 β
+ 4 β import type { T2, T3 } from "./mod.ts";
+
+ i This export is a type.
1 β import { type T1, V1 } from "./mod.ts";
> 2 β export { T1, V1 };
@@ -59,9 +72,9 @@ invalid.ts:2:10 lint/style/useExportType FIXABLE βββββββββ
3 β
4 β import type { T2, T3 } from "./mod.ts";
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use inline type exports.
+ i Safe fix: Add inline type keywords.
2 β exportΒ·{Β·typeΒ·T1,Β·V1Β·};
β +++++
@@ -71,7 +84,7 @@ invalid.ts:2:10 lint/style/useExportType FIXABLE βββββββββ
```
invalid.ts:5:8 lint/style/useExportType FIXABLE ββββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
4 β import type { T2, T3 } from "./mod.ts";
> 5 β export { T2, T3 };
@@ -79,9 +92,9 @@ invalid.ts:5:8 lint/style/useExportType FIXABLE ββββββββββ
6 β
7 β import type T4 from "./mod.ts";
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
5 β exportΒ·typeΒ·{Β·T2,Β·T3Β·};
β +++++
@@ -91,7 +104,7 @@ invalid.ts:5:8 lint/style/useExportType FIXABLE ββββββββββ
```
invalid.ts:8:8 lint/style/useExportType FIXABLE ββββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
7 β import type T4 from "./mod.ts";
> 8 β export { T4 };
@@ -99,9 +112,9 @@ invalid.ts:8:8 lint/style/useExportType FIXABLE ββββββββββ
9 β
10 β // multiline
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
8 β exportΒ·typeΒ·{Β·T4Β·};
β +++++
@@ -109,22 +122,44 @@ invalid.ts:8:8 lint/style/useExportType FIXABLE ββββββββββ
```
```
-invalid.ts:14:5 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.ts:12:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
- ! Several exports are only types and should thus use export type.
+ ! Some exports are only types.
+
+ 10 β // multiline
+ 11 β import { type T5, type T6, V2 } from "./mod.ts";
+ > 12 β export {
+ β ^
+ > 13 β // leading comment
+ > 14 β T5,
+ > 15 β T6,
+ > 16 β V2,
+ > 17 β };
+ β ^^
+ 18 β
+ 19 β import type * as ns from "./mod.ts";
+
+ i This export is a type.
12 β export {
13 β // leading comment
> 14 β T5,
- β ^^^
+ β ^^
+ 15 β T6,
+ 16 β V2,
+
+ i This export is a type.
+
+ 13 β // leading comment
+ 14 β T5,
> 15 β T6,
β ^^
16 β V2,
17 β };
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use inline type exports.
+ i Safe fix: Add inline type keywords.
12 12 β export {
13 13 β // leading comment
@@ -141,7 +176,7 @@ invalid.ts:14:5 lint/style/useExportType FIXABLE βββββββββ
```
invalid.ts:20:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
19 β import type * as ns from "./mod.ts";
> 20 β export { ns };
@@ -149,9 +184,9 @@ invalid.ts:20:8 lint/style/useExportType FIXABLE βββββββββ
21 β
22 β interface Interface {}
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
20 β exportΒ·typeΒ·{Β·nsΒ·};
β +++++
@@ -159,20 +194,38 @@ invalid.ts:20:8 lint/style/useExportType FIXABLE βββββββββ
```
```
-invalid.ts:27:10 lint/style/useExportType FIXABLE ββββββββββββββββββββββββββββββββββββββββββββββββ
+invalid.ts:27:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
- ! Several exports are only types and should thus use export type.
+ ! Some exports are only types.
+
+ 25 β function func() {}
+ 26 β class Class {}
+ > 27 β export { Interface, TypeAlias, Enum, func as f, Class };
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 28 β
+ 29 β export /*0*/ { /*1*/ type /*2*/ func /*3*/, /*4*/ type Class as C /*5*/ } /*6*/;
+
+ i This export is a type.
+
+ 25 β function func() {}
+ 26 β class Class {}
+ > 27 β export { Interface, TypeAlias, Enum, func as f, Class };
+ β ^^^^^^^^^
+ 28 β
+ 29 β export /*0*/ { /*1*/ type /*2*/ func /*3*/, /*4*/ type Class as C /*5*/ } /*6*/;
+
+ i This export is a type.
25 β function func() {}
26 β class Class {}
> 27 β export { Interface, TypeAlias, Enum, func as f, Class };
- β ^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^
28 β
29 β export /*0*/ { /*1*/ type /*2*/ func /*3*/, /*4*/ type Class as C /*5*/ } /*6*/;
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use inline type exports.
+ i Safe fix: Add inline type keywords.
27 β exportΒ·{Β·typeΒ·Interface,Β·typeΒ·TypeAlias,Β·Enum,Β·funcΒ·asΒ·f,Β·ClassΒ·};
β +++++ +++++
@@ -182,7 +235,7 @@ invalid.ts:27:10 lint/style/useExportType FIXABLE βββββββββ
```
invalid.ts:29:14 lint/style/useExportType FIXABLE ββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
27 β export { Interface, TypeAlias, Enum, func as f, Class };
28 β
@@ -191,9 +244,9 @@ invalid.ts:29:14 lint/style/useExportType FIXABLE βββββββββ
30 β
31 β import { type T7, type T8 } from "./mod.ts";
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
27 27 β export { Interface, TypeAlias, Enum, func as f, Class };
28 28 β
@@ -208,7 +261,7 @@ invalid.ts:29:14 lint/style/useExportType FIXABLE βββββββββ
```
invalid.ts:32:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
31 β import { type T7, type T8 } from "./mod.ts";
> 32 β export {
@@ -222,9 +275,9 @@ invalid.ts:32:8 lint/style/useExportType FIXABLE βββββββββ
38 β
39 β import type * as Ns from ""
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
30 30 β
31 31 β import { type T7, type T8 } from "./mod.ts";
@@ -245,18 +298,68 @@ invalid.ts:32:8 lint/style/useExportType FIXABLE βββββββββ
```
invalid.ts:40:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
- ! All exports are only types and should thus use export type.
+ ! All exports are only types.
39 β import type * as Ns from ""
> 40 β export { Ns }
β ^^^^^^
41 β
+ 42 β import { type T9, type T10 } from "./mod.ts";
- i Using export type allows transpilers to safely drop exports of types without looking for their definition.
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
- i Safe fix: Use a grouped export type.
+ i Safe fix: Use export type.
40 β exportΒ·typeΒ·{Β·NsΒ·}
β +++++
```
+
+```
+invalid.ts:43:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! All exports are only types.
+
+ 42 β import { type T9, type T10 } from "./mod.ts";
+ > 43 β export { type T9, type T10 };
+ β ^^^^^^^^^^^^^^^^^^^^^^
+ 44 β
+ 45 β export { type T11, type T12 } from "./mod.ts";
+
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
+
+ i Safe fix: Use export type.
+
+ 41 41 β
+ 42 42 β import { type T9, type T10 } from "./mod.ts";
+ 43 β - exportΒ·{Β·typeΒ·T9,Β·typeΒ·T10Β·};
+ 43 β + exportΒ·typeΒ·{Β·T9,Β·T10Β·};
+ 44 44 β
+ 45 45 β export { type T11, type T12 } from "./mod.ts";
+
+
+```
+
+```
+invalid.ts:45:8 lint/style/useExportType FIXABLE βββββββββββββββββββββββββββββββββββββββββββββββββ
+
+ ! All exports are only types.
+
+ 43 β export { type T9, type T10 };
+ 44 β
+ > 45 β export { type T11, type T12 } from "./mod.ts";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 46 β
+
+ i Using export type allows compilers to safely drop exports of types without looking for their definition.
+
+ i Safe fix: Use export type.
+
+ 43 43 β export { type T9, type T10 };
+ 44 44 β
+ 45 β - exportΒ·{Β·typeΒ·T11,Β·typeΒ·T12Β·}Β·fromΒ·"./mod.ts";
+ 45 β + exportΒ·typeΒ·{Β·T11,Β·T12Β·}Β·fromΒ·"./mod.ts";
+ 46 46 β
+
+
+```
diff --git a/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts b/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts
index 9659d32c79f1..a405ab8b5aaf 100644
--- a/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts
+++ b/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts
@@ -41,3 +41,12 @@ declare class AmbientFunction {}
export { AmbientClass, AmbientEnum, AmbientFunction }
export {}
+
+function f3() {}
+class Class3 {}
+export { type Class3, f3 }
+
+function f4() {}
+export { f4 }
+
+export { type T1, V1 } from "./mod.ts";
diff --git a/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts.snap b/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts.snap
index 0edcc931e75f..1405afc89d56 100644
--- a/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useExportType/valid.ts.snap
@@ -48,4 +48,13 @@ export { AmbientClass, AmbientEnum, AmbientFunction }
export {}
+function f3() {}
+class Class3 {}
+export { type Class3, f3 }
+
+function f4() {}
+export { f4 }
+
+export { type T1, V1 } from "./mod.ts";
+
```
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-combined.ts.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-combined.ts.snap
index 13ee785fe212..29c44c4c3adf 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-combined.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-combined.ts.snap
@@ -37,20 +37,20 @@ export { T, type U };
# Diagnostics
```
-invalid-combined.ts:2:1 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:2:12 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
1 β // Leading comment
> 2 β import/*1*/A/*2*/
- β ^^^^^^^^^^^^^^^^^
+ β ^^^^^^
> 3 β // Comma comment
> 4 β ,/*3*/{ B }/*4*/from/*5*/""/*6*/; // Trailing comment
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^
5 β // Comment
6 β export type { A, B };
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -67,14 +67,14 @@ invalid-combined.ts:2:1 lint/style/useImportType FIXABLE βββββββ
```
```
-invalid-combined.ts:8:1 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:8:8 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββββββββ
! The default import and some named imports are only used as types.
6 β export type { A, B };
7 β
> 8 β import C, { D, E, F } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^
9 β export { type C, type D, type E, F };
10 β
@@ -96,7 +96,7 @@ invalid-combined.ts:8:1 lint/style/useImportType FIXABLE βββββββ
9 β export { type C, type D, type E, F };
10 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -112,18 +112,18 @@ invalid-combined.ts:8:1 lint/style/useImportType FIXABLE βββββββ
```
```
-invalid-combined.ts:11:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:11:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
9 β export { type C, type D, type E, F };
10 β
> 11 β import G, { type H, I } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^
12 β export type { G, H, I };
13 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -139,20 +139,20 @@ invalid-combined.ts:11:1 lint/style/useImportType FIXABLE ββββββ
```
```
-invalid-combined.ts:15:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:15:13 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
14 β // Leading comment
> 15 β import /*1*/M/*2*/
- β ^^^^^^^^^^^^^^^^^^
+ β ^^^^^^
> 16 β // Comma comment
> 17 β ,/*3*/*/*4*/as/*5*/N/*6*/from/*7*/""/*8*/;/*9*/
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18 β // Comment
19 β export type { M, N };
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -170,18 +170,18 @@ invalid-combined.ts:15:1 lint/style/useImportType FIXABLE ββββββ
```
```
-invalid-combined.ts:21:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:21:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
! The default import is only used as a type.
19 β export type { M, N };
20 β
> 21 β import O, * as P from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^
22 β export { type O, P };
23 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -208,7 +208,7 @@ invalid-combined.ts:24:11 lint/style/useImportType FIXABLE ββββββ
25 β export { Q, type R };
26 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -224,14 +224,14 @@ invalid-combined.ts:24:11 lint/style/useImportType FIXABLE ββββββ
```
```
-invalid-combined.ts:27:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
+invalid-combined.ts:27:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββββββ
! Some named imports are only used as types.
25 β export { Q, type R };
26 β
> 27 β import T, { U } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^
28 β export { T, type U };
29 β
@@ -244,13 +244,11 @@ invalid-combined.ts:27:1 lint/style/useImportType FIXABLE ββββββ
28 β export { T, type U };
29 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
- i Safe fix: Use import type.
+ i Safe fix: Add inline type keywords.
27 β importΒ·T,Β·{Β·typeΒ·UΒ·}Β·fromΒ·"";
β +++++
```
-
-
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-default-imports.ts.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-default-imports.ts.snap
index d0318fb7dd5f..bfd18b741ed3 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-default-imports.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-default-imports.ts.snap
@@ -13,16 +13,16 @@ let a: A;
# Diagnostics
```
-invalid-default-imports.ts:1:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββ
+invalid-default-imports.ts:1:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
> 1 β import A from ""
- β ^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^
2 β type AA = A;
3 β export { type A };
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -30,5 +30,3 @@ invalid-default-imports.ts:1:1 lint/style/useImportType FIXABLE ββββ
β +++++
```
-
-
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts
index b956804017cd..26589a020c15 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts
@@ -9,11 +9,10 @@ import { X, Y } from "";
type XX = X;
const YY = Y;
-//import { type U, V } from "";
-//type VV = V;
+import { type H, type I, type J } from "";
+export type { H, I, J };
-import { type X, type Y, type Z } from "";
-export type { X, Y, Z };
+import type { type M, N, type O } from "";
// multiline
import {
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts.snap
index 27f83ea298df..3bb4fa401e19 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-named-imports.ts.snap
@@ -15,11 +15,10 @@ import { X, Y } from "";
type XX = X;
const YY = Y;
-//import { type U, V } from "";
-//type VV = V;
+import { type H, type I, type J } from "";
+export type { H, I, J };
-import { type X, type Y, type Z } from "";
-export type { X, Y, Z };
+import type { type M, N, type O } from "";
// multiline
import {
@@ -34,12 +33,12 @@ export { U, type V, type W };
# Diagnostics
```
-invalid-named-imports.ts:1:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββ
+invalid-named-imports.ts:1:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββ
! Some named imports are only used as types.
> 1 β import { A, B, C, D, E } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^
2 β type AA = A;
3 β type BB = typeof B;
@@ -64,9 +63,9 @@ invalid-named-imports.ts:1:1 lint/style/useImportType FIXABLE βββββ
2 β type AA = A;
3 β type BB = typeof B;
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
- i Safe fix: Use import type.
+ i Safe fix: Add inline type keywords.
1 β importΒ·{Β·typeΒ·A,Β·typeΒ·B,Β·typeΒ·C,Β·D,Β·EΒ·}Β·fromΒ·"";
β +++++ +++++ +++++
@@ -74,14 +73,14 @@ invalid-named-imports.ts:1:1 lint/style/useImportType FIXABLE βββββ
```
```
-invalid-named-imports.ts:8:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββ
+invalid-named-imports.ts:8:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββββββ
! Some named imports are only used as types.
6 β const EE = E;
7 β
> 8 β import { X, Y } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^
9 β type XX = X;
10 β const YY = Y;
@@ -94,9 +93,9 @@ invalid-named-imports.ts:8:1 lint/style/useImportType FIXABLE βββββ
9 β type XX = X;
10 β const YY = Y;
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
- i Safe fix: Use import type.
+ i Safe fix: Add inline type keywords.
8 β importΒ·{Β·typeΒ·X,Β·YΒ·}Β·fromΒ·"";
β +++++
@@ -104,81 +103,116 @@ invalid-named-imports.ts:8:1 lint/style/useImportType FIXABLE βββββ
```
```
-invalid-named-imports.ts:15:1 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββ
+invalid-named-imports.ts:12:8 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
- 13 β //type VV = V;
+ 10 β const YY = Y;
+ 11 β
+ > 12 β import { type H, type I, type J } from "";
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 13 β export type { H, I, J };
14 β
- > 15 β import { type X, type Y, type Z } from "";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 16 β export type { X, Y, Z };
- 17 β
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
- 13 13 β //type VV = V;
+ 10 10 β const YY = Y;
+ 11 11 β
+ 12 β - importΒ·{Β·typeΒ·H,Β·typeΒ·I,Β·typeΒ·JΒ·}Β·fromΒ·"";
+ 12 β + importΒ·typeΒ·{Β·H,Β·I,Β·JΒ·}Β·fromΒ·"";
+ 13 13 β export type { H, I, J };
14 14 β
- 15 β - importΒ·{Β·typeΒ·X,Β·typeΒ·Y,Β·typeΒ·ZΒ·}Β·fromΒ·"";
- 15 β + importΒ·typeΒ·{Β·X,Β·Y,Β·ZΒ·}Β·fromΒ·"";
- 16 16 β export type { X, Y, Z };
- 17 17 β
```
```
-invalid-named-imports.ts:19:1 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββ
+invalid-named-imports.ts:15:8 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββ
+
+ ! This type keyword makes all inline type keywords useless.
+
+ 13 β export type { H, I, J };
+ 14 β
+ > 15 β import type { type M, N, type O } from "";
+ β ^^^^
+ 16 β
+ 17 β // multiline
+
+ i This inline type keyword is useless.
+
+ 13 β export type { H, I, J };
+ 14 β
+ > 15 β import type { type M, N, type O } from "";
+ β ^^^^
+ 16 β
+ 17 β // multiline
+
+ i This inline type keyword is useless.
+
+ 13 β export type { H, I, J };
+ 14 β
+ > 15 β import type { type M, N, type O } from "";
+ β ^^^^
+ 16 β
+ 17 β // multiline
+
+ i Safe fix: Remove useless inline type keywords.
+
+ 15 β importΒ·typeΒ·{Β·typeΒ·M,Β·N,Β·typeΒ·OΒ·}Β·fromΒ·"";
+ β ----- -----
+
+```
+
+```
+invalid-named-imports.ts:18:8 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββββββββ
! Some named imports are only used as types.
- 18 β // multiline
- > 19 β import {
- β ^^^^^^^^
- > 20 β U,
- > 21 β V,
- > 22 β // leading comment
- > 23 β W,
- > 24 β } from "";
- β ^^^^^^^^^^
- 25 β export { U, type V, type W };
- 26 β
+ 17 β // multiline
+ > 18 β import {
+ β ^
+ > 19 β U,
+ > 20 β V,
+ > 21 β // leading comment
+ > 22 β W,
+ > 23 β } from "";
+ β ^^^^^^^^^
+ 24 β export { U, type V, type W };
+ 25 β
i This import is only used as a type.
- 19 β import {
- 20 β U,
- > 21 β V,
+ 18 β import {
+ 19 β U,
+ > 20 β V,
β ^
- 22 β // leading comment
- 23 β W,
+ 21 β // leading comment
+ 22 β W,
i This import is only used as a type.
- 21 β V,
- 22 β // leading comment
- > 23 β W,
+ 20 β V,
+ 21 β // leading comment
+ > 22 β W,
β ^
- 24 β } from "";
- 25 β export { U, type V, type W };
+ 23 β } from "";
+ 24 β export { U, type V, type W };
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
- i Safe fix: Use import type.
+ i Safe fix: Add inline type keywords.
- 19 19 β import {
- 20 20 β U,
- 21 β - Β·Β·Β·Β·V,
- 21 β + Β·Β·Β·Β·typeΒ·V,
- 22 22 β // leading comment
- 23 β - Β·Β·Β·Β·W,
- 23 β + Β·Β·Β·Β·typeΒ·W,
- 24 24 β } from "";
- 25 25 β export { U, type V, type W };
+ 18 18 β import {
+ 19 19 β U,
+ 20 β - Β·Β·Β·Β·V,
+ 20 β + Β·Β·Β·Β·typeΒ·V,
+ 21 21 β // leading comment
+ 22 β - Β·Β·Β·Β·W,
+ 22 β + Β·Β·Β·Β·typeΒ·W,
+ 23 23 β } from "";
+ 24 24 β export { U, type V, type W };
```
-
-
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-namesapce-imports.ts.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-namesapce-imports.ts.snap
index bb8955d01d66..099e00fb63d0 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-namesapce-imports.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-namesapce-imports.ts.snap
@@ -13,16 +13,16 @@ let a: A.Type1;
# Diagnostics
```
-invalid-namesapce-imports.ts:1:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββ
+invalid-namesapce-imports.ts:1:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββββ
! All these imports are only used as types.
> 1 β import * as A from "";
- β ^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^
2 β export { type A }
3 β type AA = typeof A.Class;
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
@@ -30,5 +30,3 @@ invalid-namesapce-imports.ts:1:1 lint/style/useImportType FIXABLE ββββ
β +++++
```
-
-
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-unused-react-types.tsx.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-unused-react-types.tsx.snap
index 520493d4b4aa..6d43b4ea4d9f 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-unused-react-types.tsx.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/invalid-unused-react-types.tsx.snap
@@ -16,16 +16,16 @@ function Component() {
# Diagnostics
```
-invalid-unused-react-types.tsx:1:1 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββ
+invalid-unused-react-types.tsx:1:8 lint/style/useImportType FIXABLE ββββββββββββββββββββββββββββββ
! All these imports are only used as types.
> 1 β import * as ReactTypes from "react";
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2 β
3 β function Component() {
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
i Safe fix: Use import type.
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts
index 7ffbbfade399..6e0384de814a 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts
@@ -13,3 +13,10 @@ export type { C };
import { D } from "";
let a: D = new D();
+
+import { type E, F } from "";
+export type { E };
+export { F };
+
+import type { G } from "";
+export type { G };
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts.snap
index 6ef270364b09..2d9fb077771c 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-named-imports.ts.snap
@@ -20,6 +20,11 @@ export type { C };
import { D } from "";
let a: D = new D();
-```
+import { type E, F } from "";
+export type { E };
+export { F };
+import type { G } from "";
+export type { G };
+```
diff --git a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-unused-react-combined.tsx.snap b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-unused-react-combined.tsx.snap
index ed50131cbf2b..54821076c9e5 100644
--- a/crates/biome_js_analyze/tests/specs/style/useImportType/valid-unused-react-combined.tsx.snap
+++ b/crates/biome_js_analyze/tests/specs/style/useImportType/valid-unused-react-combined.tsx.snap
@@ -17,12 +17,12 @@ function Component() {
# Diagnostics
```
-valid-unused-react-combined.tsx:1:1 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββ
+valid-unused-react-combined.tsx:1:8 lint/style/useImportType FIXABLE βββββββββββββββββββββββββββββ
! Some named imports are only used as types.
> 1 β import React, { MouseEvent } from 'react';
- β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ β ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2 β
3 β function Component() {
@@ -33,9 +33,9 @@ valid-unused-react-combined.tsx:1:1 lint/style/useImportType FIXABLE βββ
2 β
3 β function Component() {
- i Importing the types with import type ensures that they are removed by the transpilers and avoids loading unnecessary modules.
+ i Importing the types with import type ensures that they are removed by the compilers and avoids loading unnecessary modules.
- i Safe fix: Use import type.
+ i Safe fix: Add inline type keywords.
1 β importΒ·React,Β·{Β·typeΒ·MouseEventΒ·}Β·fromΒ·'react';
β +++++
diff --git a/crates/biome_js_factory/src/utils.rs b/crates/biome_js_factory/src/utils.rs
index e47e71cabd0b..0e1ffd69f556 100644
--- a/crates/biome_js_factory/src/utils.rs
+++ b/crates/biome_js_factory/src/utils.rs
@@ -31,7 +31,7 @@ pub fn escape<'a>(
iter.next();
} else {
for candidate in needs_escaping {
- if unescaped_string[idx..].starts_with(candidate) {
+ if unescaped_string.as_bytes()[idx..].starts_with(candidate.as_bytes()) {
if escaped.is_empty() {
escaped = String::with_capacity(unescaped_string.len() * 2 - idx);
}
@@ -70,6 +70,7 @@ mod tests {
escape("abc ${} ${} bca", &["${"], b'\\'),
r"abc \${} \${} bca"
);
+ assert_eq!(escape("β¬", &["'"], b'\\'), "β¬");
assert_eq!(escape(r"\`", &["`"], b'\\'), r"\`");
assert_eq!(escape(r"\${}", &["${"], b'\\'), r"\${}");
@@ -77,6 +78,8 @@ mod tests {
assert_eq!(escape(r"\\${}", &["${"], b'\\'), r"\\\${}");
assert_eq!(escape(r"\\\`", &["`"], b'\\'), r"\\\`");
assert_eq!(escape(r"\\\${}", &["${"], b'\\'), r"\\\${}");
+ assert_eq!(escape("β¬", &["β¬"], b'\\'), r"\β¬");
+ assert_eq!(escape("πβ¬", &["β¬"], b'\\'), r"π\β¬");
assert_eq!(escape("abc", &["${", "`"], b'\\'), "abc");
assert_eq!(escape("${} `", &["${", "`"], b'\\'), r"\${} \`");
diff --git a/crates/biome_js_syntax/src/export_ext.rs b/crates/biome_js_syntax/src/export_ext.rs
index 248ce81cdab6..e7e92977a1d7 100644
--- a/crates/biome_js_syntax/src/export_ext.rs
+++ b/crates/biome_js_syntax/src/export_ext.rs
@@ -11,6 +11,22 @@ declare_node_union! {
pub AnyIdentifier = AnyJsBindingPattern | AnyTsIdentifierBinding | JsIdentifierExpression | JsLiteralExportName | JsReferenceIdentifier
}
+impl AnyIdentifier {
+ pub fn name_token(&self) -> Option {
+ match self {
+ Self::AnyJsBindingPattern(id) => id
+ .as_any_js_binding()?
+ .as_js_identifier_binding()?
+ .name_token(),
+ Self::AnyTsIdentifierBinding(id) => id.as_ts_identifier_binding()?.name_token(),
+ Self::JsIdentifierExpression(id) => id.name().ok()?.value_token(),
+ Self::JsLiteralExportName(id) => id.value(),
+ Self::JsReferenceIdentifier(id) => id.value_token(),
+ }
+ .ok()
+ }
+}
+
declare_node_union! {
pub AnyJsExported = AnyJsExpression | AnyJsExportClause | AnyIdentifier | AnyTsType | TsEnumDeclaration
}
diff --git a/crates/biome_json_analyze/src/lint/suspicious/no_duplicate_object_keys.rs b/crates/biome_json_analyze/src/lint/suspicious/no_duplicate_object_keys.rs
index 73d0473055ef..0477ab7d4e0f 100644
--- a/crates/biome_json_analyze/src/lint/suspicious/no_duplicate_object_keys.rs
+++ b/crates/biome_json_analyze/src/lint/suspicious/no_duplicate_object_keys.rs
@@ -37,7 +37,7 @@ declare_lint_rule! {
impl Rule for NoDuplicateObjectKeys {
type Query = Ast;
type State = (JsonMemberName, Vec);
- type Signals = Vec;
+ type Signals = Box<[Self::State]>;
type Options = ();
fn run(ctx: &RuleContext) -> Self::Signals {
@@ -62,10 +62,8 @@ impl Rule for NoDuplicateObjectKeys {
}
}
}
-
let duplicated_keys: Vec<_> = names.into_iter().collect();
-
- duplicated_keys
+ duplicated_keys.into_boxed_slice()
}
fn diagnostic(_ctx: &RuleContext, state: &Self::State) -> Option {
diff --git a/crates/biome_migrate/src/analyzers/nursery_rules.rs b/crates/biome_migrate/src/analyzers/nursery_rules.rs
index d9063e983150..8b4912ef99d8 100644
--- a/crates/biome_migrate/src/analyzers/nursery_rules.rs
+++ b/crates/biome_migrate/src/analyzers/nursery_rules.rs
@@ -135,12 +135,12 @@ const RULES_TO_MIGRATE: &[(&str, (&str, &str))] = &[
impl Rule for NurseryRules {
type Query = Ast;
type State = MigrateRuleState;
- type Signals = Vec;
+ type Signals = Box<[Self::State]>;
type Options = ();
fn run(ctx: &RuleContext) -> Self::Signals {
let node = ctx.query();
- let mut rules_to_migrate = vec![];
+ let mut rules_to_migrate = Vec::new();
if let Some(nursery_group) = find_group_by_name(node, "nursery") {
let mut rules_should_be_migrated = FxHashMap::default();
@@ -153,7 +153,7 @@ impl Rule for NurseryRules {
.ok()
.and_then(|node| node.as_json_object_value().cloned())
else {
- return rules_to_migrate;
+ return rules_to_migrate.into_boxed_slice();
};
let mut separator_iterator = nursery_group_object
@@ -195,7 +195,7 @@ impl Rule for NurseryRules {
}
}
- rules_to_migrate
+ rules_to_migrate.into_boxed_slice()
}
fn diagnostic(_ctx: &RuleContext, state: &Self::State) -> Option {
diff --git a/crates/biome_service/src/file_handlers/grit.rs b/crates/biome_service/src/file_handlers/grit.rs
index afb9529d2fe2..cf56af7a4596 100644
--- a/crates/biome_service/src/file_handlers/grit.rs
+++ b/crates/biome_service/src/file_handlers/grit.rs
@@ -3,7 +3,7 @@ use crate::{
WorkspaceError,
};
use biome_analyze::{AnalyzerConfiguration, AnalyzerOptions};
-use biome_formatter::Printed;
+use biome_formatter::{IndentStyle, IndentWidth, LineEnding, LineWidth, Printed};
use biome_fs::BiomePath;
use biome_grit_formatter::{context::GritFormatOptions, format_node};
use biome_grit_parser::parse_grit_with_cache;
@@ -16,8 +16,30 @@ use super::{
FormatterCapabilities, ParseResult, ParserCapabilities, SearchCapabilities,
};
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct GritFormatterSettings {
+ pub line_ending: Option,
+ pub line_width: Option,
+ pub indent_width: Option,
+ pub indent_style: Option,
+ pub enabled: Option,
+}
+
+impl Default for GritFormatterSettings {
+ fn default() -> Self {
+ Self {
+ enabled: Some(false),
+ indent_style: Default::default(),
+ indent_width: Default::default(),
+ line_ending: Default::default(),
+ line_width: Default::default(),
+ }
+ }
+}
+
impl ServiceLanguage for GritLanguage {
- type FormatterSettings = ();
+ type FormatterSettings = GritFormatterSettings;
type LinterSettings = ();
type OrganizeImportsSettings = ();
type FormatOptions = GritFormatOptions;
@@ -30,13 +52,40 @@ impl ServiceLanguage for GritLanguage {
}
fn resolve_format_options(
- _global: Option<&crate::settings::FormatSettings>,
- _overrides: Option<&crate::settings::OverrideSettings>,
- _language: Option<&Self::FormatterSettings>,
- _path: &biome_fs::BiomePath,
- _file_source: &super::DocumentFileSource,
+ global: Option<&crate::settings::FormatSettings>,
+ overrides: Option<&crate::settings::OverrideSettings>,
+ language: Option<&Self::FormatterSettings>,
+ path: &biome_fs::BiomePath,
+ file_source: &super::DocumentFileSource,
) -> Self::FormatOptions {
- GritFormatOptions::default()
+ let indent_style = language
+ .and_then(|l| l.indent_style)
+ .or(global.and_then(|g| g.indent_style))
+ .unwrap_or_default();
+ let line_width = language
+ .and_then(|l| l.line_width)
+ .or(global.and_then(|g| g.line_width))
+ .unwrap_or_default();
+ let indent_width = language
+ .and_then(|l| l.indent_width)
+ .or(global.and_then(|g| g.indent_width))
+ .unwrap_or_default();
+
+ let line_ending = language
+ .and_then(|l| l.line_ending)
+ .or(global.and_then(|g| g.line_ending))
+ .unwrap_or_default();
+
+ let options = GritFormatOptions::new(file_source.to_grit_file_source().unwrap_or_default())
+ .with_indent_style(indent_style)
+ .with_indent_width(indent_width)
+ .with_line_width(line_width)
+ .with_line_ending(line_ending);
+ if let Some(overrides) = overrides {
+ overrides.to_override_grit_format_options(path, options)
+ } else {
+ options
+ }
}
fn resolve_analyzer_options(
diff --git a/crates/biome_service/src/file_handlers/mod.rs b/crates/biome_service/src/file_handlers/mod.rs
index eb249430a9b6..adbc67c57024 100644
--- a/crates/biome_service/src/file_handlers/mod.rs
+++ b/crates/biome_service/src/file_handlers/mod.rs
@@ -317,6 +317,13 @@ impl DocumentFileSource {
}
}
+ pub fn to_grit_file_source(&self) -> Option {
+ match self {
+ DocumentFileSource::Grit(grit) => Some(*grit),
+ _ => None,
+ }
+ }
+
pub fn to_css_file_source(&self) -> Option {
match self {
DocumentFileSource::Css(css) => Some(*css),
diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
index e484d9e4134c..77089af01bcb 100644
--- a/crates/biome_service/src/settings.rs
+++ b/crates/biome_service/src/settings.rs
@@ -23,6 +23,7 @@ use biome_formatter::{
use biome_fs::BiomePath;
use biome_graphql_formatter::context::GraphqlFormatOptions;
use biome_graphql_syntax::GraphqlLanguage;
+use biome_grit_formatter::context::GritFormatOptions;
use biome_grit_syntax::GritLanguage;
use biome_html_formatter::HtmlFormatOptions;
use biome_html_syntax::HtmlLanguage;
@@ -1005,6 +1006,19 @@ impl OverrideSettings {
options
}
+ pub fn to_override_grit_format_options(
+ &self,
+ path: &Path,
+ mut options: GritFormatOptions,
+ ) -> GritFormatOptions {
+ for pattern in self.patterns.iter() {
+ if pattern.include.matches_path(path) && !pattern.exclude.matches_path(path) {
+ pattern.apply_overrides_to_grit_format_options(&mut options);
+ }
+ }
+ options
+ }
+
pub fn to_override_html_format_options(
&self,
path: &Path,
@@ -1168,6 +1182,7 @@ pub struct OverrideSettingPattern {
pub(crate) cached_js_format_options: RwLock>,
pub(crate) cached_json_format_options: RwLock>,
pub(crate) cached_css_format_options: RwLock>,
+ pub(crate) cached_grit_format_options: RwLock>,
pub(crate) cached_graphql_format_options: RwLock>,
pub(crate) cached_html_format_options: RwLock
+ ///