diff --git a/.lintstagedrc b/.lintstagedrc index 691f6e0eb0e5..c4eebcd2f404 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -1,5 +1,3 @@ { - "*.{ts,mts,cts,tsx,js,mjs,cjs,jsx,json,md,css}": [ - "prettier --write" - ] + "*.{ts,mts,cts,tsx,js,mjs,cjs,jsx,json,md,css}": ["prettier --write"] } diff --git a/.prettierignore b/.prettierignore index bb855f41157a..637f32f77bfc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,10 +12,6 @@ packages/eslint-plugin/src/configs/*.json CONTRIBUTORS.md packages/ast-spec/src/*/*/fixtures/_error_/*/fixture.ts -# prettier doesn't yet support satisfies -packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/ -packages/scope-manager/tests/fixtures/type-assertion/satisfies.ts - # Ignore CHANGELOG.md files to avoid issues with automated release job CHANGELOG.md diff --git a/package.json b/package.json index bddf6b4fe48c..30b2b224022b 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "ncp": "^2.0.0", "nx": "14.8.4", "patch-package": "^6.4.7", - "prettier": "2.7.1", + "prettier": "2.8.0", "pretty-format": "^29.0.3", "rimraf": "^3.0.2", "tmp": "^0.2.1", diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/fixture.ts index 917317da825e..36e81ab9edbd 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/fixture.ts @@ -1 +1 @@ -[1,2,3] satisfies [1, 2, 3]; +[1, 2, 3] satisfies [1, 2, 3]; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/1-TSESTree-AST.shot index 8c0e41971eaa..cfbfed088ce2 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/1-TSESTree-AST.shot @@ -27,10 +27,10 @@ Program { raw: "2", value: 2, - range: [3, 4], + range: [4, 5], loc: { - start: { column: 3, line: 1 }, - end: { column: 4, line: 1 }, + start: { column: 4, line: 1 }, + end: { column: 5, line: 1 }, }, }, Literal { @@ -38,18 +38,18 @@ Program { raw: "3", value: 3, - range: [5, 6], + range: [7, 8], loc: { - start: { column: 5, line: 1 }, - end: { column: 6, line: 1 }, + start: { column: 7, line: 1 }, + end: { column: 8, line: 1 }, }, }, ], - range: [0, 7], + range: [0, 9], loc: { start: { column: 0, line: 1 }, - end: { column: 7, line: 1 }, + end: { column: 9, line: 1 }, }, }, typeAnnotation: TSTupleType { @@ -62,17 +62,17 @@ Program { raw: "1", value: 1, - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, TSLiteralType { @@ -82,17 +82,17 @@ Program { raw: "2", value: 2, - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, TSLiteralType { @@ -102,45 +102,45 @@ Program { raw: "3", value: 3, - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, ], - range: [18, 27], + range: [20, 29], loc: { - start: { column: 18, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [0, 27], + range: [0, 29], loc: { start: { column: 0, line: 1 }, - end: { column: 27, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, - end: { column: 28, line: 1 }, + end: { column: 30, line: 1 }, }, }, ], sourceType: "script", - range: [0, 29], + range: [0, 31], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/2-TSESTree-Tokens.shot index 1bde181188ca..b4adbaf21bb9 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/2-TSESTree-Tokens.shot @@ -36,130 +36,130 @@ Array [ type: "Numeric", value: "2", - range: [3, 4], + range: [4, 5], loc: { - start: { column: 3, line: 1 }, - end: { column: 4, line: 1 }, + start: { column: 4, line: 1 }, + end: { column: 5, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [4, 5], + range: [5, 6], loc: { - start: { column: 4, line: 1 }, - end: { column: 5, line: 1 }, + start: { column: 5, line: 1 }, + end: { column: 6, line: 1 }, }, }, Numeric { type: "Numeric", value: "3", - range: [5, 6], + range: [7, 8], loc: { - start: { column: 5, line: 1 }, - end: { column: 6, line: 1 }, + start: { column: 7, line: 1 }, + end: { column: 8, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "]", - range: [6, 7], + range: [8, 9], loc: { - start: { column: 6, line: 1 }, - end: { column: 7, line: 1 }, + start: { column: 8, line: 1 }, + end: { column: 9, line: 1 }, }, }, Identifier { type: "Identifier", value: "satisfies", - range: [8, 17], + range: [10, 19], loc: { - start: { column: 8, line: 1 }, - end: { column: 17, line: 1 }, + start: { column: 10, line: 1 }, + end: { column: 19, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "[", - range: [18, 19], + range: [20, 21], loc: { - start: { column: 18, line: 1 }, - end: { column: 19, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 21, line: 1 }, }, }, Numeric { type: "Numeric", value: "1", - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [20, 21], + range: [22, 23], loc: { - start: { column: 20, line: 1 }, - end: { column: 21, line: 1 }, + start: { column: 22, line: 1 }, + end: { column: 23, line: 1 }, }, }, Numeric { type: "Numeric", value: "2", - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [23, 24], + range: [25, 26], loc: { - start: { column: 23, line: 1 }, - end: { column: 24, line: 1 }, + start: { column: 25, line: 1 }, + end: { column: 26, line: 1 }, }, }, Numeric { type: "Numeric", value: "3", - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "]", - range: [26, 27], + range: [28, 29], loc: { - start: { column: 26, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 28, line: 1 }, + end: { column: 29, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [27, 28], + range: [29, 30], loc: { - start: { column: 27, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 29, line: 1 }, + end: { column: 30, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/3-Babel-AST.shot index d7f5aec514ed..635240ef2dd1 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/3-Babel-AST.shot @@ -27,10 +27,10 @@ Program { raw: "2", value: 2, - range: [3, 4], + range: [4, 5], loc: { - start: { column: 3, line: 1 }, - end: { column: 4, line: 1 }, + start: { column: 4, line: 1 }, + end: { column: 5, line: 1 }, }, }, Literal { @@ -38,18 +38,18 @@ Program { raw: "3", value: 3, - range: [5, 6], + range: [7, 8], loc: { - start: { column: 5, line: 1 }, - end: { column: 6, line: 1 }, + start: { column: 7, line: 1 }, + end: { column: 8, line: 1 }, }, }, ], - range: [0, 7], + range: [0, 9], loc: { start: { column: 0, line: 1 }, - end: { column: 7, line: 1 }, + end: { column: 9, line: 1 }, }, }, typeAnnotation: TSTupleType { @@ -62,17 +62,17 @@ Program { raw: "1", value: 1, - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, TSLiteralType { @@ -82,17 +82,17 @@ Program { raw: "2", value: 2, - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, TSLiteralType { @@ -102,45 +102,45 @@ Program { raw: "3", value: 3, - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, ], - range: [18, 27], + range: [20, 29], loc: { - start: { column: 18, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [0, 27], + range: [0, 29], loc: { start: { column: 0, line: 1 }, - end: { column: 27, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, - end: { column: 28, line: 1 }, + end: { column: 30, line: 1 }, }, }, ], sourceType: "script", - range: [0, 29], + range: [0, 31], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/4-Babel-Tokens.shot index 02abe5d8cba1..814b7c0915b2 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/array-array/snapshots/4-Babel-Tokens.shot @@ -36,130 +36,130 @@ Array [ type: "Numeric", value: "2", - range: [3, 4], + range: [4, 5], loc: { - start: { column: 3, line: 1 }, - end: { column: 4, line: 1 }, + start: { column: 4, line: 1 }, + end: { column: 5, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [4, 5], + range: [5, 6], loc: { - start: { column: 4, line: 1 }, - end: { column: 5, line: 1 }, + start: { column: 5, line: 1 }, + end: { column: 6, line: 1 }, }, }, Numeric { type: "Numeric", value: "3", - range: [5, 6], + range: [7, 8], loc: { - start: { column: 5, line: 1 }, - end: { column: 6, line: 1 }, + start: { column: 7, line: 1 }, + end: { column: 8, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "]", - range: [6, 7], + range: [8, 9], loc: { - start: { column: 6, line: 1 }, - end: { column: 7, line: 1 }, + start: { column: 8, line: 1 }, + end: { column: 9, line: 1 }, }, }, Identifier { type: "Identifier", value: "satisfies", - range: [8, 17], + range: [10, 19], loc: { - start: { column: 8, line: 1 }, - end: { column: 17, line: 1 }, + start: { column: 10, line: 1 }, + end: { column: 19, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "[", - range: [18, 19], + range: [20, 21], loc: { - start: { column: 18, line: 1 }, - end: { column: 19, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 21, line: 1 }, }, }, Numeric { type: "Numeric", value: "1", - range: [19, 20], + range: [21, 22], loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 22, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [20, 21], + range: [22, 23], loc: { - start: { column: 20, line: 1 }, - end: { column: 21, line: 1 }, + start: { column: 22, line: 1 }, + end: { column: 23, line: 1 }, }, }, Numeric { type: "Numeric", value: "2", - range: [22, 23], + range: [24, 25], loc: { - start: { column: 22, line: 1 }, - end: { column: 23, line: 1 }, + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ",", - range: [23, 24], + range: [25, 26], loc: { - start: { column: 23, line: 1 }, - end: { column: 24, line: 1 }, + start: { column: 25, line: 1 }, + end: { column: 26, line: 1 }, }, }, Numeric { type: "Numeric", value: "3", - range: [25, 26], + range: [27, 28], loc: { - start: { column: 25, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "]", - range: [26, 27], + range: [28, 29], loc: { - start: { column: 26, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 28, line: 1 }, + end: { column: 29, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [27, 28], + range: [29, 30], loc: { - start: { column: 27, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 29, line: 1 }, + end: { column: 30, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/fixture.ts index 8478834cb780..23c6cdf5a50c 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/fixture.ts @@ -1 +1 @@ -() => 1 satisfies number +() => 1 satisfies number; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/1-TSESTree-AST.shot index 57067f8fbff5..d678e2b5acef 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/1-TSESTree-AST.shot @@ -50,16 +50,16 @@ Program { }, }, - range: [0, 24], + range: [0, 25], loc: { start: { column: 0, line: 1 }, - end: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, ], sourceType: "script", - range: [0, 25], + range: [0, 26], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/2-TSESTree-Tokens.shot index 09102ae267b1..0d642d948246 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/2-TSESTree-Tokens.shot @@ -62,5 +62,15 @@ Array [ end: { column: 24, line: 1 }, }, }, + Punctuator { + type: "Punctuator", + value: ";", + + range: [24, 25], + loc: { + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, + }, + }, ] `; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/3-Babel-AST.shot index 1ef0e54b35d8..55e90ce71c0c 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/3-Babel-AST.shot @@ -50,16 +50,16 @@ Program { }, }, - range: [0, 24], + range: [0, 25], loc: { start: { column: 0, line: 1 }, - end: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, }, }, ], sourceType: "script", - range: [0, 25], + range: [0, 26], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/4-Babel-Tokens.shot index 24cc5b2042ed..c921c840faaf 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-no-parentheses/snapshots/4-Babel-Tokens.shot @@ -62,5 +62,15 @@ Array [ end: { column: 24, line: 1 }, }, }, + Punctuator { + type: "Punctuator", + value: ";", + + range: [24, 25], + loc: { + start: { column: 24, line: 1 }, + end: { column: 25, line: 1 }, + }, + }, ] `; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/fixture.ts index 15624b9aaf34..d0e16762720a 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/fixture.ts @@ -1 +1 @@ -(() => 1) satisfies () => number +(() => 1) satisfies () => number; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/1-TSESTree-AST.shot index 7fa95a22000e..193cbbd12e38 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/1-TSESTree-AST.shot @@ -69,16 +69,16 @@ Program { }, }, - range: [0, 32], + range: [0, 33], loc: { start: { column: 0, line: 1 }, - end: { column: 32, line: 1 }, + end: { column: 33, line: 1 }, }, }, ], sourceType: "script", - range: [0, 33], + range: [0, 34], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/2-TSESTree-Tokens.shot index b590cfdea64d..7e75dcaa2c0c 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/2-TSESTree-Tokens.shot @@ -112,5 +112,15 @@ Array [ end: { column: 32, line: 1 }, }, }, + Punctuator { + type: "Punctuator", + value: ";", + + range: [32, 33], + loc: { + start: { column: 32, line: 1 }, + end: { column: 33, line: 1 }, + }, + }, ] `; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/3-Babel-AST.shot index 71627f35b044..7bddc387f4cf 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/3-Babel-AST.shot @@ -69,16 +69,16 @@ Program { }, }, - range: [0, 32], + range: [0, 33], loc: { start: { column: 0, line: 1 }, - end: { column: 32, line: 1 }, + end: { column: 33, line: 1 }, }, }, ], sourceType: "script", - range: [0, 33], + range: [0, 34], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/4-Babel-Tokens.shot index 58d8821988a5..5edb3e0a8411 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/4-Babel-Tokens.shot @@ -112,5 +112,15 @@ Array [ end: { column: 32, line: 1 }, }, }, + Punctuator { + type: "Punctuator", + value: ";", + + range: [32, 33], + loc: { + start: { column: 32, line: 1 }, + end: { column: 33, line: 1 }, + }, + }, ] `; diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/5-AST-Alignment-AST.shot index b45b591c63da..1999cc34c680 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/arrow-func-with-parentheses/snapshots/5-AST-Alignment-AST.shot @@ -75,16 +75,16 @@ exports[`AST Fixtures expression TSSatisfiesExpression arrow-func-with-parenthes }, }, - range: [0, 32], + range: [0, 33], loc: { start: { column: 0, line: 1 }, - end: { column: 32, line: 1 }, + end: { column: 33, line: 1 }, }, }, ], sourceType: 'script', - range: [0, 33], + range: [0, 34], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/fixture.ts index 6ead32331fa4..dc8407dc0d6c 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/fixture.ts @@ -1 +1 @@ -foo ? 1 : 0 satisfies number; +foo ? 1 : (0 satisfies number); diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/1-TSESTree-AST.shot index 5674f78acdf1..bb649ea977d4 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/1-TSESTree-AST.shot @@ -15,26 +15,26 @@ Program { raw: "0", value: 0, - range: [10, 11], + range: [11, 12], loc: { - start: { column: 10, line: 1 }, - end: { column: 11, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 12, line: 1 }, }, }, typeAnnotation: TSNumberKeyword { type: "TSNumberKeyword", - range: [22, 28], + range: [23, 29], loc: { - start: { column: 22, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 23, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [10, 28], + range: [11, 29], loc: { - start: { column: 10, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 29, line: 1 }, }, }, consequent: Literal { @@ -59,23 +59,23 @@ Program { }, }, - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, - end: { column: 28, line: 1 }, + end: { column: 30, line: 1 }, }, }, - range: [0, 29], + range: [0, 31], loc: { start: { column: 0, line: 1 }, - end: { column: 29, line: 1 }, + end: { column: 31, line: 1 }, }, }, ], sourceType: "script", - range: [0, 30], + range: [0, 32], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/2-TSESTree-Tokens.shot index 579fa0c06152..43f6da6a6806 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/2-TSESTree-Tokens.shot @@ -42,9 +42,9 @@ Array [ end: { column: 9, line: 1 }, }, }, - Numeric { - type: "Numeric", - value: "0", + Punctuator { + type: "Punctuator", + value: "(", range: [10, 11], loc: { @@ -52,34 +52,54 @@ Array [ end: { column: 11, line: 1 }, }, }, + Numeric { + type: "Numeric", + value: "0", + + range: [11, 12], + loc: { + start: { column: 11, line: 1 }, + end: { column: 12, line: 1 }, + }, + }, Identifier { type: "Identifier", value: "satisfies", - range: [12, 21], + range: [13, 22], loc: { - start: { column: 12, line: 1 }, - end: { column: 21, line: 1 }, + start: { column: 13, line: 1 }, + end: { column: 22, line: 1 }, }, }, Identifier { type: "Identifier", value: "number", - range: [22, 28], + range: [23, 29], + loc: { + start: { column: 23, line: 1 }, + end: { column: 29, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + + range: [29, 30], loc: { - start: { column: 22, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 29, line: 1 }, + end: { column: 30, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [28, 29], + range: [30, 31], loc: { - start: { column: 28, line: 1 }, - end: { column: 29, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 31, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/3-Babel-AST.shot index 9c3ff77da55f..4cba5b2f4f14 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/3-Babel-AST.shot @@ -15,26 +15,26 @@ Program { raw: "0", value: 0, - range: [10, 11], + range: [11, 12], loc: { - start: { column: 10, line: 1 }, - end: { column: 11, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 12, line: 1 }, }, }, typeAnnotation: TSNumberKeyword { type: "TSNumberKeyword", - range: [22, 28], + range: [23, 29], loc: { - start: { column: 22, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 23, line: 1 }, + end: { column: 29, line: 1 }, }, }, - range: [10, 28], + range: [11, 29], loc: { - start: { column: 10, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 29, line: 1 }, }, }, consequent: Literal { @@ -59,23 +59,23 @@ Program { }, }, - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, - end: { column: 28, line: 1 }, + end: { column: 30, line: 1 }, }, }, - range: [0, 29], + range: [0, 31], loc: { start: { column: 0, line: 1 }, - end: { column: 29, line: 1 }, + end: { column: 31, line: 1 }, }, }, ], sourceType: "script", - range: [0, 30], + range: [0, 32], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/4-Babel-Tokens.shot index d9c69f96e5ef..80d8c6ce89ea 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/conditional-no-parentheses/snapshots/4-Babel-Tokens.shot @@ -42,9 +42,9 @@ Array [ end: { column: 9, line: 1 }, }, }, - Numeric { - type: "Numeric", - value: "0", + Punctuator { + type: "Punctuator", + value: "(", range: [10, 11], loc: { @@ -52,34 +52,54 @@ Array [ end: { column: 11, line: 1 }, }, }, + Numeric { + type: "Numeric", + value: "0", + + range: [11, 12], + loc: { + start: { column: 11, line: 1 }, + end: { column: 12, line: 1 }, + }, + }, Identifier { type: "Identifier", value: "satisfies", - range: [12, 21], + range: [13, 22], loc: { - start: { column: 12, line: 1 }, - end: { column: 21, line: 1 }, + start: { column: 13, line: 1 }, + end: { column: 22, line: 1 }, }, }, Identifier { type: "Identifier", value: "number", - range: [22, 28], + range: [23, 29], + loc: { + start: { column: 23, line: 1 }, + end: { column: 29, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + + range: [29, 30], loc: { - start: { column: 22, line: 1 }, - end: { column: 28, line: 1 }, + start: { column: 29, line: 1 }, + end: { column: 30, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [28, 29], + range: [30, 31], loc: { - start: { column: 28, line: 1 }, - end: { column: 29, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 31, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/fixture.ts index 09a4c612e307..953653b0e23a 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/fixture.ts @@ -1 +1 @@ -foo === 1 satisfies number; +foo === (1 satisfies number); diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/1-TSESTree-AST.shot index f80151c90329..1ad1131264a4 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/1-TSESTree-AST.shot @@ -26,46 +26,46 @@ Program { raw: "1", value: 1, - range: [8, 9], + range: [9, 10], loc: { - start: { column: 8, line: 1 }, - end: { column: 9, line: 1 }, + start: { column: 9, line: 1 }, + end: { column: 10, line: 1 }, }, }, typeAnnotation: TSNumberKeyword { type: "TSNumberKeyword", - range: [20, 26], + range: [21, 27], loc: { - start: { column: 20, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 27, line: 1 }, }, }, - range: [8, 26], + range: [9, 27], loc: { - start: { column: 8, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 9, line: 1 }, + end: { column: 27, line: 1 }, }, }, - range: [0, 26], + range: [0, 28], loc: { start: { column: 0, line: 1 }, - end: { column: 26, line: 1 }, + end: { column: 28, line: 1 }, }, }, - range: [0, 27], + range: [0, 29], loc: { start: { column: 0, line: 1 }, - end: { column: 27, line: 1 }, + end: { column: 29, line: 1 }, }, }, ], sourceType: "script", - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/2-TSESTree-Tokens.shot index 5391022e27f0..f5e333ee1db9 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/2-TSESTree-Tokens.shot @@ -22,9 +22,9 @@ Array [ end: { column: 7, line: 1 }, }, }, - Numeric { - type: "Numeric", - value: "1", + Punctuator { + type: "Punctuator", + value: "(", range: [8, 9], loc: { @@ -32,34 +32,54 @@ Array [ end: { column: 9, line: 1 }, }, }, + Numeric { + type: "Numeric", + value: "1", + + range: [9, 10], + loc: { + start: { column: 9, line: 1 }, + end: { column: 10, line: 1 }, + }, + }, Identifier { type: "Identifier", value: "satisfies", - range: [10, 19], + range: [11, 20], loc: { - start: { column: 10, line: 1 }, - end: { column: 19, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 20, line: 1 }, }, }, Identifier { type: "Identifier", value: "number", - range: [20, 26], + range: [21, 27], + loc: { + start: { column: 21, line: 1 }, + end: { column: 27, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + + range: [27, 28], loc: { - start: { column: 20, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [26, 27], + range: [28, 29], loc: { - start: { column: 26, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 28, line: 1 }, + end: { column: 29, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/3-Babel-AST.shot index 60189a703583..a2add0503752 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/3-Babel-AST.shot @@ -26,46 +26,46 @@ Program { raw: "1", value: 1, - range: [8, 9], + range: [9, 10], loc: { - start: { column: 8, line: 1 }, - end: { column: 9, line: 1 }, + start: { column: 9, line: 1 }, + end: { column: 10, line: 1 }, }, }, typeAnnotation: TSNumberKeyword { type: "TSNumberKeyword", - range: [20, 26], + range: [21, 27], loc: { - start: { column: 20, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 21, line: 1 }, + end: { column: 27, line: 1 }, }, }, - range: [8, 26], + range: [9, 27], loc: { - start: { column: 8, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 9, line: 1 }, + end: { column: 27, line: 1 }, }, }, - range: [0, 26], + range: [0, 28], loc: { start: { column: 0, line: 1 }, - end: { column: 26, line: 1 }, + end: { column: 28, line: 1 }, }, }, - range: [0, 27], + range: [0, 29], loc: { start: { column: 0, line: 1 }, - end: { column: 27, line: 1 }, + end: { column: 29, line: 1 }, }, }, ], sourceType: "script", - range: [0, 28], + range: [0, 30], loc: { start: { column: 0, line: 1 }, end: { column: 0, line: 2 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/4-Babel-Tokens.shot index cac159f58dc3..e4fa1f6cea58 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/logical-no-parentheses/snapshots/4-Babel-Tokens.shot @@ -22,9 +22,9 @@ Array [ end: { column: 7, line: 1 }, }, }, - Numeric { - type: "Numeric", - value: "1", + Punctuator { + type: "Punctuator", + value: "(", range: [8, 9], loc: { @@ -32,34 +32,54 @@ Array [ end: { column: 9, line: 1 }, }, }, + Numeric { + type: "Numeric", + value: "1", + + range: [9, 10], + loc: { + start: { column: 9, line: 1 }, + end: { column: 10, line: 1 }, + }, + }, Identifier { type: "Identifier", value: "satisfies", - range: [10, 19], + range: [11, 20], loc: { - start: { column: 10, line: 1 }, - end: { column: 19, line: 1 }, + start: { column: 11, line: 1 }, + end: { column: 20, line: 1 }, }, }, Identifier { type: "Identifier", value: "number", - range: [20, 26], + range: [21, 27], + loc: { + start: { column: 21, line: 1 }, + end: { column: 27, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + + range: [27, 28], loc: { - start: { column: 20, line: 1 }, - end: { column: 26, line: 1 }, + start: { column: 27, line: 1 }, + end: { column: 28, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ";", - range: [26, 27], + range: [28, 29], loc: { - start: { column: 26, line: 1 }, - end: { column: 27, line: 1 }, + start: { column: 28, line: 1 }, + end: { column: 29, line: 1 }, }, }, ] diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/fixture.ts b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/fixture.ts index ec7b71c8e2b1..b7726f7f1404 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/fixture.ts +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/fixture.ts @@ -1 +1 @@ -({ prop: 'string' }) satisfies { prop: string }; +({ prop: 'string' } satisfies { prop: string }); diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/1-TSESTree-AST.shot index 1ed0e662a991..c39ffc049d11 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/1-TSESTree-AST.shot @@ -63,10 +63,10 @@ Program { type: "Identifier", name: "prop", - range: [33, 37], + range: [32, 36], loc: { - start: { column: 33, line: 1 }, - end: { column: 37, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 36, line: 1 }, }, }, typeAnnotation: TSTypeAnnotation { @@ -74,39 +74,39 @@ Program { typeAnnotation: TSStringKeyword { type: "TSStringKeyword", - range: [39, 45], + range: [38, 44], loc: { - start: { column: 39, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 38, line: 1 }, + end: { column: 44, line: 1 }, }, }, - range: [37, 45], + range: [36, 44], loc: { - start: { column: 37, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 36, line: 1 }, + end: { column: 44, line: 1 }, }, }, - range: [33, 45], + range: [32, 44], loc: { - start: { column: 33, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 44, line: 1 }, }, }, ], - range: [31, 47], + range: [30, 46], loc: { - start: { column: 31, line: 1 }, - end: { column: 47, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 46, line: 1 }, }, }, - range: [0, 47], + range: [1, 46], loc: { - start: { column: 0, line: 1 }, - end: { column: 47, line: 1 }, + start: { column: 1, line: 1 }, + end: { column: 46, line: 1 }, }, }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/2-TSESTree-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/2-TSESTree-Tokens.shot index 99f068a424bf..be50e77f2710 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/2-TSESTree-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/2-TSESTree-Tokens.shot @@ -62,70 +62,70 @@ Array [ end: { column: 19, line: 1 }, }, }, - Punctuator { - type: "Punctuator", - value: ")", - - range: [19, 20], - loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, - }, - }, Identifier { type: "Identifier", value: "satisfies", - range: [21, 30], + range: [20, 29], loc: { - start: { column: 21, line: 1 }, - end: { column: 30, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 29, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "{", - range: [31, 32], + range: [30, 31], loc: { - start: { column: 31, line: 1 }, - end: { column: 32, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 31, line: 1 }, }, }, Identifier { type: "Identifier", value: "prop", - range: [33, 37], + range: [32, 36], loc: { - start: { column: 33, line: 1 }, - end: { column: 37, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 36, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ":", - range: [37, 38], + range: [36, 37], loc: { - start: { column: 37, line: 1 }, - end: { column: 38, line: 1 }, + start: { column: 36, line: 1 }, + end: { column: 37, line: 1 }, }, }, Identifier { type: "Identifier", value: "string", - range: [39, 45], + range: [38, 44], loc: { - start: { column: 39, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 38, line: 1 }, + end: { column: 44, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "}", + range: [45, 46], + loc: { + start: { column: 45, line: 1 }, + end: { column: 46, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + range: [46, 47], loc: { start: { column: 46, line: 1 }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/3-Babel-AST.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/3-Babel-AST.shot index c5868aaf0d1e..90c569abf825 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/3-Babel-AST.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/3-Babel-AST.shot @@ -63,10 +63,10 @@ Program { type: "Identifier", name: "prop", - range: [33, 37], + range: [32, 36], loc: { - start: { column: 33, line: 1 }, - end: { column: 37, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 36, line: 1 }, }, }, typeAnnotation: TSTypeAnnotation { @@ -74,39 +74,39 @@ Program { typeAnnotation: TSStringKeyword { type: "TSStringKeyword", - range: [39, 45], + range: [38, 44], loc: { - start: { column: 39, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 38, line: 1 }, + end: { column: 44, line: 1 }, }, }, - range: [37, 45], + range: [36, 44], loc: { - start: { column: 37, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 36, line: 1 }, + end: { column: 44, line: 1 }, }, }, - range: [33, 45], + range: [32, 44], loc: { - start: { column: 33, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 44, line: 1 }, }, }, ], - range: [31, 47], + range: [30, 46], loc: { - start: { column: 31, line: 1 }, - end: { column: 47, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 46, line: 1 }, }, }, - range: [0, 47], + range: [1, 46], loc: { - start: { column: 0, line: 1 }, - end: { column: 47, line: 1 }, + start: { column: 1, line: 1 }, + end: { column: 46, line: 1 }, }, }, diff --git a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/4-Babel-Tokens.shot b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/4-Babel-Tokens.shot index 128fc9c61284..45fc90349daf 100644 --- a/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/4-Babel-Tokens.shot +++ b/packages/ast-spec/src/expression/TSSatisfiesExpression/fixtures/object-object-inner-parentheses/snapshots/4-Babel-Tokens.shot @@ -62,70 +62,70 @@ Array [ end: { column: 19, line: 1 }, }, }, - Punctuator { - type: "Punctuator", - value: ")", - - range: [19, 20], - loc: { - start: { column: 19, line: 1 }, - end: { column: 20, line: 1 }, - }, - }, Identifier { type: "Identifier", value: "satisfies", - range: [21, 30], + range: [20, 29], loc: { - start: { column: 21, line: 1 }, - end: { column: 30, line: 1 }, + start: { column: 20, line: 1 }, + end: { column: 29, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "{", - range: [31, 32], + range: [30, 31], loc: { - start: { column: 31, line: 1 }, - end: { column: 32, line: 1 }, + start: { column: 30, line: 1 }, + end: { column: 31, line: 1 }, }, }, Identifier { type: "Identifier", value: "prop", - range: [33, 37], + range: [32, 36], loc: { - start: { column: 33, line: 1 }, - end: { column: 37, line: 1 }, + start: { column: 32, line: 1 }, + end: { column: 36, line: 1 }, }, }, Punctuator { type: "Punctuator", value: ":", - range: [37, 38], + range: [36, 37], loc: { - start: { column: 37, line: 1 }, - end: { column: 38, line: 1 }, + start: { column: 36, line: 1 }, + end: { column: 37, line: 1 }, }, }, Identifier { type: "Identifier", value: "string", - range: [39, 45], + range: [38, 44], loc: { - start: { column: 39, line: 1 }, - end: { column: 45, line: 1 }, + start: { column: 38, line: 1 }, + end: { column: 44, line: 1 }, }, }, Punctuator { type: "Punctuator", value: "}", + range: [45, 46], + loc: { + start: { column: 45, line: 1 }, + end: { column: 46, line: 1 }, + }, + }, + Punctuator { + type: "Punctuator", + value: ")", + range: [46, 47], loc: { start: { column: 46, line: 1 }, diff --git a/yarn.lock b/yarn.lock index f771e6ece9f6..3ca3e9af00c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11560,10 +11560,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@*, prettier@2.7.1, prettier@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== +prettier@*, prettier@2.8.0, prettier@^2.6.2: + version "2.8.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9" + integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA== pretty-bytes@^5.3.0: version "5.6.0"