Upgrade to prettier 3.1 (#2666)

https://prettier.io/blog/2023/11/13/3.1.0
microsoft · Nov 14, 2023 · bc62493 · bc62493
1 parent 3374370
commit bc62493
Show file tree

Hide file tree

Showing 14 changed files with 214 additions and 274 deletions.
diff --git a/common/changes/@typespec/compiler/upgrade-prettier-3.1_2023-11-13-21-05.json b/common/changes/@typespec/compiler/upgrade-prettier-3.1_2023-11-13-21-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/compiler",
+      "comment": "Upgrade formatter to prettier 3.1",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/compiler"
+}
diff --git a/common/changes/@typespec/html-program-viewer/upgrade-prettier-3.1_2023-11-13-21-05.json b/common/changes/@typespec/html-program-viewer/upgrade-prettier-3.1_2023-11-13-21-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/html-program-viewer",
+      "comment": "Upgrade formatter to prettier 3.1",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/html-program-viewer"
+}
diff --git a/common/changes/@typespec/migrate/upgrade-prettier-3.1_2023-11-13-21-05.json b/common/changes/@typespec/migrate/upgrade-prettier-3.1_2023-11-13-21-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/migrate",
+      "comment": "Upgrade formatter to prettier 3.1",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/migrate"
+}
diff --git a/common/changes/@typespec/prettier-plugin-typespec/upgrade-prettier-3.1_2023-11-13-21-05.json b/common/changes/@typespec/prettier-plugin-typespec/upgrade-prettier-3.1_2023-11-13-21-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/prettier-plugin-typespec",
+      "comment": "Upgrade formatter to prettier 3.1",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/prettier-plugin-typespec"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -78,7 +78,7 @@
     "globby": "~13.2.2",
     "yaml": "~2.3.2",
     "mustache": "~4.2.0",
-    "prettier": "~3.0.3",
+    "prettier": "~3.1.0",
     "prompts": "~2.4.2",
     "semver": "^7.5.4",
     "vscode-languageserver": "~9.0.0",

diff --git a/packages/compiler/src/core/checker.ts b/packages/compiler/src/core/checker.ts
@@ -1160,14 +1160,14 @@ export function createChecker(program: Program): Checker {
     return sym.flags & SymbolFlags.Model
       ? checkModelStatement(node as ModelStatementNode, mapper)
       : sym.flags & SymbolFlags.Scalar
-      ? checkScalar(node as ScalarStatementNode, mapper)
-      : sym.flags & SymbolFlags.Alias
-      ? checkAlias(node as AliasStatementNode, mapper)
-      : sym.flags & SymbolFlags.Interface
-      ? checkInterface(node as InterfaceStatementNode, mapper)
-      : sym.flags & SymbolFlags.Operation
-      ? checkOperation(node as OperationStatementNode, mapper)
-      : checkUnion(node as UnionStatementNode, mapper);
+        ? checkScalar(node as ScalarStatementNode, mapper)
+        : sym.flags & SymbolFlags.Alias
+          ? checkAlias(node as AliasStatementNode, mapper)
+          : sym.flags & SymbolFlags.Interface
+            ? checkInterface(node as InterfaceStatementNode, mapper)
+            : sym.flags & SymbolFlags.Operation
+              ? checkOperation(node as OperationStatementNode, mapper)
+              : checkUnion(node as UnionStatementNode, mapper);
   }
 
   function getOrInstantiateTemplate(

diff --git a/packages/compiler/src/core/schema-validator.ts b/packages/compiler/src/core/schema-validator.ts
@@ -65,8 +65,8 @@ function ajvErrorToDiagnostic(
       target === NoTarget
         ? target
         : "kind" in target
-        ? getLocationInYamlScript(target, getErrorPath(error), "key")
-        : { file: target, pos: 0, end: 0 },
+          ? getLocationInYamlScript(target, getErrorPath(error), "key")
+          : { file: target, pos: 0, end: 0 },
   };
 }
 

diff --git a/packages/compiler/src/formatter/print/printer.ts b/packages/compiler/src/formatter/print/printer.ts
@@ -494,8 +494,8 @@ function printDoc(
   const printed = isIndentableBlockComment(rawComment)
     ? printIndentableBlockCommentContent(rawComment)
     : rawComment.includes("\n")
-    ? rawComment
-    : ` ${rawComment.trim()} `;
+      ? rawComment
+      : ` ${rawComment.trim()} `;
   return ["/**", printed, "*/"];
 }
 

diff --git a/packages/html-program-viewer/package.json b/packages/html-program-viewer/package.json
@@ -50,7 +50,7 @@
     "@typespec/compiler": "workspace:~0.50.0"
   },
   "dependencies": {
-    "prettier": "~3.0.3",
+    "prettier": "~3.1.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "react-is": "~18.1.0",

diff --git a/packages/migrate/package.json b/packages/migrate/package.json
@@ -45,7 +45,7 @@
     "@typespec/compiler-v0.41": "npm:@typespec/[email protected]",
     "@typespec/compiler-v0.42": "npm:@typespec/[email protected]",
     "globby": "~13.2.2",
-    "prettier": "~3.0.3",
+    "prettier": "~3.1.0",
     "semver": "^7.5.4",
     "yargs": "~17.7.2",
     "yaml": "~2.3.2"