Skip to content

Commit 417b0a6

Browse files
rbucktonrbuckton
committed
Rename factory methods to be more consistent
1 parent 7dbd48b commit 417b0a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+908
-907
lines changed

Diff for: ‎src/compat/deprecations.ts

+67-67
Large diffs are not rendered by default.

Diff for: ‎src/compiler/checker.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -4292,7 +4292,7 @@ namespace ts {
42924292
if (type.flags & TypeFlags.NumberLiteral) {
42934293
const value = (<NumberLiteralType>type).value;
42944294
context.approximateLength += ("" + value).length;
4295-
return factory.createLiteralTypeNode(value < 0 ? factory.createPrefix(SyntaxKind.MinusToken, factory.createNumericLiteral(-value)) : factory.createNumericLiteral(value));
4295+
return factory.createLiteralTypeNode(value < 0 ? factory.createPrefixUnaryExpression(SyntaxKind.MinusToken, factory.createNumericLiteral(-value)) : factory.createNumericLiteral(value));
42964296
}
42974297
if (type.flags & TypeFlags.BigIntLiteral) {
42984298
context.approximateLength += (pseudoBigIntToString((<BigIntLiteralType>type).value).length) + 1;
@@ -5517,7 +5517,7 @@ namespace ts {
55175517
const identifier = setEmitFlags(factory.createIdentifier(symbolName, typeParameterNodes), EmitFlags.NoAsciiEscaping);
55185518
identifier.symbol = symbol;
55195519

5520-
return index > 0 ? factory.createPropertyAccess(createExpressionFromSymbolChain(chain, index - 1), identifier) : identifier;
5520+
return index > 0 ? factory.createPropertyAccessExpression(createExpressionFromSymbolChain(chain, index - 1), identifier) : identifier;
55215521
}
55225522
else {
55235523
if (firstChar === CharacterCodes.openBracket) {
@@ -5539,7 +5539,7 @@ namespace ts {
55395539
expression = setEmitFlags(factory.createIdentifier(symbolName, typeParameterNodes), EmitFlags.NoAsciiEscaping);
55405540
expression.symbol = symbol;
55415541
}
5542-
return factory.createElementAccess(createExpressionFromSymbolChain(chain, index - 1), expression);
5542+
return factory.createElementAccessExpression(createExpressionFromSymbolChain(chain, index - 1), expression);
55435543
}
55445544
}
55455545
}
@@ -5562,7 +5562,7 @@ namespace ts {
55625562
return fromNameType;
55635563
}
55645564
if (isKnownSymbol(symbol)) {
5565-
return factory.createComputedPropertyName(factory.createPropertyAccess(factory.createIdentifier("Symbol"), (symbol.escapedName as string).substr(3)));
5565+
return factory.createComputedPropertyName(factory.createPropertyAccessExpression(factory.createIdentifier("Symbol"), (symbol.escapedName as string).substr(3)));
55665566
}
55675567
const rawName = unescapeLeadingUnderscores(symbol.escapedName);
55685568
return createPropertyNameNodeForIdentifierOrLiteral(rawName, singleQuote);
@@ -7577,7 +7577,7 @@ namespace ts {
75777577
const propName = getDestructuringPropertyName(node);
75787578
if (propName) {
75797579
const literal = setTextRange(parseNodeFactory.createStringLiteral(propName), node);
7580-
const result = setTextRange(parseNodeFactory.createElementAccess(parentAccess, literal), node);
7580+
const result = setTextRange(parseNodeFactory.createElementAccessExpression(parentAccess, literal), node);
75817581
setParent(literal, result);
75827582
setParent(result, node);
75837583
result.flowNode = parentAccess.flowNode;
@@ -7869,7 +7869,7 @@ namespace ts {
78697869
}
78707870

78717871
function getFlowTypeInConstructor(symbol: Symbol, constructor: ConstructorDeclaration) {
7872-
const reference = factory.createPropertyAccess(factory.createThis(), unescapeLeadingUnderscores(symbol.escapedName));
7872+
const reference = factory.createPropertyAccessExpression(factory.createThis(), unescapeLeadingUnderscores(symbol.escapedName));
78737873
setParent(reference.expression, reference);
78747874
setParent(reference, constructor);
78757875
reference.flowNode = constructor.returnFlowNode;
@@ -34238,7 +34238,7 @@ namespace ts {
3423834238
}
3423934239

3424034240
function isPropertyInitializedInConstructor(propName: Identifier | PrivateIdentifier, propType: Type, constructor: ConstructorDeclaration) {
34241-
const reference = factory.createPropertyAccess(factory.createThis(), propName);
34241+
const reference = factory.createPropertyAccessExpression(factory.createThis(), propName);
3424234242
setParent(reference.expression, reference);
3424334243
setParent(reference, constructor);
3424434244
reference.flowNode = constructor.returnFlowNode;

Diff for: ‎src/compiler/factory/emitHelpers.ts

+26-26
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace ts {
8787
context.requestEmitHelper(decorateHelper);
8888

8989
const argumentsArray: Expression[] = [];
90-
argumentsArray.push(factory.createArrayLiteral(decoratorExpressions, /*multiLine*/ true));
90+
argumentsArray.push(factory.createArrayLiteralExpression(decoratorExpressions, /*multiLine*/ true));
9191
argumentsArray.push(target);
9292
if (memberName) {
9393
argumentsArray.push(memberName);
@@ -96,7 +96,7 @@ namespace ts {
9696
}
9797
}
9898

99-
return factory.createCall(
99+
return factory.createCallExpression(
100100
getUnscopedHelperName("__decorate"),
101101
/*typeArguments*/ undefined,
102102
argumentsArray
@@ -105,7 +105,7 @@ namespace ts {
105105

106106
function createMetadataHelper(metadataKey: string, metadataValue: Expression) {
107107
context.requestEmitHelper(metadataHelper);
108-
return factory.createCall(
108+
return factory.createCallExpression(
109109
getUnscopedHelperName("__metadata"),
110110
/*typeArguments*/ undefined,
111111
[
@@ -118,7 +118,7 @@ namespace ts {
118118
function createParamHelper(expression: Expression, parameterOffset: number, location?: TextRange) {
119119
context.requestEmitHelper(paramHelper);
120120
return setTextRange(
121-
factory.createCall(
121+
factory.createCallExpression(
122122
getUnscopedHelperName("__param"),
123123
/*typeArguments*/ undefined,
124124
[
@@ -134,12 +134,12 @@ namespace ts {
134134

135135
function createAssignHelper(attributesSegments: Expression[]) {
136136
if (context.getCompilerOptions().target! >= ScriptTarget.ES2015) {
137-
return factory.createCall(factory.createPropertyAccess(factory.createIdentifier("Object"), "assign"),
137+
return factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "assign"),
138138
/*typeArguments*/ undefined,
139139
attributesSegments);
140140
}
141141
context.requestEmitHelper(assignHelper);
142-
return factory.createCall(
142+
return factory.createCallExpression(
143143
getUnscopedHelperName("__assign"),
144144
/*typeArguments*/ undefined,
145145
attributesSegments
@@ -148,7 +148,7 @@ namespace ts {
148148

149149
function createAwaitHelper(expression: Expression) {
150150
context.requestEmitHelper(awaitHelper);
151-
return factory.createCall(getUnscopedHelperName("__await"), /*typeArguments*/ undefined, [expression]);
151+
return factory.createCallExpression(getUnscopedHelperName("__await"), /*typeArguments*/ undefined, [expression]);
152152
}
153153

154154
function createAsyncGeneratorHelper(generatorFunc: FunctionExpression, hasLexicalThis: boolean) {
@@ -158,7 +158,7 @@ namespace ts {
158158
// Mark this node as originally an async function
159159
(generatorFunc.emitNode || (generatorFunc.emitNode = {} as EmitNode)).flags |= EmitFlags.AsyncFunctionBody | EmitFlags.ReuseTempVariableScope;
160160

161-
return factory.createCall(
161+
return factory.createCallExpression(
162162
getUnscopedHelperName("__asyncGenerator"),
163163
/*typeArguments*/ undefined,
164164
[
@@ -172,7 +172,7 @@ namespace ts {
172172
function createAsyncDelegatorHelper(expression: Expression) {
173173
context.requestEmitHelper(awaitHelper);
174174
context.requestEmitHelper(asyncDelegator);
175-
return factory.createCall(
175+
return factory.createCallExpression(
176176
getUnscopedHelperName("__asyncDelegator"),
177177
/*typeArguments*/ undefined,
178178
[expression]
@@ -181,7 +181,7 @@ namespace ts {
181181

182182
function createAsyncValuesHelper(expression: Expression) {
183183
context.requestEmitHelper(asyncValues);
184-
return factory.createCall(
184+
return factory.createCallExpression(
185185
getUnscopedHelperName("__asyncValues"),
186186
/*typeArguments*/ undefined,
187187
[expression]
@@ -206,7 +206,7 @@ namespace ts {
206206
computedTempVariableOffset++;
207207
// typeof _tmp === "symbol" ? _tmp : _tmp + ""
208208
propertyNames.push(
209-
factory.createConditional(
209+
factory.createConditionalExpression(
210210
factory.createTypeCheck(temp, "symbol"),
211211
/*questionToken*/ undefined,
212212
temp,
@@ -220,13 +220,13 @@ namespace ts {
220220
}
221221
}
222222
}
223-
return factory.createCall(
223+
return factory.createCallExpression(
224224
getUnscopedHelperName("__rest"),
225225
/*typeArguments*/ undefined,
226226
[
227227
value,
228228
setTextRange(
229-
factory.createArrayLiteral(propertyNames),
229+
factory.createArrayLiteralExpression(propertyNames),
230230
location
231231
)]
232232
);
@@ -250,7 +250,7 @@ namespace ts {
250250
// Mark this node as originally an async function
251251
(generatorFunc.emitNode || (generatorFunc.emitNode = {} as EmitNode)).flags |= EmitFlags.AsyncFunctionBody | EmitFlags.ReuseTempVariableScope;
252252

253-
return factory.createCall(
253+
return factory.createCallExpression(
254254
getUnscopedHelperName("__awaiter"),
255255
/*typeArguments*/ undefined,
256256
[
@@ -266,7 +266,7 @@ namespace ts {
266266

267267
function createExtendsHelper(name: Identifier) {
268268
context.requestEmitHelper(extendsHelper);
269-
return factory.createCall(
269+
return factory.createCallExpression(
270270
getUnscopedHelperName("__extends"),
271271
/*typeArguments*/ undefined,
272272
[name, factory.createUniqueName("_super", GeneratedIdentifierFlags.Optimistic | GeneratedIdentifierFlags.FileLevel)]
@@ -275,7 +275,7 @@ namespace ts {
275275

276276
function createTemplateObjectHelper(cooked: ArrayLiteralExpression, raw: ArrayLiteralExpression) {
277277
context.requestEmitHelper(templateObjectHelper);
278-
return factory.createCall(
278+
return factory.createCallExpression(
279279
getUnscopedHelperName("__makeTemplateObject"),
280280
/*typeArguments*/ undefined,
281281
[cooked, raw]
@@ -285,7 +285,7 @@ namespace ts {
285285
function createSpreadHelper(argumentList: readonly Expression[]) {
286286
context.requestEmitHelper(readHelper);
287287
context.requestEmitHelper(spreadHelper);
288-
return factory.createCall(
288+
return factory.createCallExpression(
289289
getUnscopedHelperName("__spread"),
290290
/*typeArguments*/ undefined,
291291
argumentList
@@ -294,7 +294,7 @@ namespace ts {
294294

295295
function createSpreadArraysHelper(argumentList: readonly Expression[]) {
296296
context.requestEmitHelper(spreadArraysHelper);
297-
return factory.createCall(
297+
return factory.createCallExpression(
298298
getUnscopedHelperName("__spreadArrays"),
299299
/*typeArguments*/ undefined,
300300
argumentList
@@ -305,7 +305,7 @@ namespace ts {
305305

306306
function createValuesHelper(expression: Expression) {
307307
context.requestEmitHelper(valuesHelper);
308-
return factory.createCall(
308+
return factory.createCallExpression(
309309
getUnscopedHelperName("__values"),
310310
/*typeArguments*/ undefined,
311311
[expression]
@@ -314,7 +314,7 @@ namespace ts {
314314

315315
function createReadHelper(iteratorRecord: Expression, count: number | undefined) {
316316
context.requestEmitHelper(readHelper);
317-
return factory.createCall(
317+
return factory.createCallExpression(
318318
getUnscopedHelperName("__read"),
319319
/*typeArguments*/ undefined,
320320
count !== undefined
@@ -327,7 +327,7 @@ namespace ts {
327327

328328
function createGeneratorHelper(body: FunctionExpression) {
329329
context.requestEmitHelper(generatorHelper);
330-
return factory.createCall(
330+
return factory.createCallExpression(
331331
getUnscopedHelperName("__generator"),
332332
/*typeArguments*/ undefined,
333333
[factory.createThis(), body]);
@@ -337,15 +337,15 @@ namespace ts {
337337

338338
function createCreateBindingHelper(module: Expression, inputName: Expression, outputName: Expression | undefined) {
339339
context.requestEmitHelper(createBindingHelper);
340-
return factory.createCall(
340+
return factory.createCallExpression(
341341
getUnscopedHelperName("__createBinding"),
342342
/*typeArguments*/ undefined,
343343
[factory.createIdentifier("exports"), module, inputName, ...(outputName ? [outputName] : [])]);
344344
}
345345

346346
function createImportStarHelper(expression: Expression) {
347347
context.requestEmitHelper(importStarHelper);
348-
return factory.createCall(
348+
return factory.createCallExpression(
349349
getUnscopedHelperName("__importStar"),
350350
/*typeArguments*/ undefined,
351351
[expression]
@@ -359,7 +359,7 @@ namespace ts {
359359

360360
function createImportDefaultHelper(expression: Expression) {
361361
context.requestEmitHelper(importDefaultHelper);
362-
return factory.createCall(
362+
return factory.createCallExpression(
363363
getUnscopedHelperName("__importDefault"),
364364
/*typeArguments*/ undefined,
365365
[expression]
@@ -370,12 +370,12 @@ namespace ts {
370370

371371
function createClassPrivateFieldGetHelper(receiver: Expression, privateField: Identifier) {
372372
context.requestEmitHelper(classPrivateFieldGetHelper);
373-
return factory.createCall(getUnscopedHelperName("__classPrivateFieldGet"), /*typeArguments*/ undefined, [receiver, privateField]);
373+
return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldGet"), /*typeArguments*/ undefined, [receiver, privateField]);
374374
}
375375

376376
function createClassPrivateFieldSetHelper(receiver: Expression, privateField: Identifier, value: Expression) {
377377
context.requestEmitHelper(classPrivateFieldSetHelper);
378-
return factory.createCall(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, [receiver, privateField, value]);
378+
return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, [receiver, privateField, value]);
379379
}
380380
}
381381

Diff for: ‎src/compiler/factory/nodeConverters.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace ts {
1414

1515
function convertToFunctionBlock(node: ConciseBody, multiLine?: boolean): Block {
1616
if (isBlock(node)) return node;
17-
const returnStatement = factory.createReturn(node);
17+
const returnStatement = factory.createReturnStatement(node);
1818
setTextRange(returnStatement, node);
1919
const body = factory.createBlock([returnStatement], multiLine);
2020
setTextRange(body, node);
@@ -44,7 +44,7 @@ namespace ts {
4444
if (isBindingElement(element)) {
4545
if (element.dotDotDotToken) {
4646
Debug.assertNode(element.name, isIdentifier);
47-
return setOriginalNode(setTextRange(factory.createSpread(element.name), element), element);
47+
return setOriginalNode(setTextRange(factory.createSpreadElement(element.name), element), element);
4848
}
4949
const expression = convertToAssignmentElementTarget(element.name);
5050
return element.initializer
@@ -93,7 +93,7 @@ namespace ts {
9393
if (isObjectBindingPattern(node)) {
9494
return setOriginalNode(
9595
setTextRange(
96-
factory.createObjectLiteral(map(node.elements, convertToObjectAssignmentElement)),
96+
factory.createObjectLiteralExpression(map(node.elements, convertToObjectAssignmentElement)),
9797
node
9898
),
9999
node
@@ -106,7 +106,7 @@ namespace ts {
106106
if (isArrayBindingPattern(node)) {
107107
return setOriginalNode(
108108
setTextRange(
109-
factory.createArrayLiteral(map(node.elements, convertToArrayAssignmentElement)),
109+
factory.createArrayLiteralExpression(map(node.elements, convertToArrayAssignmentElement)),
110110
node
111111
),
112112
node

0 commit comments

Comments
 (0)