Skip to content

Commit d413da0

Browse files
JounQinJounQin
committed
feat(prettier-plugin-toml): load tombit 0.1.3 and cover [[overrides]]
tombit 0.1.3 applies a matching `[[overrides]]`'s format/lint rules over the base rules. Bump the dependency, add a plugin-level regression test, and note the requirement in the changeset.
1 parent e679712 commit d413da0

3 files changed

Lines changed: 149 additions & 99 deletions

File tree

‎packages/toml/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"prettier": "^3.0.3"
4242
},
4343
"dependencies": {
44-
"tombit": "^0.1.1"
44+
"tombit": "^0.1.3"
4545
},
4646
"publishConfig": {
4747
"access": "public"

‎packages/toml/test/overrides.spec.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import fs from 'node:fs'
2+
import os from 'node:os'
3+
import path from 'node:path'
4+
5+
import { format } from 'prettier'
6+
import { afterEach, describe, expect, it } from 'vitest'
7+
8+
import TomlPlugin from 'prettier-plugin-toml'
9+
10+
describe('overrides', () => {
11+
const dirs: string[] = []
12+
13+
afterEach(() => {
14+
for (const dir of dirs) {
15+
fs.rmSync(dir, { force: true, recursive: true })
16+
}
17+
18+
dirs.length = 0
19+
})
20+
21+
it('should apply a matching `[[overrides]]`', async () => {
22+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'tombi-overrides-'))
23+
dirs.push(dir)
24+
fs.writeFileSync(
25+
path.join(dir, 'tombi.toml'),
26+
[
27+
'[format.rules]',
28+
'indent-table-key-value-pairs = true',
29+
'indent-width = 4',
30+
'',
31+
'[[overrides]]',
32+
'files.include = ["*.toml"]',
33+
'',
34+
'[overrides.format.rules]',
35+
'indent-width = 6',
36+
'',
37+
].join('\n'),
38+
)
39+
const filepath = path.join(dir, 'a.toml')
40+
fs.writeFileSync(filepath, '[t]\nkey = 1\n')
41+
42+
await expect(
43+
format('[t]\nkey = 1\n', {
44+
filepath,
45+
parser: 'toml',
46+
plugins: [TomlPlugin],
47+
}),
48+
).resolves.toBe('[t]\n key = 1\n')
49+
})
50+
})

‎yarn.lock‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -4892,163 +4892,163 @@ __metadata:
48924892
languageName: node
48934893
linkType: hard
48944894

4895-
"@tombit/binding-android-arm-eabi@npm:0.1.1":
4896-
version: 0.1.1
4897-
resolution: "@tombit/binding-android-arm-eabi@npm:0.1.1"
4895+
"@tombit/binding-android-arm-eabi@npm:0.1.3":
4896+
version: 0.1.3
4897+
resolution: "@tombit/binding-android-arm-eabi@npm:0.1.3"
48984898
conditions: os=android & cpu=arm
48994899
languageName: node
49004900
linkType: hard
49014901

4902-
"@tombit/binding-android-arm64@npm:0.1.1":
4903-
version: 0.1.1
4904-
resolution: "@tombit/binding-android-arm64@npm:0.1.1"
4902+
"@tombit/binding-android-arm64@npm:0.1.3":
4903+
version: 0.1.3
4904+
resolution: "@tombit/binding-android-arm64@npm:0.1.3"
49054905
conditions: os=android & cpu=arm64
49064906
languageName: node
49074907
linkType: hard
49084908

4909-
"@tombit/binding-darwin-arm64@npm:0.1.1":
4910-
version: 0.1.1
4911-
resolution: "@tombit/binding-darwin-arm64@npm:0.1.1"
4909+
"@tombit/binding-darwin-arm64@npm:0.1.3":
4910+
version: 0.1.3
4911+
resolution: "@tombit/binding-darwin-arm64@npm:0.1.3"
49124912
conditions: os=darwin & cpu=arm64
49134913
languageName: node
49144914
linkType: hard
49154915

4916-
"@tombit/binding-darwin-x64@npm:0.1.1":
4917-
version: 0.1.1
4918-
resolution: "@tombit/binding-darwin-x64@npm:0.1.1"
4916+
"@tombit/binding-darwin-x64@npm:0.1.3":
4917+
version: 0.1.3
4918+
resolution: "@tombit/binding-darwin-x64@npm:0.1.3"
49194919
conditions: os=darwin & cpu=x64
49204920
languageName: node
49214921
linkType: hard
49224922

4923-
"@tombit/binding-freebsd-x64@npm:0.1.1":
4924-
version: 0.1.1
4925-
resolution: "@tombit/binding-freebsd-x64@npm:0.1.1"
4923+
"@tombit/binding-freebsd-x64@npm:0.1.3":
4924+
version: 0.1.3
4925+
resolution: "@tombit/binding-freebsd-x64@npm:0.1.3"
49264926
conditions: os=freebsd & cpu=x64
49274927
languageName: node
49284928
linkType: hard
49294929

4930-
"@tombit/binding-linux-arm-gnueabihf@npm:0.1.1":
4931-
version: 0.1.1
4932-
resolution: "@tombit/binding-linux-arm-gnueabihf@npm:0.1.1"
4930+
"@tombit/binding-linux-arm-gnueabihf@npm:0.1.3":
4931+
version: 0.1.3
4932+
resolution: "@tombit/binding-linux-arm-gnueabihf@npm:0.1.3"
49334933
conditions: os=linux & cpu=arm
49344934
languageName: node
49354935
linkType: hard
49364936

4937-
"@tombit/binding-linux-arm-musleabihf@npm:0.1.1":
4938-
version: 0.1.1
4939-
resolution: "@tombit/binding-linux-arm-musleabihf@npm:0.1.1"
4937+
"@tombit/binding-linux-arm-musleabihf@npm:0.1.3":
4938+
version: 0.1.3
4939+
resolution: "@tombit/binding-linux-arm-musleabihf@npm:0.1.3"
49404940
conditions: os=linux & cpu=arm
49414941
languageName: node
49424942
linkType: hard
49434943

4944-
"@tombit/binding-linux-arm64-gnu@npm:0.1.1":
4945-
version: 0.1.1
4946-
resolution: "@tombit/binding-linux-arm64-gnu@npm:0.1.1"
4944+
"@tombit/binding-linux-arm64-gnu@npm:0.1.3":
4945+
version: 0.1.3
4946+
resolution: "@tombit/binding-linux-arm64-gnu@npm:0.1.3"
49474947
conditions: os=linux & cpu=arm64 & libc=glibc
49484948
languageName: node
49494949
linkType: hard
49504950

4951-
"@tombit/binding-linux-arm64-musl@npm:0.1.1":
4952-
version: 0.1.1
4953-
resolution: "@tombit/binding-linux-arm64-musl@npm:0.1.1"
4951+
"@tombit/binding-linux-arm64-musl@npm:0.1.3":
4952+
version: 0.1.3
4953+
resolution: "@tombit/binding-linux-arm64-musl@npm:0.1.3"
49544954
conditions: os=linux & cpu=arm64 & libc=musl
49554955
languageName: node
49564956
linkType: hard
49574957

4958-
"@tombit/binding-linux-loong64-gnu@npm:0.1.1":
4959-
version: 0.1.1
4960-
resolution: "@tombit/binding-linux-loong64-gnu@npm:0.1.1"
4958+
"@tombit/binding-linux-loong64-gnu@npm:0.1.3":
4959+
version: 0.1.3
4960+
resolution: "@tombit/binding-linux-loong64-gnu@npm:0.1.3"
49614961
conditions: os=linux & cpu=loong64 & libc=glibc
49624962
languageName: node
49634963
linkType: hard
49644964

4965-
"@tombit/binding-linux-loong64-musl@npm:0.1.1":
4966-
version: 0.1.1
4967-
resolution: "@tombit/binding-linux-loong64-musl@npm:0.1.1"
4965+
"@tombit/binding-linux-loong64-musl@npm:0.1.3":
4966+
version: 0.1.3
4967+
resolution: "@tombit/binding-linux-loong64-musl@npm:0.1.3"
49684968
conditions: os=linux & cpu=loong64 & libc=musl
49694969
languageName: node
49704970
linkType: hard
49714971

4972-
"@tombit/binding-linux-ppc64-gnu@npm:0.1.1":
4973-
version: 0.1.1
4974-
resolution: "@tombit/binding-linux-ppc64-gnu@npm:0.1.1"
4972+
"@tombit/binding-linux-ppc64-gnu@npm:0.1.3":
4973+
version: 0.1.3
4974+
resolution: "@tombit/binding-linux-ppc64-gnu@npm:0.1.3"
49754975
conditions: os=linux & cpu=ppc64 & libc=glibc
49764976
languageName: node
49774977
linkType: hard
49784978

4979-
"@tombit/binding-linux-ppc64-musl@npm:0.1.1":
4980-
version: 0.1.1
4981-
resolution: "@tombit/binding-linux-ppc64-musl@npm:0.1.1"
4979+
"@tombit/binding-linux-ppc64-musl@npm:0.1.3":
4980+
version: 0.1.3
4981+
resolution: "@tombit/binding-linux-ppc64-musl@npm:0.1.3"
49824982
conditions: os=linux & cpu=ppc64 & libc=musl
49834983
languageName: node
49844984
linkType: hard
49854985

4986-
"@tombit/binding-linux-riscv64-gnu@npm:0.1.1":
4987-
version: 0.1.1
4988-
resolution: "@tombit/binding-linux-riscv64-gnu@npm:0.1.1"
4986+
"@tombit/binding-linux-riscv64-gnu@npm:0.1.3":
4987+
version: 0.1.3
4988+
resolution: "@tombit/binding-linux-riscv64-gnu@npm:0.1.3"
49894989
conditions: os=linux & cpu=riscv64 & libc=glibc
49904990
languageName: node
49914991
linkType: hard
49924992

4993-
"@tombit/binding-linux-riscv64-musl@npm:0.1.1":
4994-
version: 0.1.1
4995-
resolution: "@tombit/binding-linux-riscv64-musl@npm:0.1.1"
4993+
"@tombit/binding-linux-riscv64-musl@npm:0.1.3":
4994+
version: 0.1.3
4995+
resolution: "@tombit/binding-linux-riscv64-musl@npm:0.1.3"
49964996
conditions: os=linux & cpu=riscv64 & libc=musl
49974997
languageName: node
49984998
linkType: hard
49994999

5000-
"@tombit/binding-linux-s390x-gnu@npm:0.1.1":
5001-
version: 0.1.1
5002-
resolution: "@tombit/binding-linux-s390x-gnu@npm:0.1.1"
5000+
"@tombit/binding-linux-s390x-gnu@npm:0.1.3":
5001+
version: 0.1.3
5002+
resolution: "@tombit/binding-linux-s390x-gnu@npm:0.1.3"
50035003
conditions: os=linux & cpu=s390x & libc=glibc
50045004
languageName: node
50055005
linkType: hard
50065006

5007-
"@tombit/binding-linux-x64-gnu@npm:0.1.1":
5008-
version: 0.1.1
5009-
resolution: "@tombit/binding-linux-x64-gnu@npm:0.1.1"
5007+
"@tombit/binding-linux-x64-gnu@npm:0.1.3":
5008+
version: 0.1.3
5009+
resolution: "@tombit/binding-linux-x64-gnu@npm:0.1.3"
50105010
conditions: os=linux & cpu=x64 & libc=glibc
50115011
languageName: node
50125012
linkType: hard
50135013

5014-
"@tombit/binding-linux-x64-musl@npm:0.1.1":
5015-
version: 0.1.1
5016-
resolution: "@tombit/binding-linux-x64-musl@npm:0.1.1"
5014+
"@tombit/binding-linux-x64-musl@npm:0.1.3":
5015+
version: 0.1.3
5016+
resolution: "@tombit/binding-linux-x64-musl@npm:0.1.3"
50175017
conditions: os=linux & cpu=x64 & libc=musl
50185018
languageName: node
50195019
linkType: hard
50205020

5021-
"@tombit/binding-openharmony-arm64@npm:0.1.1":
5022-
version: 0.1.1
5023-
resolution: "@tombit/binding-openharmony-arm64@npm:0.1.1"
5021+
"@tombit/binding-openharmony-arm64@npm:0.1.3":
5022+
version: 0.1.3
5023+
resolution: "@tombit/binding-openharmony-arm64@npm:0.1.3"
50245024
conditions: os=openharmony & cpu=arm64
50255025
languageName: node
50265026
linkType: hard
50275027

5028-
"@tombit/binding-openharmony-x64@npm:0.1.1":
5029-
version: 0.1.1
5030-
resolution: "@tombit/binding-openharmony-x64@npm:0.1.1"
5028+
"@tombit/binding-openharmony-x64@npm:0.1.3":
5029+
version: 0.1.3
5030+
resolution: "@tombit/binding-openharmony-x64@npm:0.1.3"
50315031
conditions: os=openharmony & cpu=x64
50325032
languageName: node
50335033
linkType: hard
50345034

5035-
"@tombit/binding-win32-arm64-msvc@npm:0.1.1":
5036-
version: 0.1.1
5037-
resolution: "@tombit/binding-win32-arm64-msvc@npm:0.1.1"
5035+
"@tombit/binding-win32-arm64-msvc@npm:0.1.3":
5036+
version: 0.1.3
5037+
resolution: "@tombit/binding-win32-arm64-msvc@npm:0.1.3"
50385038
conditions: os=win32 & cpu=arm64
50395039
languageName: node
50405040
linkType: hard
50415041

5042-
"@tombit/binding-win32-ia32-msvc@npm:0.1.1":
5043-
version: 0.1.1
5044-
resolution: "@tombit/binding-win32-ia32-msvc@npm:0.1.1"
5042+
"@tombit/binding-win32-ia32-msvc@npm:0.1.3":
5043+
version: 0.1.3
5044+
resolution: "@tombit/binding-win32-ia32-msvc@npm:0.1.3"
50455045
conditions: os=win32 & cpu=ia32
50465046
languageName: node
50475047
linkType: hard
50485048

5049-
"@tombit/binding-win32-x64-msvc@npm:0.1.1":
5050-
version: 0.1.1
5051-
resolution: "@tombit/binding-win32-x64-msvc@npm:0.1.1"
5049+
"@tombit/binding-win32-x64-msvc@npm:0.1.3":
5050+
version: 0.1.3
5051+
resolution: "@tombit/binding-win32-x64-msvc@npm:0.1.3"
50525052
conditions: os=win32 & cpu=x64
50535053
languageName: node
50545054
linkType: hard
@@ -12791,7 +12791,7 @@ __metadata:
1279112791
version: 0.0.0-use.local
1279212792
resolution: "prettier-plugin-toml@workspace:packages/toml"
1279312793
dependencies:
12794-
tombit: "npm:^0.1.1"
12794+
tombit: "npm:^0.1.3"
1279512795
peerDependencies:
1279612796
prettier: ^3.0.3
1279712797
languageName: unknown
@@ -15122,33 +15122,33 @@ __metadata:
1512215122
languageName: node
1512315123
linkType: hard
1512415124

15125-
"tombit@npm:^0.1.1":
15126-
version: 0.1.1
15127-
resolution: "tombit@npm:0.1.1"
15128-
dependencies:
15129-
"@tombit/binding-android-arm-eabi": "npm:0.1.1"
15130-
"@tombit/binding-android-arm64": "npm:0.1.1"
15131-
"@tombit/binding-darwin-arm64": "npm:0.1.1"
15132-
"@tombit/binding-darwin-x64": "npm:0.1.1"
15133-
"@tombit/binding-freebsd-x64": "npm:0.1.1"
15134-
"@tombit/binding-linux-arm-gnueabihf": "npm:0.1.1"
15135-
"@tombit/binding-linux-arm-musleabihf": "npm:0.1.1"
15136-
"@tombit/binding-linux-arm64-gnu": "npm:0.1.1"
15137-
"@tombit/binding-linux-arm64-musl": "npm:0.1.1"
15138-
"@tombit/binding-linux-loong64-gnu": "npm:0.1.1"
15139-
"@tombit/binding-linux-loong64-musl": "npm:0.1.1"
15140-
"@tombit/binding-linux-ppc64-gnu": "npm:0.1.1"
15141-
"@tombit/binding-linux-ppc64-musl": "npm:0.1.1"
15142-
"@tombit/binding-linux-riscv64-gnu": "npm:0.1.1"
15143-
"@tombit/binding-linux-riscv64-musl": "npm:0.1.1"
15144-
"@tombit/binding-linux-s390x-gnu": "npm:0.1.1"
15145-
"@tombit/binding-linux-x64-gnu": "npm:0.1.1"
15146-
"@tombit/binding-linux-x64-musl": "npm:0.1.1"
15147-
"@tombit/binding-openharmony-arm64": "npm:0.1.1"
15148-
"@tombit/binding-openharmony-x64": "npm:0.1.1"
15149-
"@tombit/binding-win32-arm64-msvc": "npm:0.1.1"
15150-
"@tombit/binding-win32-ia32-msvc": "npm:0.1.1"
15151-
"@tombit/binding-win32-x64-msvc": "npm:0.1.1"
15125+
"tombit@npm:^0.1.3":
15126+
version: 0.1.3
15127+
resolution: "tombit@npm:0.1.3"
15128+
dependencies:
15129+
"@tombit/binding-android-arm-eabi": "npm:0.1.3"
15130+
"@tombit/binding-android-arm64": "npm:0.1.3"
15131+
"@tombit/binding-darwin-arm64": "npm:0.1.3"
15132+
"@tombit/binding-darwin-x64": "npm:0.1.3"
15133+
"@tombit/binding-freebsd-x64": "npm:0.1.3"
15134+
"@tombit/binding-linux-arm-gnueabihf": "npm:0.1.3"
15135+
"@tombit/binding-linux-arm-musleabihf": "npm:0.1.3"
15136+
"@tombit/binding-linux-arm64-gnu": "npm:0.1.3"
15137+
"@tombit/binding-linux-arm64-musl": "npm:0.1.3"
15138+
"@tombit/binding-linux-loong64-gnu": "npm:0.1.3"
15139+
"@tombit/binding-linux-loong64-musl": "npm:0.1.3"
15140+
"@tombit/binding-linux-ppc64-gnu": "npm:0.1.3"
15141+
"@tombit/binding-linux-ppc64-musl": "npm:0.1.3"
15142+
"@tombit/binding-linux-riscv64-gnu": "npm:0.1.3"
15143+
"@tombit/binding-linux-riscv64-musl": "npm:0.1.3"
15144+
"@tombit/binding-linux-s390x-gnu": "npm:0.1.3"
15145+
"@tombit/binding-linux-x64-gnu": "npm:0.1.3"
15146+
"@tombit/binding-linux-x64-musl": "npm:0.1.3"
15147+
"@tombit/binding-openharmony-arm64": "npm:0.1.3"
15148+
"@tombit/binding-openharmony-x64": "npm:0.1.3"
15149+
"@tombit/binding-win32-arm64-msvc": "npm:0.1.3"
15150+
"@tombit/binding-win32-ia32-msvc": "npm:0.1.3"
15151+
"@tombit/binding-win32-x64-msvc": "npm:0.1.3"
1515215152
dependenciesMeta:
1515315153
"@tombit/binding-android-arm-eabi":
1515415154
optional: true
@@ -15196,7 +15196,7 @@ __metadata:
1519615196
optional: true
1519715197
"@tombit/binding-win32-x64-msvc":
1519815198
optional: true
15199-
checksum: 10c0/853ec8bd34815490e0308f0caa9e56d780692426955112e627edcc97266bed37e692bda612da216f1434bb8842eefd2a63bb047844d9a0ab89cbf5c35de38c37
15199+
checksum: 10c0/ae4a4e77a318c16a7718d9b2919a0236c16b305297d6adc058c787ba8a4fdea9472cbceebeaad20a4f2efcc063fc495604254213bf409874aac6a937113a85c9
1520015200
languageName: node
1520115201
linkType: hard
1520215202

0 commit comments

Comments
 (0)