Update prettier

TypeStrong · Apr 29, 2024 · 96b4ae8 · 96b4ae8
1 parent 9946b92
commit 96b4ae8
Show file tree

Hide file tree

Showing 21 changed files with 332 additions and 288 deletions.
diff --git a/.config/.prettierignore b/.config/.prettierignore
@@ -12,6 +12,3 @@
 ../example/docs/
 **/tmp
 **/.vs
-
-# Remove once Prettier has support
-../src/test/converter2/behavior/resolutionMode.ts
diff --git a/internal-docs/third-party-symbols.md b/internal-docs/third-party-symbols.md
@@ -23,13 +23,13 @@ detected as belonging to the `typescript` package rather than the `global` packa
         // For these you should probably install typedoc-plugin-mdn-links instead
         "global": {
             // Handle {@link !Promise}
-            "Promise": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise"
+            "Promise": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise",
         },
         "typescript": {
             // Handle type X = Promise<number>
-            "Promise": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise"
-        }
-    }
+            "Promise": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise",
+        },
+    },
 }
 ```
 
@@ -41,9 +41,9 @@ A wildcard can be used to provide a fallback link to any unmapped type.
     "externalSymbolLinkMappings": {
         "external-lib": {
             "SomeObject": "https://external-lib.site/docs/SomeObject",
-            "*": "https://external-lib.site/docs"
-        }
-    }
+            "*": "https://external-lib.site/docs",
+        },
+    },
 }
 ```
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
     "mocha": "^10.4.0",
-    "prettier": "3.0.3",
+    "prettier": "3.2.5",
     "puppeteer": "^13.5.2",
     "ts-node": "^10.9.2",
     "typescript": "5.4.5"

diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts
@@ -544,11 +544,8 @@ function getSymbolForModuleLike(
     const sourceFile = node.getSourceFile();
     const globalSymbols = context.checker
         .getSymbolsInScope(node, ts.SymbolFlags.ModuleMember)
-        .filter(
-            (s) =>
-                s
-                    .getDeclarations()
-                    ?.some((d) => d.getSourceFile() === sourceFile),
+        .filter((s) =>
+            s.getDeclarations()?.some((d) => d.getSourceFile() === sourceFile),
         );
 
     // Detect declaration files with declare module "foo" as their only export
@@ -609,11 +606,10 @@ function getExports(
                 if (globalSymbol) {
                     result = context.checker
                         .getExportsOfModule(globalSymbol)
-                        .filter(
-                            (exp) =>
-                                exp.declarations?.some(
-                                    (d) => d.getSourceFile() === node,
-                                ),
+                        .filter((exp) =>
+                            exp.declarations?.some(
+                                (d) => d.getSourceFile() === node,
+                            ),
                         );
                 }
             }
@@ -623,11 +619,10 @@ function getExports(
         const sourceFile = node.getSourceFile();
         result = context.checker
             .getSymbolsInScope(node, ts.SymbolFlags.ModuleMember)
-            .filter(
-                (s) =>
-                    s
-                        .getDeclarations()
-                        ?.some((d) => d.getSourceFile() === sourceFile),
+            .filter((s) =>
+                s
+                    .getDeclarations()
+                    ?.some((d) => d.getSourceFile() === sourceFile),
             );
     }
 

diff --git a/src/lib/converter/plugins/CommentPlugin.ts b/src/lib/converter/plugins/CommentPlugin.ts
@@ -652,8 +652,8 @@ function moveNestedParamTags(
     for (const param of parameters) {
         const visitor: Partial<TypeVisitor> = {
             reflection(target) {
-                const tags = paramTags.filter(
-                    (t) => t.name?.startsWith(`${param.name}.`),
+                const tags = paramTags.filter((t) =>
+                    t.name?.startsWith(`${param.name}.`),
                 );
 
                 for (const tag of tags) {

diff --git a/src/lib/converter/plugins/ImplementsPlugin.ts b/src/lib/converter/plugins/ImplementsPlugin.ts
@@ -316,10 +316,9 @@ export class ImplementsPlugin extends ConverterComponent {
             context.logger.warn(
                 `Failed to retrieve${
                     reflection.flags.isStatic ? " static" : ""
-                } member "${
-                    reflection.escapedName ?? reflection.name
-                }" of "${reflection.parent
-                    ?.name}" for inheritance analysis. Please report a bug.` as TranslatedString,
+                } member "${reflection.escapedName ?? reflection.name}" of "${
+                    reflection.parent?.name
+                }" for inheritance analysis. Please report a bug.` as TranslatedString,
             );
             return;
         }

diff --git a/src/lib/converter/symbols.ts b/src/lib/converter/symbols.ts
@@ -1241,8 +1241,8 @@ function isInherited(context: Context, symbol: ts.Symbol) {
     parents.push(...constructorDecls);
 
     return (
-        parents.some(
-            (d) => symbol.getDeclarations()?.some((d2) => d2.parent === d),
+        parents.some((d) =>
+            symbol.getDeclarations()?.some((d2) => d2.parent === d),
         ) === false
     );
 }

diff --git a/src/lib/internationalization/translatable.ts b/src/lib/internationalization/translatable.ts
@@ -469,8 +469,8 @@ type BuildConstraint<
 > = [T] extends [never]
     ? `${Acc}${string}`
     : T extends T
-    ? BuildConstraint<Exclude<U, T>, `${Acc}${string}{${T}}`>
-    : never;
+      ? BuildConstraint<Exclude<U, T>, `${Acc}${string}{${T}}`>
+      : never;
 
 // Combinatorially explosive, but shouldn't matter for us, since we only need a few iterations.
 type TranslationConstraint = [
@@ -496,7 +496,7 @@ const _validatePlaceholdersPresent: {
     [K in keyof typeof translatable]: K extends `${string}_1${string}`
         ? TranslationConstraint[2]
         : K extends `${string}_0${string}`
-        ? TranslationConstraint[1]
-        : TranslationConstraint[0];
+          ? TranslationConstraint[1]
+          : TranslationConstraint[0];
 } = translatable;
 _validatePlaceholdersPresent;
diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts
@@ -476,8 +476,8 @@ export abstract class Reflection {
             declaration(decl) {
                 if (
                     decl.signatures?.length &&
-                    decl.signatures.every(
-                        (sig) => sig.comment?.getTag("@deprecated"),
+                    decl.signatures.every((sig) =>
+                        sig.comment?.getTag("@deprecated"),
                     )
                 ) {
                     signaturesDeprecated = true;

diff --git a/src/lib/output/themes/default/partials/member.tsx b/src/lib/output/themes/default/partials/member.tsx
@@ -25,10 +25,10 @@ export function member(context: DefaultThemeRenderContext, props: DeclarationRef
             {props.signatures
                 ? context.memberSignatures(props)
                 : props.hasGetterOrSetter()
-                ? context.memberGetterSetter(props)
-                : props instanceof ReferenceReflection
-                ? context.memberReference(props)
-                : context.memberDeclaration(props)}
+                  ? context.memberGetterSetter(props)
+                  : props instanceof ReferenceReflection
+                    ? context.memberReference(props)
+                    : context.memberDeclaration(props)}
 
             {props.groups?.map((item) => item.children.map((item) => !item.hasOwnDocument && context.member(item)))}
         </section>

diff --git a/src/lib/serialization/schema.ts b/src/lib/serialization/schema.ts
@@ -33,59 +33,58 @@ import type * as M from "../models";
 /**
  * Describes the mapping from Model types to the corresponding JSON output type.
  */
-export type ModelToObject<T> = T extends Array<infer U>
-    ? _ModelToObject<U>[]
-    : _ModelToObject<T>;
+export type ModelToObject<T> =
+    T extends Array<infer U> ? _ModelToObject<U>[] : _ModelToObject<T>;
 
 // Order matters here. Some types are subtypes of other types.
 type _ModelToObject<T> =
     // Reflections
     T extends Primitive
         ? T
         : Required<T> extends Required<M.ReflectionGroup>
-        ? ReflectionGroup
-        : Required<T> extends Required<M.ReflectionCategory>
-        ? ReflectionCategory
-        : T extends M.SignatureReflection
-        ? SignatureReflection
-        : T extends M.ParameterReflection
-        ? ParameterReflection
-        : T extends M.DeclarationReflection
-        ? DeclarationReflection
-        : T extends M.TypeParameterReflection
-        ? TypeParameterReflection
-        : T extends M.ProjectReflection
-        ? ProjectReflection
-        : T extends M.ContainerReflection
-        ? ContainerReflection
-        : T extends M.ReferenceReflection
-        ? ReferenceReflection
-        : T extends M.Reflection
-        ? Reflection
-        : // Types
-        T extends M.SomeType
-        ? TypeKindMap[T["type"]]
-        : T extends M.Type
-        ? SomeType
-        : // Miscellaneous
-        T extends M.Comment
-        ? Comment
-        : T extends M.CommentTag
-        ? CommentTag
-        : T extends M.CommentDisplayPart
-        ? CommentDisplayPart
-        : T extends M.SourceReference
-        ? SourceReference
-        : never;
+          ? ReflectionGroup
+          : Required<T> extends Required<M.ReflectionCategory>
+            ? ReflectionCategory
+            : T extends M.SignatureReflection
+              ? SignatureReflection
+              : T extends M.ParameterReflection
+                ? ParameterReflection
+                : T extends M.DeclarationReflection
+                  ? DeclarationReflection
+                  : T extends M.TypeParameterReflection
+                    ? TypeParameterReflection
+                    : T extends M.ProjectReflection
+                      ? ProjectReflection
+                      : T extends M.ContainerReflection
+                        ? ContainerReflection
+                        : T extends M.ReferenceReflection
+                          ? ReferenceReflection
+                          : T extends M.Reflection
+                            ? Reflection
+                            : // Types
+                              T extends M.SomeType
+                              ? TypeKindMap[T["type"]]
+                              : T extends M.Type
+                                ? SomeType
+                                : // Miscellaneous
+                                  T extends M.Comment
+                                  ? Comment
+                                  : T extends M.CommentTag
+                                    ? CommentTag
+                                    : T extends M.CommentDisplayPart
+                                      ? CommentDisplayPart
+                                      : T extends M.SourceReference
+                                        ? SourceReference
+                                        : never;
 
 type Primitive = string | number | undefined | null | boolean;
 
 // Separate helper so that we can trigger distribution.
 type ToSerialized<T> = T extends Primitive
     ? T
     : T extends bigint
-    ? { value: string; negative: boolean }
-    : ModelToObject<T>;
+      ? { value: string; negative: boolean }
+      : ModelToObject<T>;
 
 /**
  * Helper to describe a set of serialized properties. Primitive types are returned

diff --git a/src/lib/utils/highlighter.tsx b/src/lib/utils/highlighter.tsx
@@ -1,5 +1,10 @@
 import { ok as assert, ok } from "assert";
-import type { BundledLanguage, BundledTheme, Highlighter, TokenStyles } from "shiki" with { "resolution-mode": "import" };
+import type {
+    BundledLanguage,
+    BundledTheme,
+    Highlighter,
+    TokenStyles,
+} from "shiki" with { "resolution-mode": "import" };
 import * as JSX from "./jsx";
 import { unique } from "./array";
 
@@ -45,11 +50,7 @@ class DoubleHighlighter {
 
         for (const line of tokens) {
             for (const token of line) {
-                docEls.push(
-                    <span class={this.getClass(token.variants)}>
-                        {token.content}
-                    </span>,
-                );
+                docEls.push(<span class={this.getClass(token.variants)}>{token.content}</span>);
             }
 
             docEls.push(<br />);