format

Author: iscai-msft

packages/typespec-client-generator-core/src/linter.ts

@@ -1,11 +1,11 @@
 import { defineLinter } from "@typespec/compiler";
 import { noUnnamedTypesRule } from "./rules/no-unnamed-types.rule.js";
 import { propertyNameConflictRule } from "./rules/property-name-conflict.rule.js";
+import { requireClientSuffixRule } from "./rules/require-client-suffix.rule.js";
 import { csharpReservedWordsRule } from "./rules/reserved-words/csharp.rule.js";
 import { javaReservedWordsRule } from "./rules/reserved-words/java.rule.js";
 import { javascriptReservedWordsRule } from "./rules/reserved-words/javascript.rule.js";
 import { pythonReservedWordsRule } from "./rules/reserved-words/python.rule.js";
-import { requireClientSuffixRule } from "./rules/require-client-suffix.rule.js";
 
 const rules = [
   requireClientSuffixRule,
@@ -26,10 +26,7 @@ function createRuleSet(langRules: typeof rules) {
   return {
     enable: {
       ...Object.fromEntries(
-        langRules.map((rule) => [
-          `@azure-tools/typespec-client-generator-core/${rule.name}`,
-          true,
-        ]),
+        langRules.map((rule) => [`@azure-tools/typespec-client-generator-core/${rule.name}`, true]),
       ),
     },
   };

packages/typespec-client-generator-core/src/rules/reserved-words/create-reserved-word-rule.ts

@@ -72,7 +72,8 @@ export function createReservedWordRule(
           }
         },
         union: (node: Union) => check(node, reservedWords.enumType, "union"),
-        unionVariant: (node: UnionVariant) => check(node, reservedWords.enumMember, "union variant"),
+        unionVariant: (node: UnionVariant) =>
+          check(node, reservedWords.enumMember, "union variant"),
       };
     },
   });

packages/typespec-client-generator-core/src/rules/reserved-words/csharp.rule.ts

@@ -1,8 +1,4 @@
 import { createReservedWordRule } from "./create-reserved-word-rule.js";
 import { csharpReservedWords } from "./words.js";
 
-export const csharpReservedWordsRule = createReservedWordRule(
-  "csharp",
-  "C#",
-  csharpReservedWords,
-);
+export const csharpReservedWordsRule = createReservedWordRule("csharp", "C#", csharpReservedWords);

packages/typespec-client-generator-core/test/rules/reserved-words.test.ts

@@ -127,9 +127,7 @@ describe("reserved word rule factory", () => {
   });
 
   it("is valid when @clientName without scope renames away from reserved word", async () => {
-    await tester
-      .expect(`model Foo { @clientName("notReserved") reserved: string; }`)
-      .toBeValid();
+    await tester.expect(`model Foo { @clientName("notReserved") reserved: string; }`).toBeValid();
   });
 });
 
@@ -264,30 +262,24 @@ describe("python reserved words", () => {
   });
 
   it("emits warning for Python keyword used as property name", async () => {
-    await tester
-      .expect(`model Foo { \`yield\`: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
-        message: expectedMessage("yield", "property", "Python"),
-      });
+    await tester.expect(`model Foo { \`yield\`: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
+      message: expectedMessage("yield", "property", "Python"),
+    });
   });
 
   it("emits warning for 'self' used as property name (Python-specific)", async () => {
-    await tester
-      .expect(`model Foo { self: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
-        message: expectedMessage("self", "property", "Python"),
-      });
+    await tester.expect(`model Foo { self: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
+      message: expectedMessage("self", "property", "Python"),
+    });
   });
 
   it("emits warning for 'enum' used as model name (Python-specific)", async () => {
-    await tester
-      .expect(`model \`enum\` { name: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
-        message: expectedMessage("enum", "model", "Python"),
-      });
+    await tester.expect(`model \`enum\` { name: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
+      message: expectedMessage("enum", "model", "Python"),
+    });
   });
 
   it("is valid when @clientName resolves conflict for python scope", async () => {
@@ -311,21 +303,17 @@ describe("csharp reserved words", () => {
   });
 
   it("emits warning for C# keyword used as property name", async () => {
-    await tester
-      .expect(`model Foo { \`namespace\`: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-csharp",
-        message: expectedMessage("namespace", "property", "C#"),
-      });
+    await tester.expect(`model Foo { \`namespace\`: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-csharp",
+      message: expectedMessage("namespace", "property", "C#"),
+    });
   });
 
   it("emits warning for C# contextual keyword", async () => {
-    await tester
-      .expect(`model Foo { \`var\`: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-csharp",
-        message: expectedMessage("var", "property", "C#"),
-      });
+    await tester.expect(`model Foo { \`var\`: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-csharp",
+      message: expectedMessage("var", "property", "C#"),
+    });
   });
 });
 
@@ -343,12 +331,10 @@ describe("java reserved words", () => {
   });
 
   it("emits warning for Java keyword used as property name", async () => {
-    await tester
-      .expect(`model Foo { \`synchronized\`: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-java",
-        message: expectedMessage("synchronized", "property", "Java"),
-      });
+    await tester.expect(`model Foo { \`synchronized\`: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-java",
+      message: expectedMessage("synchronized", "property", "Java"),
+    });
   });
 });
 
@@ -366,12 +352,10 @@ describe("javascript reserved words", () => {
   });
 
   it("emits warning for JS keyword used as operation name", async () => {
-    await tester
-      .expect(`op \`function\`(): void;`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-javascript",
-        message: expectedMessage("function", "operation", "JavaScript"),
-      });
+    await tester.expect(`op \`function\`(): void;`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-javascript",
+      message: expectedMessage("function", "operation", "JavaScript"),
+    });
   });
 });
 
@@ -435,13 +419,11 @@ describe("diagnostic message format", () => {
       pythonReservedWordsRule,
       "@azure-tools/typespec-client-generator-core",
     );
-    await tester
-      .expect(`model Foo { \`yield\`: string; }`)
-      .toEmitDiagnostics({
-        code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
-        severity: "warning",
-        message: expectedMessage("yield", "property", "Python"),
-      });
+    await tester.expect(`model Foo { \`yield\`: string; }`).toEmitDiagnostics({
+      code: "@azure-tools/typespec-client-generator-core/reserved-words-python",
+      severity: "warning",
+      message: expectedMessage("yield", "property", "Python"),
+    });
   });
 });