From 61e01e9e46dfe0084af7cf937928acaa57f98169 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Sat, 26 Nov 2022 22:27:57 +0100 Subject: [PATCH] Remove ts param from utils --- packages/transformers/typescript-types/src/collect.js | 4 ++-- packages/transformers/typescript-types/src/shake.js | 4 ++-- packages/transformers/typescript-types/src/utils.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/transformers/typescript-types/src/collect.js b/packages/transformers/typescript-types/src/collect.js index 8572bf2a631..be7d920169d 100644 --- a/packages/transformers/typescript-types/src/collect.js +++ b/packages/transformers/typescript-types/src/collect.js @@ -88,12 +88,12 @@ export function collect( currentModule.addExport('default', node.expression.text); } - if (isDeclaration(ts, node)) { + if (isDeclaration(node)) { if (node.name) { currentModule.addLocal(node.name.text, node); } - let name = getExportedName(ts, node); + let name = getExportedName(node); if (name) { currentModule.addLocal(name, node); currentModule.addExport(name, name); diff --git a/packages/transformers/typescript-types/src/shake.js b/packages/transformers/typescript-types/src/shake.js index 3d49ade0ba2..0e056f3b669 100644 --- a/packages/transformers/typescript-types/src/shake.js +++ b/packages/transformers/typescript-types/src/shake.js @@ -125,8 +125,8 @@ export function shake( } } - if (isDeclaration(ts, node)) { - let name = getExportedName(ts, node) || node.name.text; + if (isDeclaration(node)) { + let name = getExportedName(node) || node.name.text; // Remove unused declarations if (!currentModule.used.has(name)) { diff --git a/packages/transformers/typescript-types/src/utils.js b/packages/transformers/typescript-types/src/utils.js index 7178997f3a2..ac6e38887a3 100644 --- a/packages/transformers/typescript-types/src/utils.js +++ b/packages/transformers/typescript-types/src/utils.js @@ -1,7 +1,7 @@ // @flow -import typeof TypeScriptModule from 'typescript'; // eslint-disable-line import/no-extraneous-dependencies +import ts from 'typescript'; -export function getExportedName(ts: TypeScriptModule, node: any): ?string { +export function getExportedName(node: any): ?string { if (!node.modifiers) { return null; } @@ -17,7 +17,7 @@ export function getExportedName(ts: TypeScriptModule, node: any): ?string { return node.name.text; } -export function isDeclaration(ts: TypeScriptModule, node: any): boolean { +export function isDeclaration(node: any): boolean { return ( ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node) ||