From f746d5e6edd1c0a856d35d423b57018c7183b4f6 Mon Sep 17 00:00:00 2001 From: Frederik Wessberg Date: Fri, 4 Aug 2023 16:01:17 +0200 Subject: [PATCH] style: run prettier --- src/service/cache/cached-fs.ts | 2 +- .../emit/diagnostics/emit-diagnostics.ts | 66 +++++++++---------- .../module-resolution-host.ts | 9 ++- .../visitor/deconflict-property-signature.ts | 1 - .../module-block-extractor.ts | 2 +- .../util/get-aliased-declaration.ts | 2 +- .../util/get-id-for-node.ts | 2 +- .../util/get-node-placement-queue.ts | 2 +- .../get-type-reference-module-from-node.ts | 4 +- .../util/locate-exported-symbol.ts | 6 +- .../get-declaration-out-dir.ts | 3 +- .../get-supported-extensions.ts | 4 +- .../module-resolution-util.ts | 4 +- src/util/transpiler-loader.ts | 4 +- test/setup/test-setup.ts | 4 +- 15 files changed, 57 insertions(+), 58 deletions(-) diff --git a/src/service/cache/cached-fs.ts b/src/service/cache/cached-fs.ts index d7c33bc0..cad52679 100644 --- a/src/service/cache/cached-fs.ts +++ b/src/service/cache/cached-fs.ts @@ -1,4 +1,4 @@ -import type { CachedWorkerOptions} from "./cached-worker.js"; +import type {CachedWorkerOptions} from "./cached-worker.js"; import {CachedWorker} from "./cached-worker.js"; import type {TS} from "../../type/ts.js"; import type {FileSystem} from "../../util/file-system/file-system.js"; diff --git a/src/service/emit/diagnostics/emit-diagnostics.ts b/src/service/emit/diagnostics/emit-diagnostics.ts index 3421e416..b809f317 100644 --- a/src/service/emit/diagnostics/emit-diagnostics.ts +++ b/src/service/emit/diagnostics/emit-diagnostics.ts @@ -49,46 +49,42 @@ export function emitDiagnostics({host, context, pluginOptions}: EmitDiagnosticsO switch (diagnostic.category) { case typescript.DiagnosticCategory.Error: - context.error( - { - frame, - code, - name: code, - stack, - ...(diagnostic.length == null ? {} : {length: diagnostic.length}), - ...(diagnostic.file == null && position == null - ? {} - : { - loc: { - ...(diagnostic.file == null ? {} : {file: diagnostic.file.fileName}), - ...(position == null ? {} : {line: position.line + 1}), - ...(position == null ? {} : {column: position.character + 1}) - } - }), - ...(diagnostic.file == null ? {} : {pos: diagnostic.file.pos}), - message - } as RollupError - ); + context.error({ + frame, + code, + name: code, + stack, + ...(diagnostic.length == null ? {} : {length: diagnostic.length}), + ...(diagnostic.file == null && position == null + ? {} + : { + loc: { + ...(diagnostic.file == null ? {} : {file: diagnostic.file.fileName}), + ...(position == null ? {} : {line: position.line + 1}), + ...(position == null ? {} : {column: position.character + 1}) + } + }), + ...(diagnostic.file == null ? {} : {pos: diagnostic.file.pos}), + message + } as RollupError); break; case typescript.DiagnosticCategory.Warning: case typescript.DiagnosticCategory.Message: case typescript.DiagnosticCategory.Suggestion: - context.warn( - { - frame, - code, - name: code, - ...(diagnostic.length == null ? {} : {length: diagnostic.length}), - loc: { - ...(diagnostic.file == null ? {} : {file: diagnostic.file.fileName}), - ...(position == null ? {} : {line: position.line + 1}), - ...(position == null ? {} : {column: position.character + 1}) - }, - ...(diagnostic.file == null ? {} : {pos: diagnostic.file.pos}), - message - } as RollupWarning - ); + context.warn({ + frame, + code, + name: code, + ...(diagnostic.length == null ? {} : {length: diagnostic.length}), + loc: { + ...(diagnostic.file == null ? {} : {file: diagnostic.file.fileName}), + ...(position == null ? {} : {line: position.line + 1}), + ...(position == null ? {} : {column: position.character + 1}) + }, + ...(diagnostic.file == null ? {} : {pos: diagnostic.file.pos}), + message + } as RollupWarning); break; } }); diff --git a/src/service/module-resolution-host/module-resolution-host.ts b/src/service/module-resolution-host/module-resolution-host.ts index 70c725ec..66db1975 100644 --- a/src/service/module-resolution-host/module-resolution-host.ts +++ b/src/service/module-resolution-host/module-resolution-host.ts @@ -1,11 +1,11 @@ import type {TS} from "../../type/ts.js"; import type {ModuleResolutionHostOptions} from "./module-resolution-host-options.js"; import {ensureAbsolute} from "../../util/path/path-util.js"; -import type { SupportedExtensions} from "../../util/get-supported-extensions/get-supported-extensions.js"; +import type {SupportedExtensions} from "../../util/get-supported-extensions/get-supported-extensions.js"; import {getSupportedExtensions} from "../../util/get-supported-extensions/get-supported-extensions.js"; import type {VirtualFile, VirtualFileInput} from "./virtual-file.js"; import type {AmbientExtension} from "../../constant/constant.js"; -import { AMBIENT_EXTENSIONS} from "../../constant/constant.js"; +import {AMBIENT_EXTENSIONS} from "../../constant/constant.js"; import path from "crosspath"; export class ModuleResolutionHost implements TS.ModuleResolutionHost { @@ -14,7 +14,10 @@ export class ModuleResolutionHost implements TS.ModuleResolutionHost { private currentFileNames: Set | undefined; private currentDirectories: Set | undefined; private currentNonAmbientSupportedExtensions: SupportedExtensions | undefined; - constructor(protected readonly options: ModuleResolutionHostOptions, protected readonly files: Map = new Map()) {} + constructor( + protected readonly options: ModuleResolutionHostOptions, + protected readonly files: Map = new Map() + ) {} add(fileInput: VirtualFileInput | VirtualFile): VirtualFile { const file = { diff --git a/src/service/transformer/declaration-bundler/transformers/deconflicter/visitor/deconflict-property-signature.ts b/src/service/transformer/declaration-bundler/transformers/deconflicter/visitor/deconflict-property-signature.ts index d4b0acce..db148831 100644 --- a/src/service/transformer/declaration-bundler/transformers/deconflicter/visitor/deconflict-property-signature.ts +++ b/src/service/transformer/declaration-bundler/transformers/deconflicter/visitor/deconflict-property-signature.ts @@ -18,5 +18,4 @@ export function deconflictPropertySignature(options: DeconflicterVisitorOptions< } return preserveMeta(factory.updatePropertySignature(node, node.modifiers, nameContResult, node.questionToken, typeContResult), node, options); - } diff --git a/src/service/transformer/declaration-bundler/transformers/module-block-extractor/module-block-extractor.ts b/src/service/transformer/declaration-bundler/transformers/module-block-extractor/module-block-extractor.ts index e766320b..f6badf40 100644 --- a/src/service/transformer/declaration-bundler/transformers/module-block-extractor/module-block-extractor.ts +++ b/src/service/transformer/declaration-bundler/transformers/module-block-extractor/module-block-extractor.ts @@ -29,7 +29,7 @@ export function moduleBlockExtractor(options: ModuleBlockExtractorOptions): TS.S context ), - continuation: (node: U): TS.VisitResult|undefined => + continuation: (node: U): TS.VisitResult | undefined => visitNode({ ...visitorOptions, node diff --git a/src/service/transformer/declaration-bundler/util/get-aliased-declaration.ts b/src/service/transformer/declaration-bundler/util/get-aliased-declaration.ts index 87e168fc..71107f9d 100644 --- a/src/service/transformer/declaration-bundler/util/get-aliased-declaration.ts +++ b/src/service/transformer/declaration-bundler/util/get-aliased-declaration.ts @@ -1,6 +1,6 @@ import type {TS} from "../../../../type/ts.js"; import type {SourceFileBundlerVisitorOptions} from "../transformers/source-file-bundler/source-file-bundler-visitor-options.js"; -import type { GetSymbolAtLocationOptions} from "./get-symbol-at-location.js"; +import type {GetSymbolAtLocationOptions} from "./get-symbol-at-location.js"; import {getSymbolAtLocation} from "./get-symbol-at-location.js"; import {getParentNode} from "./get-parent-node.js"; import {isSameChunk} from "./generate-module-specifier.js"; diff --git a/src/service/transformer/declaration-bundler/util/get-id-for-node.ts b/src/service/transformer/declaration-bundler/util/get-id-for-node.ts index db46e236..d3f6fffb 100644 --- a/src/service/transformer/declaration-bundler/util/get-id-for-node.ts +++ b/src/service/transformer/declaration-bundler/util/get-id-for-node.ts @@ -1,4 +1,4 @@ -import type { GetSymbolAtLocationOptions} from "./get-symbol-at-location.js"; +import type {GetSymbolAtLocationOptions} from "./get-symbol-at-location.js"; import {getSymbolAtLocation} from "./get-symbol-at-location.js"; import type {TS} from "../../../../type/ts.js"; import {generateRandomHash, generateRandomIntegerHash} from "../../../../util/hash/generate-random-hash.js"; diff --git a/src/service/transformer/declaration-bundler/util/get-node-placement-queue.ts b/src/service/transformer/declaration-bundler/util/get-node-placement-queue.ts index d626102f..05996265 100644 --- a/src/service/transformer/declaration-bundler/util/get-node-placement-queue.ts +++ b/src/service/transformer/declaration-bundler/util/get-node-placement-queue.ts @@ -4,7 +4,7 @@ import {isRootLevelNode} from "../transformers/module-merger/util/is-root-level- export interface NodePlacementQueue { prependNodes(...nodes: TS.Node[]): void; appendNodes(...nodes: TS.Node[]): void; - wrapVisitResult(node: TS.VisitResult|undefined): TS.VisitResult | undefined; + wrapVisitResult(node: TS.VisitResult | undefined): TS.VisitResult | undefined; flush(): readonly [readonly TS.Node[], readonly TS.Node[]]; } diff --git a/src/service/transformer/declaration-bundler/util/get-type-reference-module-from-node.ts b/src/service/transformer/declaration-bundler/util/get-type-reference-module-from-node.ts index 6de0d13f..90043931 100644 --- a/src/service/transformer/declaration-bundler/util/get-type-reference-module-from-node.ts +++ b/src/service/transformer/declaration-bundler/util/get-type-reference-module-from-node.ts @@ -1,6 +1,6 @@ -import type { GetAliasedDeclarationOptions} from "./get-aliased-declaration.js"; +import type {GetAliasedDeclarationOptions} from "./get-aliased-declaration.js"; import {getAliasedDeclaration} from "./get-aliased-declaration.js"; -import type { TypeReference} from "./get-type-reference-module-from-file-name.js"; +import type {TypeReference} from "./get-type-reference-module-from-file-name.js"; import {getTypeReferenceModuleFromFileName} from "./get-type-reference-module-from-file-name.js"; import type {TS} from "../../../../type/ts.js"; diff --git a/src/service/transformer/declaration-bundler/util/locate-exported-symbol.ts b/src/service/transformer/declaration-bundler/util/locate-exported-symbol.ts index 6863c55b..e7e7be2b 100644 --- a/src/service/transformer/declaration-bundler/util/locate-exported-symbol.ts +++ b/src/service/transformer/declaration-bundler/util/locate-exported-symbol.ts @@ -1,4 +1,8 @@ -import type {NamedExportedSymbol, NamespaceExportedSymbol, SourceFileToExportedSymbolSet} from "../transformers/track-exports-transformer/track-exports-transformer-visitor-options.js"; +import type { + NamedExportedSymbol, + NamespaceExportedSymbol, + SourceFileToExportedSymbolSet +} from "../transformers/track-exports-transformer/track-exports-transformer-visitor-options.js"; import type {CompilerHost} from "../../../compiler-host/compiler-host.js"; import type {SourceFileResolver} from "../transformers/source-file-bundler/source-file-bundler-visitor-options.js"; diff --git a/src/util/get-declaration-out-dir/get-declaration-out-dir.ts b/src/util/get-declaration-out-dir/get-declaration-out-dir.ts index 79802a94..8f0c3b45 100644 --- a/src/util/get-declaration-out-dir/get-declaration-out-dir.ts +++ b/src/util/get-declaration-out-dir/get-declaration-out-dir.ts @@ -2,8 +2,7 @@ import type {OutputOptions} from "rollup"; import {ensureRelative} from "../path/path-util.js"; import {getOutDir} from "../get-out-dir/get-out-dir.js"; import type {TS} from "../../type/ts.js"; -import type { - AmbientExtension} from "../../constant/constant.js"; +import type {AmbientExtension} from "../../constant/constant.js"; import { CJSX_EXTENSION, CJS_EXTENSION, diff --git a/src/util/get-supported-extensions/get-supported-extensions.ts b/src/util/get-supported-extensions/get-supported-extensions.ts index 87fe6bbc..913ab01d 100644 --- a/src/util/get-supported-extensions/get-supported-extensions.ts +++ b/src/util/get-supported-extensions/get-supported-extensions.ts @@ -1,6 +1,4 @@ -import type { - KnownExtension, - AmbientExtension} from "../../constant/constant.js"; +import type {KnownExtension, AmbientExtension} from "../../constant/constant.js"; import { D_TS_EXTENSION, JS_EXTENSION, diff --git a/src/util/module-resolution/module-resolution-util.ts b/src/util/module-resolution/module-resolution-util.ts index 0c873145..17aadd92 100644 --- a/src/util/module-resolution/module-resolution-util.ts +++ b/src/util/module-resolution/module-resolution-util.ts @@ -5,7 +5,7 @@ import type {TS} from "../../type/ts.js"; * will throw. */ export function allowsNodeNextModuleResolution(typescript: typeof TS): boolean { - // If 'Node16' module resolution is available, NodeNext is allowed to be selected as a ModuleResolutionKind. - // This happened in v4.7 + // If 'Node16' module resolution is available, NodeNext is allowed to be selected as a ModuleResolutionKind. + // This happened in v4.7 return typescript.ModuleResolutionKind.Node16 != null; } diff --git a/src/util/transpiler-loader.ts b/src/util/transpiler-loader.ts index 5c974647..4373bd99 100644 --- a/src/util/transpiler-loader.ts +++ b/src/util/transpiler-loader.ts @@ -41,14 +41,14 @@ async function loadModules ({ status: "rejected", reason - } as const) + }) as const ) ) ); diff --git a/test/setup/test-setup.ts b/test/setup/test-setup.ts index 762bb67a..59c34139 100644 --- a/test/setup/test-setup.ts +++ b/test/setup/test-setup.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import type { TestContext} from "./test-context.js"; +import type {TestContext} from "./test-context.js"; import {createTestContext} from "./test-context.js"; -import type { TestFile, TestFileStructure} from "./test-file.js"; +import type {TestFile, TestFileStructure} from "./test-file.js"; import {createTestFileStructure} from "./test-file.js"; import {createVirtualFileSystem} from "./create-virtual-file-system.js"; import type {MaybeArray, PartialExcept} from "helpertypes";