@teambit/typescript 1.0.186 → 1.0.188

package/sourceFileTransformers/class.ts

@@ -2,7 +2,7 @@ import ts from 'typescript';
 import { replaceName } from './replaceName';
 
 export function classNamesTransformer(nameMapping: Record<string, string>): ts.TransformerFactory<ts.SourceFile> {
-  return (context) => {
+  return (context: ts.TransformationContext) => {
     const { factory } = context;
 
     const visit: ts.Visitor = (node) => {
@@ -17,7 +17,6 @@ export function classNamesTransformer(nameMapping: Record<string, string>): ts.T
               const newMemberName = replaceName(oldMemberName, nameMapping);
               return factory.updatePropertyDeclaration(
                 member,
-                member.decorators,
                 member.modifiers,
                 newMemberName ? ts.factory.createIdentifier(newMemberName) : member.name,
                 member.questionToken,
@@ -33,7 +32,6 @@ export function classNamesTransformer(nameMapping: Record<string, string>): ts.T
               const updatedParameters = member.parameters.map((param) => {
                 return ts.factory.updateParameterDeclaration(
                   param,
-                  param.decorators,
                   param.modifiers,
                   param.dotDotDotToken,
                   param.name,
@@ -45,7 +43,6 @@ export function classNamesTransformer(nameMapping: Record<string, string>): ts.T
 
               return factory.updateMethodDeclaration(
                 member,
-                member.decorators,
                 member.modifiers,
                 member.asteriskToken,
                 newMemberName ? ts.factory.createIdentifier(newMemberName) : member.name,
@@ -61,7 +58,6 @@ export function classNamesTransformer(nameMapping: Record<string, string>): ts.T
 
           return factory.updateClassDeclaration(
             node,
-            node.decorators,
             node.modifiers,
             factory.createIdentifier(newName),
             node.typeParameters,
@@ -72,6 +68,6 @@ export function classNamesTransformer(nameMapping: Record<string, string>): ts.T
       }
       return ts.visitEachChild(node, visit, context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 }

package/sourceFileTransformers/export.ts

@@ -36,7 +36,6 @@ export const exportTransformer: SourceFileTransformer = (mapping: Record<string,
 
         return ts.factory.updateExportDeclaration(
           node,
-          node.decorators,
           node.modifiers,
           node.isTypeOnly,
           updatedExportClause,
@@ -56,11 +55,11 @@ export const exportTransformer: SourceFileTransformer = (mapping: Record<string,
           }
         }
 
-        return ts.factory.updateExportAssignment(node, node.decorators, node.modifiers, expression);
+        return ts.factory.updateExportAssignment(node, node.modifiers, expression);
       }
 
       return ts.visitEachChild(node, visit, context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 };

package/sourceFileTransformers/expression-statement.ts

@@ -21,7 +21,7 @@ export const expressionStatementTransformer: SourceFileTransformer = (mapping: R
 
     const visit: ts.Visitor = (node) => {
       if (ts.isExpressionStatement(node)) {
-        return ts.factory.updateExpressionStatement(node, ts.visitNode(node.expression, visit));
+        return ts.factory.updateExpressionStatement(node, ts.visitNode(node.expression, visit) as ts.Expression);
       }
 
       if (ts.isPropertyAccessExpression(node)) {
@@ -29,7 +29,11 @@ export const expressionStatementTransformer: SourceFileTransformer = (mapping: R
         if (ts.isIdentifier(node.name)) {
           newName = replaceIdentifierText(node.name);
         }
-        return ts.factory.updatePropertyAccessExpression(node, ts.visitNode(node.expression, visit), newName);
+        return ts.factory.updatePropertyAccessExpression(
+          node,
+          ts.visitNode(node.expression, visit) as ts.Expression,
+          newName
+        );
       }
 
       if (ts.isIdentifier(node)) {
@@ -39,6 +43,6 @@ export const expressionStatementTransformer: SourceFileTransformer = (mapping: R
       return ts.visitEachChild(node, visit, context);
     };
 
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 };

package/sourceFileTransformers/function.ts

@@ -28,14 +28,13 @@ export const functionNamesTransformer: SourceFileTransformer = (mapping: Record<
         const functionName = node.name?.getText() ?? '';
         const newName = Object.entries(mapping).find(([key]) => functionName.includes(key))?.[1] ?? functionName;
         const parameters = node.parameters.map((param) => {
-          const newParamType = param.type ? ts.visitNode(param.type, updateTypeReference) : param.type;
+          const newParamType = param.type ? (ts.visitNode(param.type, updateTypeReference) as ts.TypeNode) : param.type;
           if (ts.isIdentifier(param.name)) {
             const oldName = param.name.getText();
             const newParamName = Object.keys(mapping).find((key) => oldName.includes(key));
             if (newParamName) {
               return ts.factory.updateParameterDeclaration(
                 param,
-                param.decorators,
                 param.modifiers,
                 param.dotDotDotToken,
                 ts.factory.createIdentifier(newParamName),
@@ -61,7 +60,6 @@ export const functionNamesTransformer: SourceFileTransformer = (mapping: Record<
             const newParamName = ts.factory.createObjectBindingPattern(elements);
             return ts.factory.updateParameterDeclaration(
               param,
-              param.decorators,
               param.modifiers,
               param.dotDotDotToken,
               newParamName,
@@ -77,7 +75,6 @@ export const functionNamesTransformer: SourceFileTransformer = (mapping: Record<
           const updatedBody = node.body && ts.isBlock(node.body) ? updateReturnStatement(node.body) : node.body;
           return ts.factory.updateFunctionDeclaration(
             node,
-            node.decorators,
             node.modifiers,
             node.asteriskToken,
             newName ? ts.factory.createIdentifier(newName) : node.name,
@@ -168,6 +165,6 @@ export const functionNamesTransformer: SourceFileTransformer = (mapping: Record<
       }
       return ts.factory.createBlock([], true);
     }
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 };

package/sourceFileTransformers/import.ts

@@ -40,7 +40,6 @@ export const importTransformer: SourceFileTransformer = (mapping: Record<string,
 
           return ts.factory.updateImportDeclaration(
             node,
-            node.decorators,
             node.modifiers,
             updatedImportClause,
             ts.factory.createStringLiteral(moduleSpecifier),
@@ -50,7 +49,6 @@ export const importTransformer: SourceFileTransformer = (mapping: Record<string,
 
         return ts.factory.updateImportDeclaration(
           node,
-          node.decorators,
           node.modifiers,
           node.importClause,
           ts.factory.createStringLiteral(moduleSpecifier),
@@ -67,7 +65,6 @@ export const importTransformer: SourceFileTransformer = (mapping: Record<string,
 
         const updatedImportEqualsDeclaration = ts.factory.updateImportEqualsDeclaration(
           node,
-          node.decorators,
           node.modifiers,
           node.isTypeOnly,
           node.name,
@@ -99,6 +96,6 @@ export const importTransformer: SourceFileTransformer = (mapping: Record<string,
 
       return ts.visitEachChild(node, visit, context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 };

package/sourceFileTransformers/interface.ts

@@ -26,7 +26,6 @@ export function interfaceNamesTransformer(nameMapping: Record<string, string>):
           });
           return factory.updateInterfaceDeclaration(
             node,
-            node.decorators,
             node.modifiers,
             factory.createIdentifier(newName),
             node.typeParameters,
@@ -37,6 +36,6 @@ export function interfaceNamesTransformer(nameMapping: Record<string, string>):
       }
       return ts.visitEachChild(node, (child) => visit(child), context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 }

package/sourceFileTransformers/type-reference.ts

@@ -14,6 +14,6 @@ export function typeReferenceTransformer(mapping: Record<string, string>): ts.Tr
       return ts.visitEachChild(node, visit, context);
     };
 
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 }

package/sourceFileTransformers/typeAlias.ts

@@ -11,7 +11,6 @@ export function typeAliasNamesTransformer(nameMapping: Record<string, string>):
         if (newName) {
           return factory.updateTypeAliasDeclaration(
             node,
-            node.decorators,
             node.modifiers,
             factory.createIdentifier(newName),
             node.typeParameters,
@@ -21,6 +20,6 @@ export function typeAliasNamesTransformer(nameMapping: Record<string, string>):
       }
       return ts.visitEachChild(node, (child) => visit(child), context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 }

package/sourceFileTransformers/variable.ts

@@ -20,6 +20,6 @@ export function variableNamesTransformer(nameMapping: Record<string, string>): t
       }
       return ts.visitEachChild(node, (child) => visit(child), context);
     };
-    return (node) => ts.visitNode(node, visit);
+    return (node) => ts.visitNode(node, visit) as ts.SourceFile;
   };
 }

package/transformers/class-declaration.ts

@@ -51,8 +51,9 @@ export class ClassDeclarationTransformer implements SchemaTransformer {
   }
 
   async transform(node: ClassDeclaration, context: SchemaExtractorContext) {
-    const decorators = node.decorators?.length
-      ? await pMapSeries(node.decorators, (decorator) => context.computeSchema(decorator))
+    const nodeDecorators = ts.canHaveDecorators(node) ? ts.getDecorators(node) : undefined;
+    const decorators = nodeDecorators?.length
+      ? await pMapSeries(nodeDecorators, (decorator) => context.computeSchema(decorator))
       : undefined;
     const className = this.getName(node);
     const extendsExpressionsWithTypeArgs = await this.getExpressionWithTypeArgs(
@@ -72,7 +73,8 @@ export class ClassDeclarationTransformer implements SchemaTransformer {
     });
     const signature = node.name ? await context.getQuickInfoDisplayString(node.name) : undefined;
     const members = await pMapSeries(node.members, async (member) => {
-      const isPrivate = member.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.PrivateKeyword);
+      const memberModifiers = ts.canHaveModifiers(member) ? ts.getModifiers(member) : undefined;
+      const isPrivate = memberModifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.PrivateKeyword);
       if (isPrivate) {
         return null;
       }

package/transformers/export-declaration.ts

@@ -134,7 +134,7 @@ also, make sure the tsconfig.json in the root has the "jsx" setting defined.`);
     }
 
     if (definitionNode.parent.kind === SyntaxKind.ExportSpecifier)
-      return exportSpecifierToSchemaNode(definitionNode.parent as ExportSpecifier, context);
+      return await exportSpecifierToSchemaNode(definitionNode.parent as ExportSpecifier, context);
 
     return await context.computeSchema(definitionNode.parent);
   } catch (e) {

package/transformers/function-like.ts

@@ -31,8 +31,9 @@ export class FunctionLikeTransformer implements SchemaTransformer {
 
   async transform(node: SignatureDeclaration, context: SchemaExtractorContext): Promise<SchemaNode> {
     const name = this.getName(node);
+    const nodeModifiers = ts.canHaveModifiers(node) ? ts.getModifiers(node) : undefined;
     const getQuickInfoFromDefaultModifier = async () => {
-      const defaultModifier = node.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword);
+      const defaultModifier = nodeModifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword);
       if (defaultModifier) return context.getQuickInfo(defaultModifier);
       if (node.kind === ts.SyntaxKind.ArrowFunction) return context.getQuickInfo(node.equalsGreaterThanToken);
       return null;
@@ -45,12 +46,13 @@ export class FunctionLikeTransformer implements SchemaTransformer {
     )) as ParameterSchema[];
 
     const returnType = await context.resolveType(node, returnTypeStr, Boolean(info));
-    const modifiers = node.modifiers?.map((modifier) => modifier.getText()) || [];
+    const modifiers = nodeModifiers?.map((modifier) => modifier.getText()) || [];
     const typeParameters = node.typeParameters?.map((typeParam) => typeParam.name.getText());
     const location = context.getLocation(node);
     const doc = await context.jsDocToDocSchema(node);
-    const decorators = node.decorators?.length
-      ? await pMapSeries(node.decorators, (decorator) => context.computeSchema(decorator))
+    const nodeDecorators = ts.canHaveDecorators(node) ? ts.getDecorators(node) : undefined;
+    const decorators = nodeDecorators?.length
+      ? await pMapSeries(nodeDecorators, (decorator) => context.computeSchema(decorator))
       : undefined;
 
     return new FunctionLikeSchema(

package/transformers/property-declaration.ts

@@ -1,4 +1,4 @@
-import { Node, PropertyDeclaration, PropertySignature, SyntaxKind } from 'typescript';
+import { Node, PropertyDeclaration, PropertySignature, SyntaxKind, isPropertyDeclaration } from 'typescript';
 import { VariableLikeSchema } from '@teambit/semantics.entities.semantic-schema';
 import { SchemaTransformer } from '../schema-transformer';
 import { SchemaExtractorContext } from '../schema-extractor-context';
@@ -26,9 +26,9 @@ export class PropertyDeclarationTransformer implements SchemaTransformer {
     const displaySig = info?.body?.displayString || node.getText();
     const typeStr = parseTypeFromQuickInfo(info);
     const type = await context.resolveType(node, typeStr);
-    const isOptional = Boolean(node.questionToken) || Boolean(node.initializer);
+    const isOptional = Boolean(node.questionToken) || (isPropertyDeclaration(node) && Boolean(node.initializer));
     const doc = await context.jsDocToDocSchema(node);
-    const defaultValue = node.initializer ? node.initializer.getText() : undefined;
+    const defaultValue = isPropertyDeclaration(node) ? node.initializer?.getText() : undefined;
     return new VariableLikeSchema(context.getLocation(node), name, displaySig, type, isOptional, doc, defaultValue);
   }
 }

package/transformers/source-file-transformer.ts

@@ -66,8 +66,9 @@ export class SourceFileTransformer implements SchemaTransformer {
     return ast.statements.filter((statement) => {
       if (statement.kind === ts.SyntaxKind.ExportDeclaration || statement.kind === ts.SyntaxKind.ExportAssignment)
         return true;
+      const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined;
       const isExport = Boolean(
-        statement.modifiers?.find((modifier) => {
+        modifiers?.find((modifier) => {
           return modifier.kind === ts.SyntaxKind.ExportKeyword;
         })
       );
@@ -77,9 +78,10 @@ export class SourceFileTransformer implements SchemaTransformer {
 
   private listInternalNodes(ast: SourceFile): Node[] {
     return ast.statements.filter((statement) => {
+      const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined;
       if (
         !(statement.kind === ts.SyntaxKind.ExportDeclaration || statement.kind === ts.SyntaxKind.ExportAssignment) &&
-        !statement.modifiers?.find((modifier) => {
+        !modifiers?.find((modifier) => {
           return modifier.kind === ts.SyntaxKind.ExportKeyword;
         })
       ) {

package/transformers/utils/parse-type-from-quick-info.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-unresolved
-import protocol from 'typescript/lib/protocol';
+import type ts from 'typescript/lib/tsserverlibrary';
 
 export const UNRESOLVED = '<<unresolved>>';
 
@@ -35,7 +34,7 @@ export const UNRESOLVED = '<<unresolved>>';
  *     b: number;
  * }
  */
-export function parseTypeFromQuickInfo(quickInfo: protocol.QuickInfoResponse | undefined): string {
+export function parseTypeFromQuickInfo(quickInfo: ts.server.protocol.QuickInfoResponse | undefined): string {
   if (!quickInfo?.body?.displayString) return '';
   const displayString = quickInfo.body.displayString;
   const splitByColon = displayString.split(':');
@@ -92,7 +91,7 @@ export function parseTypeFromQuickInfo(quickInfo: protocol.QuickInfoResponse | u
   }
 }
 
-export function parseReturnTypeFromQuickInfo(quickInfo: protocol.QuickInfoResponse | undefined): string {
+export function parseReturnTypeFromQuickInfo(quickInfo: ts.server.protocol.QuickInfoResponse | undefined): string {
   if (!quickInfo) return '';
   const typeStr = parseTypeFromQuickInfo(quickInfo);
   const array = typeStr.split('=>');

package/transformers/variable-declaration.ts

@@ -33,7 +33,8 @@ export class VariableDeclaration implements SchemaTransformer {
     const displaySig = info?.body?.displayString || '';
     const location = context.getLocation(varDec);
     const doc = await context.jsDocToDocSchema(varDec);
-    const modifiers = varDec.modifiers?.map((modifier) => modifier.getText()) || [];
+    const nodeModifiers = ts.canHaveModifiers(varDec) ? ts.getModifiers(varDec) : undefined;
+    const modifiers = nodeModifiers?.map((modifier) => modifier.getText()) || [];
     if (varDec.initializer?.kind === ts.SyntaxKind.ArrowFunction) {
       const functionLikeInfo = await context.getQuickInfo((varDec.initializer as ArrowFunction).equalsGreaterThanToken);
       const returnTypeStr = functionLikeInfo ? parseTypeFromQuickInfo(functionLikeInfo) : 'any';