Skip to content

Commit 5394ba9

Browse files
uhyouhyo
committed
chore: apply Prettier's new formatting
1 parent 1bd8216 commit 5394ba9

32 files changed

+269
-252
lines changed

‎build/logic/generate.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export function generate(
1818
tsLibDir: string,
1919
targetFile: string,
2020
sourceFile: string,
21-
{ emitOriginalAsComment = false, emitNoDefaultLib = false }: GenerateOptions
21+
{ emitOriginalAsComment = false, emitNoDefaultLib = false }: GenerateOptions,
2222
): string | undefined {
2323
const tsLibFile = path.join(tsLibDir, sourceFile);
2424
const originalProgram = ts.createProgram([tsLibFile], {});
@@ -60,7 +60,7 @@ export function generate(
6060
if (!ts.isInterfaceDeclaration(statement)) {
6161
// Find the replacement target of same kind.
6262
const replacementTargetOfSameKind = replacementTarget.flatMap((target) =>
63-
target.type === "non-interface" ? [target] : []
63+
target.type === "non-interface" ? [target] : [],
6464
);
6565
if (replacementTargetOfSameKind.length === 0) {
6666
result += statement.getFullText(originalFile);
@@ -79,7 +79,7 @@ export function generate(
7979
continue;
8080
}
8181
const replaceInterfaces = replacementTarget.flatMap((target) =>
82-
target.type === "interface" ? [target] : []
82+
target.type === "interface" ? [target] : [],
8383
);
8484
if (
8585
replaceInterfaces.some(
@@ -88,8 +88,8 @@ export function generate(
8888
statement,
8989
originalFile,
9090
target.originalStatement,
91-
target.sourceFile
92-
)
91+
target.sourceFile,
92+
),
9393
)
9494
) {
9595
// This needs to be a full replacement
@@ -197,7 +197,7 @@ type ReplacementTarget = (
197197
*/
198198
function scanBetterFile(
199199
printer: ts.Printer,
200-
targetFile: string
200+
targetFile: string,
201201
): Map<string, ReplacementTarget[]> {
202202
const replacementTargets = new Map<string, ReplacementTarget[]>();
203203
{
@@ -224,7 +224,7 @@ function scanBetterFile(
224224
const memberName = member.name?.getText(betterFile) ?? "";
225225
upsert(members, memberName, (members = []) => {
226226
const leadingSpacesMatch = /^\s*/.exec(
227-
member.getFullText(betterFile)
227+
member.getFullText(betterFile),
228228
);
229229
const leadingSpaces =
230230
leadingSpacesMatch !== null ? leadingSpacesMatch[0] : "";
@@ -235,7 +235,7 @@ function scanBetterFile(
235235
printer.printNode(
236236
ts.EmitHint.Unspecified,
237237
member,
238-
betterFile
238+
betterFile,
239239
),
240240
});
241241
return members;
@@ -274,7 +274,7 @@ function isPartialReplacement(
274274
interfaceDecl: ts.InterfaceDeclaration,
275275
originalFile: ts.SourceFile,
276276
replacementDecl: ts.InterfaceDeclaration,
277-
betterFile: ts.SourceFile
277+
betterFile: ts.SourceFile,
278278
): boolean {
279279
// Compare type parameters and herigate using full text.
280280
if (
@@ -334,7 +334,7 @@ function printInterface(
334334
printer: ts.Printer,
335335
originalNode: ts.InterfaceDeclaration,
336336
members: readonly { text: string }[],
337-
originalSourceFile: ts.SourceFile
337+
originalSourceFile: ts.SourceFile,
338338
): string {
339339
let result = originalNode
340340
.getFullText(originalSourceFile)
@@ -343,27 +343,27 @@ function printInterface(
343343
result += printer.printNode(
344344
ts.EmitHint.Unspecified,
345345
mod,
346-
originalSourceFile
346+
originalSourceFile,
347347
);
348348
}
349349
result += "interface ";
350350
result += printer.printNode(
351351
ts.EmitHint.Unspecified,
352352
originalNode.name,
353-
originalSourceFile
353+
originalSourceFile,
354354
);
355355
if (originalNode.typeParameters) {
356356
result += printer.printList(
357357
ts.ListFormat.TypeParameters,
358358
originalNode.typeParameters,
359-
originalSourceFile
359+
originalSourceFile,
360360
);
361361
}
362362
if (originalNode.heritageClauses) {
363363
result += printer.printList(
364364
ts.ListFormat.HeritageClauses,
365365
originalNode.heritageClauses,
366-
originalSourceFile
366+
originalSourceFile,
367367
);
368368
}
369369
result += "{\n";
@@ -402,7 +402,7 @@ function commentOut(code: string): string {
402402

403403
function replaceAliases(
404404
statement: ts.Statement,
405-
typeMap: Map<string, string>
405+
typeMap: Map<string, string>,
406406
): ts.Statement {
407407
if (typeMap.size === 0) return statement;
408408
return ts.transform(statement, [
@@ -416,7 +416,7 @@ function replaceAliases(
416416
return ts.factory.updateTypeReferenceNode(
417417
node,
418418
ts.factory.createIdentifier(replacementType),
419-
node.typeArguments
419+
node.typeArguments,
420420
);
421421
}
422422
return ts.visitEachChild(node, visitor, context);

‎build/logic/getLibFiles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export const getLibFiles = async () => {
1818
const sourceFile = `${lib}.d.ts`;
1919
const targetFile = paths[lib] || `lib.${sourceFile}`;
2020
return [targetFile, sourceFile];
21-
})
21+
}),
2222
);
2323
};

‎build/package.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async function main() {
2222
const packageTemplateFiles = await readdir(templateDir);
2323

2424
const libFiles = (await readdir(libDir)).filter((libFile) =>
25-
/\.d\.ts$/.test(libFile)
25+
/\.d\.ts$/.test(libFile),
2626
);
2727

2828
const packageNames = new Set<string>();
@@ -49,7 +49,7 @@ async function main() {
4949
const packageJsonPath = path.join(
5050
packageDir,
5151
packageName,
52-
"package.json"
52+
"package.json",
5353
);
5454
await writeToPackageJson(packageJsonPath, () => ({
5555
name: toScopedPackageName(packageName),
@@ -73,7 +73,7 @@ async function main() {
7373
// copy root README to main package
7474
await writeFile(
7575
path.join(mainPackageDir, "README.md"),
76-
await readFile(path.join(projectDir, "README.md"))
76+
await readFile(path.join(projectDir, "README.md")),
7777
);
7878
// update package.json
7979
const packageJsonPath = path.join(mainPackageDir, "package.json");
@@ -85,13 +85,13 @@ async function main() {
8585
[...packageNames].map((packageName) => [
8686
`@typescript/lib-${packageName}`,
8787
`npm:${toScopedPackageName(packageName)}@${version}`,
88-
])
88+
]),
8989
),
9090
}));
9191
// prepare symlink to dist
9292
await symlink(
9393
path.join(projectDir, "dist"),
94-
path.join(mainPackageDir, "dist")
94+
path.join(mainPackageDir, "dist"),
9595
);
9696
}
9797
// update package.json in "tests" folder
@@ -105,9 +105,9 @@ async function main() {
105105
`@typescript/lib-${packageName}`,
106106
`file:${path.relative(
107107
path.dirname(packageJsonPath),
108-
path.join(packageDir, packageName)
108+
path.join(packageDir, packageName),
109109
)}`,
110-
])
110+
]),
111111
),
112112
},
113113
}));
@@ -119,12 +119,12 @@ async function main() {
119119
const filePath = path.join(templateDir, file);
120120
const targetPath = path.join(dir, file);
121121
return writeFile(targetPath, await readFile(filePath));
122-
})
122+
}),
123123
);
124124
}
125125
async function writeToPackageJson(
126126
packageJsonPath: string,
127-
updates: (original: any) => Record<string, unknown>
127+
updates: (original: any) => Record<string, unknown>,
128128
) {
129129
const original = JSON.parse(await readFile(packageJsonPath, "utf-8"));
130130
return writeFile(
@@ -135,8 +135,8 @@ async function main() {
135135
...updates(original),
136136
},
137137
null,
138-
2
139-
) + "\n"
138+
2,
139+
) + "\n",
140140
);
141141
}
142142
function toScopedPackageName(packageName: string) {

‎build/util/alias.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const alias = new Map(
2727
[originalType, replacement],
2828
[`${originalType}Constructor`, `${replacement}Constructor`],
2929
]),
30-
])
30+
]),
3131
),
3232
],
3333
[
@@ -39,8 +39,8 @@ export const alias = new Map(
3939
[originalType, replacement],
4040
[`${originalType}Constructor`, `${replacement}Constructor`],
4141
]),
42-
])
42+
]),
4343
),
4444
],
45-
])
45+
]),
4646
);

‎build/util/upsert.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export function upsert<K, V>(
22
map: Map<K, V>,
33
key: K,
4-
update: (value: V | undefined) => V
4+
update: (value: V | undefined) => V,
55
) {
66
const value = map.get(key);
77
map.set(key, update(value));

‎lib/lib.es2015.collection.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ interface Map<K, V> {
44
*/
55
forEach<This = undefined>(
66
callbackfn: (this: This, value: V, key: K, map: this) => void,
7-
thisArg?: This
7+
thisArg?: This,
88
): void;
99
}
1010

@@ -15,15 +15,15 @@ interface MapConstructor {
1515

1616
interface WeakMapConstructor {
1717
new <K extends WeakKey, V>(
18-
entries?: readonly (readonly [K, V])[] | null
18+
entries?: readonly (readonly [K, V])[] | null,
1919
): WeakMap<K, V>;
2020
readonly prototype: WeakMap<WeakKey, unknown>;
2121
}
2222

2323
interface ReadonlyMap<K, V> {
2424
forEach<This = undefined>(
2525
callbackfn: (this: This, value: V, key: K, map: this) => void,
26-
thisArg?: This
26+
thisArg?: This,
2727
): void;
2828
}
2929

@@ -33,7 +33,7 @@ interface Set<T> {
3333
*/
3434
forEach<This = undefined>(
3535
callbackfn: (this: This, value: T, value2: T, set: this) => void,
36-
thisArg?: This
36+
thisArg?: This,
3737
): void;
3838
}
3939

@@ -45,6 +45,6 @@ interface SetConstructor {
4545
interface ReadonlySet<T> {
4646
forEach<This = undefined>(
4747
callbackfn: (this: This, value: T, value2: T, set: this) => void,
48-
thisArg?: This
48+
thisArg?: This,
4949
): void;
5050
}

‎lib/lib.es2015.core.d.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface Array<T> {
1010
*/
1111
find<S extends T, This = undefined>(
1212
predicate: (this: This, value: T, index: number, obj: this) => value is S,
13-
thisArg?: This
13+
thisArg?: This,
1414
): S | undefined;
1515

1616
/**
@@ -24,7 +24,7 @@ interface Array<T> {
2424
*/
2525
find<This = undefined>(
2626
predicate: (this: This, value: T, index: number, obj: this) => boolean,
27-
thisArg?: This
27+
thisArg?: This,
2828
): T | undefined;
2929

3030
/**
@@ -38,7 +38,7 @@ interface Array<T> {
3838
*/
3939
findIndex<This = undefined>(
4040
predicate: (this: This, value: T, index: number, obj: this) => boolean,
41-
thisArg?: This
41+
thisArg?: This,
4242
): number;
4343
}
4444

@@ -58,7 +58,7 @@ interface ArrayConstructor {
5858
from<T, U, This = undefined>(
5959
source: ArrayLike<T>,
6060
mapfn: (this: This, v: T, k: number) => U,
61-
thisArg?: This
61+
thisArg?: This,
6262
): U[];
6363
}
6464

@@ -114,7 +114,7 @@ interface ReadonlyArray<T> {
114114
*/
115115
find<S extends T, This = undefined>(
116116
predicate: (this: This, value: T, index: number, obj: this) => value is S,
117-
thisArg?: This
117+
thisArg?: This,
118118
): S | undefined;
119119

120120
/**
@@ -128,7 +128,7 @@ interface ReadonlyArray<T> {
128128
*/
129129
find<This = undefined>(
130130
predicate: (this: This, value: T, index: number, obj: this) => boolean,
131-
thisArg?: This
131+
thisArg?: This,
132132
): T | undefined;
133133

134134
/**
@@ -142,7 +142,7 @@ interface ReadonlyArray<T> {
142142
*/
143143
findIndex<This = undefined>(
144144
predicate: (this: This, value: T, index: number, obj: this) => boolean,
145-
thisArg?: This
145+
thisArg?: This,
146146
): number;
147147
}
148148

‎lib/lib.es2015.iterable.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface ArrayConstructor {
2525
from<T, U, This = undefined>(
2626
iterable: Iterable<T> | ArrayLike<T>,
2727
mapfn: (this: This, v: T, k: number) => U,
28-
thisArg?: This
28+
thisArg?: This,
2929
): U[];
3030
}
3131

@@ -71,6 +71,6 @@ interface TypedNumberArrayConstructor {
7171
from<T, This = undefined>(
7272
iterable: Iterable<T> | ArrayLike<T>,
7373
mapfn: (this: This, v: T, k: number) => number,
74-
thisArg?: This
74+
thisArg?: This,
7575
): TypedNumberArray;
7676
}

‎lib/lib.es2015.promise.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ interface PromiseConstructor {
1010
resolve: undefined extends T
1111
? (value?: T | PromiseLike<T>) => void
1212
: (value: T | PromiseLike<T>) => void,
13-
reject: (reason?: any) => void
14-
) => void
13+
reject: (reason?: any) => void,
14+
) => void,
1515
): Promise<T>;
1616

1717
/**

0 commit comments

Comments
 (0)