Skip to content

Commit

Permalink
chore(deps): upgrade typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Mar 31, 2023
1 parent 132fbac commit 35043f9
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 80 deletions.
28 changes: 2 additions & 26 deletions lib/plugin/visitors/abstract.visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,9 @@ export class AbstractFileVisitor {
factory: ts.NodeFactory | undefined,
program: ts.Program
): ts.SourceFile {
if (!factory) {
// support TS v4.2+
const importEqualsDeclaration =
major == 4 && minor >= 2
? (ts.createImportEqualsDeclaration as any)(
undefined,
undefined,
false,
OPENAPI_NAMESPACE,
ts.createExternalModuleReference(
ts.createLiteral(OPENAPI_PACKAGE_NAME)
)
)
: (ts.createImportEqualsDeclaration as any)(
undefined,
undefined,
OPENAPI_NAMESPACE,
ts.createExternalModuleReference(
ts.createLiteral(OPENAPI_PACKAGE_NAME)
)
);
return ts.updateSourceFileNode(sourceFile, [
importEqualsDeclaration,
...sourceFile.statements
]);
if (major >= 4 && minor >= 2) {
throw new Error('Nest CLI plugin does not support TypeScript < v4.2');
}
// support TS v4.2+
const importEqualsDeclaration: ts.ImportDeclaration =
major >= 4 && minor >= 2
? minor >= 8
Expand Down
6 changes: 3 additions & 3 deletions lib/plugin/visitors/controller-class.visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class ControllerClassVisitor extends AbstractFileVisitor {
// Support both >= v4.8 and v4.7 and lower
const decorators = (ts as any).canHaveDecorators
? (ts as any).getDecorators(compilerNode)
: compilerNode.decorators;
: (compilerNode as any).decorators;
if (!decorators) {
return compilerNode;
}
Expand Down Expand Up @@ -124,7 +124,7 @@ export class ControllerClassVisitor extends AbstractFileVisitor {
compilerNode.type,
compilerNode.body
)
: factory.updateMethodDeclaration(
: (factory as any).updateMethodDeclaration(
compilerNode,
updatedDecorators,
modifiers,
Expand Down Expand Up @@ -282,7 +282,7 @@ export class ControllerClassVisitor extends AbstractFileVisitor {
// Support both >= v4.8 and v4.7 and lower
const decorators = (ts as any).canHaveDecorators
? (ts as any).getDecorators(node)
: node.decorators;
: (node as any).decorators;
const httpCodeDecorator = getDecoratorOrUndefinedByNames(
['HttpCode'],
decorators,
Expand Down
12 changes: 6 additions & 6 deletions lib/plugin/visitors/model-class.visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class ModelClassVisitor extends AbstractFileVisitor {
// Support both >= v4.8 and v4.7 and lower
const decorators = (ts as any).canHaveDecorators
? (ts as any).getDecorators(node)
: node.decorators;
: (node as any).decorators;

const hidePropertyDecorator = getDecoratorOrUndefinedByNames(
[ApiHideProperty.name],
Expand Down Expand Up @@ -130,7 +130,7 @@ export class ModelClassVisitor extends AbstractFileVisitor {
true
)
)
: factory.createMethodDeclaration(
: (factory as any).createMethodDeclaration(
undefined,
[factory.createModifier(ts.SyntaxKind.StaticKeyword)],
undefined,
Expand All @@ -154,9 +154,9 @@ export class ModelClassVisitor extends AbstractFileVisitor {
node.heritageClauses,
[...node.members, method]
)
: factory.updateClassDeclaration(
: (factory as any).updateClassDeclaration(
node,
node.decorators,
(node as any).decorators,
node.modifiers as any,
node.name,
node.typeParameters,
Expand Down Expand Up @@ -418,7 +418,7 @@ export class ModelClassVisitor extends AbstractFileVisitor {
if (hasPropertyKey(key, existingProperties)) {
return undefined;
}
let initializer = node.initializer;
let initializer = (node as ts.PropertyDeclaration).initializer;
if (!initializer) {
return undefined;
}
Expand All @@ -436,7 +436,7 @@ export class ModelClassVisitor extends AbstractFileVisitor {
// Support both >= v4.8 and v4.7 and lower
const decorators = (ts as any).canHaveDecorators
? (ts as any).getDecorators(node)
: node.decorators;
: (node as any).decorators;

this.addPropertyByValidationDecorator(
factory,
Expand Down
Loading

0 comments on commit 35043f9

Please sign in to comment.