From 01656ef1340b8f9af0396fa8b603bb1f45c4d262 Mon Sep 17 00:00:00 2001 From: Daniel Martens Date: Fri, 25 Mar 2022 17:18:55 +0100 Subject: [PATCH 1/2] fix(visitor-keys): add missing visitor keys --- packages/visitor-keys/src/visitor-keys.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/visitor-keys/src/visitor-keys.ts b/packages/visitor-keys/src/visitor-keys.ts index 85e42430819..d63cb412c39 100644 --- a/packages/visitor-keys/src/visitor-keys.ts +++ b/packages/visitor-keys/src/visitor-keys.ts @@ -49,7 +49,7 @@ const additionalKeys: AdditionalKeys = { Identifier: ['decorators', 'typeAnnotation'], ImportDeclaration: ['specifiers', 'source', 'assertions'], ImportExpression: ['source', 'attributes'], - MethodDefinition: ['decorators', 'key', 'value'], + MethodDefinition: ['decorators', 'key', 'value', 'typeParameters'], NewExpression: ['callee', 'typeParameters', 'arguments'], ObjectPattern: ['decorators', 'properties', 'typeAnnotation'], PropertyDefinition: ['decorators', 'key', 'typeAnnotation', 'value'], @@ -89,7 +89,7 @@ const additionalKeys: AdditionalKeys = { 'params', 'returnType', ], - TSEnumDeclaration: ['id', 'members'], + TSEnumDeclaration: ['modifiers', 'id', 'members'], TSEnumMember: ['id', 'initializer'], TSExportAssignment: ['expression'], TSExportKeyword: [], @@ -101,7 +101,13 @@ const additionalKeys: AdditionalKeys = { TSIndexSignature: ['parameters', 'typeAnnotation'], TSInferType: ['typeParameter'], TSInterfaceBody: ['body'], - TSInterfaceDeclaration: ['id', 'typeParameters', 'extends', 'body'], + TSInterfaceDeclaration: [ + 'id', + 'typeParameters', + 'extends', + 'implements', + 'body', + ], TSInterfaceHeritage: ['expression', 'typeParameters'], TSIntersectionType: ['types'], TSIntrinsicKeyword: [], @@ -109,8 +115,8 @@ const additionalKeys: AdditionalKeys = { TSMappedType: ['nameType', 'typeParameter', 'typeAnnotation'], TSMethodSignature: ['typeParameters', 'key', 'params', 'returnType'], TSModuleBlock: ['body'], - TSModuleDeclaration: ['id', 'body'], - TSNamedTupleMember: ['elementType'], + TSModuleDeclaration: ['modifiers', 'id', 'body'], + TSNamedTupleMember: ['label', 'elementType'], TSNamespaceExportDeclaration: ['id'], TSNeverKeyword: [], TSNonNullExpression: ['expression'], From a3bf5084100d3f52da4b68be81ec9e79ebce0f2f Mon Sep 17 00:00:00 2001 From: Daniel Martens Date: Tue, 29 Mar 2022 13:59:27 +0200 Subject: [PATCH 2/2] fix(visitor-keys): remove unintended visitor keys --- packages/visitor-keys/src/visitor-keys.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/visitor-keys/src/visitor-keys.ts b/packages/visitor-keys/src/visitor-keys.ts index d63cb412c39..3e49d2d1b48 100644 --- a/packages/visitor-keys/src/visitor-keys.ts +++ b/packages/visitor-keys/src/visitor-keys.ts @@ -89,7 +89,7 @@ const additionalKeys: AdditionalKeys = { 'params', 'returnType', ], - TSEnumDeclaration: ['modifiers', 'id', 'members'], + TSEnumDeclaration: ['id', 'members'], TSEnumMember: ['id', 'initializer'], TSExportAssignment: ['expression'], TSExportKeyword: [], @@ -101,13 +101,7 @@ const additionalKeys: AdditionalKeys = { TSIndexSignature: ['parameters', 'typeAnnotation'], TSInferType: ['typeParameter'], TSInterfaceBody: ['body'], - TSInterfaceDeclaration: [ - 'id', - 'typeParameters', - 'extends', - 'implements', - 'body', - ], + TSInterfaceDeclaration: ['id', 'typeParameters', 'extends', 'body'], TSInterfaceHeritage: ['expression', 'typeParameters'], TSIntersectionType: ['types'], TSIntrinsicKeyword: [], @@ -115,7 +109,7 @@ const additionalKeys: AdditionalKeys = { TSMappedType: ['nameType', 'typeParameter', 'typeAnnotation'], TSMethodSignature: ['typeParameters', 'key', 'params', 'returnType'], TSModuleBlock: ['body'], - TSModuleDeclaration: ['modifiers', 'id', 'body'], + TSModuleDeclaration: ['id', 'body'], TSNamedTupleMember: ['label', 'elementType'], TSNamespaceExportDeclaration: ['id'], TSNeverKeyword: [],