Skip to content

Commit 77bfaba

Browse files
committed
fix(typescript): add support to typescript 4.9.3
1 parent b782c5d commit 77bfaba

File tree

5 files changed

+42
-50
lines changed

5 files changed

+42
-50
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ updates:
66
- package-ecosystem: "npm"
77
directory: "/"
88
schedule:
9-
interval: "daily"
9+
interval: "daily"
1010
ignore:
11-
- dependency-name: "ttypescript"
12-
# the latest version does not have release notes or documentation
13-
# https://github.com/cevek/ttypescript/issues/131
1411
- dependency-name: "@types/node"
1512
# @types/node versions follow node versions. this project currently supports node lts/gallium and lts/fermium
16-
versions: ['>=17.0.0']
13+
versions: [ '>=17.0.0' ]

package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
"ts-loader": "9.3.1",
9191
"ts-node": "10.9.1",
9292
"tsconfig-paths": "4.1.0",
93-
"ttypescript": "1.5.12",
94-
"typescript": "4.7.4",
93+
"ttypescript": "^1.5.13",
94+
"typescript": "^4.9.3",
9595
"webpack": "5.74.0",
9696
"webpack-cli": "4.10.0",
9797
"webpack-merge": "5.8.0",

src/transformer/descriptor/mock/mockProperties.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ export function GetMockPropertiesFromDeclarations(
4545
): ts.CallExpression {
4646
const propertiesFilter: PropertyLike[] = list.filter(
4747
(member: PropertyLike) => {
48-
const modifiers: ts.ModifiersArray | undefined = member.modifiers;
48+
const modifiers:
49+
| ts.NodeArray<ts.Modifier>
50+
| ts.NodeArray<ts.ModifierLike>
51+
| undefined = member.modifiers;
4952

5053
if (IsTypescriptType(member)) {
5154
// Workaround to remove any properties coming from typescript/lib

src/typescriptFactory/typescriptFactory.ts

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -212,28 +212,24 @@ export function createPropertySignature(
212212
}
213213

214214
export function createParameter(parameterName: string): ParameterDeclaration {
215+
const modifiers: undefined = undefined;
216+
const dotDotDotToken: undefined = undefined;
215217
return core.ts.factory.createParameterDeclaration(
216-
undefined,
217-
undefined,
218-
undefined,
219-
createIdentifier(parameterName),
220-
undefined,
221-
undefined,
222-
undefined
218+
modifiers,
219+
dotDotDotToken,
220+
createIdentifier(parameterName)
223221
);
224222
}
225223

226224
export function createParameterFromIdentifier(
227225
identifier: Identifier
228226
): ParameterDeclaration {
227+
const modifiers: undefined = undefined;
228+
const dotDotDotToken: undefined = undefined;
229229
return core.ts.factory.createParameterDeclaration(
230-
undefined,
231-
undefined,
232-
undefined,
233-
identifier,
234-
undefined,
235-
undefined,
236-
undefined
230+
modifiers,
231+
dotDotDotToken,
232+
identifier
237233
);
238234
}
239235

@@ -245,7 +241,6 @@ export function createMethod(
245241
const parameters: ParameterDeclaration[] = parameterNames.map(
246242
(parameterName: Identifier) =>
247243
core.ts.factory.createParameterDeclaration(
248-
undefined,
249244
undefined,
250245
undefined,
251246
parameterName,
@@ -254,15 +249,19 @@ export function createMethod(
254249
undefined
255250
)
256251
);
252+
const modifiers: undefined = undefined;
253+
const asteriskToken: undefined = undefined;
254+
const questionToken: undefined = undefined;
255+
const typeParameters: undefined = undefined;
256+
const type: undefined = undefined;
257257
return core.ts.factory.createMethodDeclaration(
258-
undefined,
259-
undefined,
260-
undefined,
258+
modifiers,
259+
asteriskToken,
261260
createIdentifier(methodName),
262-
undefined,
263-
undefined,
261+
questionToken,
262+
typeParameters,
264263
parameters,
265-
undefined,
264+
type,
266265
body
267266
);
268267
}
@@ -335,12 +334,6 @@ export function createFunctionTypeNode(typeNode: TypeNode): FunctionTypeNode {
335334
return core.ts.factory.createFunctionTypeNode([], [], typeNode);
336335
}
337336

338-
export function createNode(): Node {
339-
return core.ts.factory.createKeywordTypeNode(
340-
core.ts.SyntaxKind.NumberKeyword
341-
);
342-
}
343-
344337
export function createObjectLiteral(
345338
properties?: readonly ObjectLiteralElementLike[],
346339
multiLine?: boolean
@@ -431,7 +424,6 @@ export function createImportAllAs(
431424
filenameToImportFrom: string
432425
): ImportDeclaration {
433426
return core.ts.factory.createImportDeclaration(
434-
[],
435427
[],
436428
core.ts.factory.createImportClause(
437429
false,

0 commit comments

Comments
 (0)