@teambit/typescript 0.0.741 → 0.0.744

package/dist/typescript.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["TypescriptMain","constructor","logger","schemaTransformerSlot","workspace","depResolver","createCompiler","options","transformers","tsModule","ts","configMutator","TypescriptConfigMutator","transformerContext","afterMutation","runTransformersWithContext","clone","TypescriptCompiler","TypescriptAspect","id","raw","getTsserverClient","tsServer","initTsserverClient","projectPath","files","TsserverClient","init","initTsserverClientFromWorkspace","Error","path","createCjsCompiler","getCjsTransformer","createEsmCompiler","getEsmTransformer","cjsTransformer","config","setModule","esmTransformer","createSchemaExtractor","tsconfig","TypeScriptExtractor","getCjsPackageJsonProps","main","types","getEsmPackageJsonProps","type","getSupportedFilesForTsserver","components","map","c","filesystem","flat","f","filter","endsWith","onPreWatch","watchOpts","spawnTSServer","verbose","checkTypes","printTypeErrors","Boolean","onComponentChange","component","results","pMapSeries","file","onFileChange","provider","schema","loggerExt","aspectLoader","cli","registerParser","TypeScriptParser","createLogger","registerPlugins","SchemaTransformerPlugin","tsMain","register","ExportDeclaration","FunctionDeclaration","MethodDeclaration","PropertyDeclaration","VariableStatementTransformer","VariableDeclaration","Constructor","SourceFileTransformer","TypeAliasTransformer","ClassDecelerationTransformer","PropertySignature","LiteralTypeTransformer","IndexSignature","InterfaceDeclarationTransformer","MethodSignatureTransformer","EnumDeclarationTransformer","registerOnPreWatch","bind","registerOnComponentChange","registerOnComponentAdd","checkTypesCmd","CheckTypesCmd","MainRuntime","SchemaAspect","LoggerAspect","AspectLoaderAspect","WorkspaceAspect","CLIAspect","DependencyResolverAspect","Slot","withType","addRuntime","context","Array","isArray","newConfig","reduce","acc","transformer"],"sources":["typescript.main.runtime.ts"],"sourcesContent":["import ts from 'typescript';\nimport { Slot, SlotRegistry } from '@teambit/harmony';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Compiler } from '@teambit/compiler';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SchemaAspect, SchemaExtractor, SchemaMain } from '@teambit/schema';\nimport { PackageJsonProps } from '@teambit/pkg';\nimport { TypescriptConfigMutator } from '@teambit/typescript.modules.ts-config-mutator';\nimport { WorkspaceAspect } from '@teambit/workspace';\nimport type { WatchOptions, Workspace } from '@teambit/workspace';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport pMapSeries from 'p-map-series';\nimport { TsserverClient, TsserverClientOpts } from '@teambit/ts-server';\nimport AspectLoaderAspect, { AspectLoaderMain } from '@teambit/aspect-loader';\nimport type { Component } from '@teambit/component';\nimport { TypeScriptExtractor } from './typescript.extractor';\nimport { TypeScriptCompilerOptions } from './compiler-options';\nimport { TypescriptAspect } from './typescript.aspect';\nimport { TypescriptCompiler } from './typescript.compiler';\nimport { TypeScriptParser } from './typescript.parser';\nimport { SchemaTransformer } from './schema-transformer';\nimport { SchemaTransformerPlugin } from './schema-transformer.plugin';\nimport {\n  ExportDeclaration,\n  TypeAliasTransformer,\n  FunctionDeclaration,\n  MethodDeclaration,\n  PropertyDeclaration,\n  VariableStatementTransformer,\n  VariableDeclaration,\n  SourceFileTransformer,\n  ClassDecelerationTransformer,\n  Constructor,\n  PropertySignature,\n  LiteralTypeTransformer,\n  IndexSignature,\n  InterfaceDeclarationTransformer,\n  MethodSignatureTransformer,\n  EnumDeclarationTransformer,\n} from './transformers';\nimport { CheckTypesCmd } from './cmds/check-types.cmd';\n\nexport type TsMode = 'build' | 'dev';\n\nexport type SchemaTransformerSlot = SlotRegistry<SchemaTransformer[]>;\n\nexport type TsConfigTransformContext = {\n  // mode: TsMode;\n};\n\nexport type TsConfigTransformer = (\n  config: TypescriptConfigMutator,\n  context: TsConfigTransformContext\n) => TypescriptConfigMutator;\n\nexport class TypescriptMain {\n  constructor(\n    private logger: Logger,\n    private schemaTransformerSlot: SchemaTransformerSlot,\n    private workspace: Workspace,\n    private depResolver: DependencyResolverMain\n  ) {}\n\n  private tsServer: TsserverClient;\n  /**\n   * create a new compiler.\n   */\n  createCompiler(\n    options: TypeScriptCompilerOptions,\n    transformers: TsConfigTransformer[] = [],\n    tsModule = ts\n  ): Compiler {\n    const configMutator = new TypescriptConfigMutator(options);\n    const transformerContext: TsConfigTransformContext = {};\n    const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);\n    return new TypescriptCompiler(TypescriptAspect.id, this.logger, afterMutation.raw, tsModule);\n  }\n\n  /**\n   * get TsserverClient instance if initiated already, otherwise, return undefined.\n   */\n  getTsserverClient(): TsserverClient | undefined {\n    return this.tsServer;\n  }\n\n  /**\n   * starts a tsserver process to communicate with its API.\n   * @param projectPath absolute path of the project root directory\n   * @param options TsserverClientOpts\n   * @param files optionally, if check-types is enabled, provide files to open and type check.\n   * @returns TsserverClient\n   */\n  async initTsserverClient(\n    projectPath: string,\n    options: TsserverClientOpts = {},\n    files: string[] = []\n  ): Promise<TsserverClient> {\n    this.tsServer = new TsserverClient(projectPath, this.logger, options, files);\n    this.tsServer.init();\n    return this.tsServer;\n  }\n\n  /**\n   * starts a tsserver process to communicate with its API. use only when running on the workspace.\n   * @param options TsserverClientOpts\n   * @param files optionally, if check-types is enabled, provide files to open and type check.\n   * @returns TsserverClient\n   */\n  async initTsserverClientFromWorkspace(\n    options: TsserverClientOpts = {},\n    files: string[] = []\n  ): Promise<TsserverClient> {\n    if (!this.workspace) {\n      throw new Error(`initTsserverClientFromWorkspace: workspace was not found`);\n    }\n    return this.initTsserverClient(this.workspace.path, options, files);\n  }\n\n  /**\n   * Create a compiler instance and run the cjs transformer for it\n   * @param options\n   * @param transformers\n   * @param tsModule\n   * @returns\n   */\n  createCjsCompiler(options: TypeScriptCompilerOptions, transformers: TsConfigTransformer[] = [], tsModule = ts) {\n    return this.createCompiler(options, [this.getCjsTransformer(), ...transformers], tsModule);\n  }\n\n  /**\n   * Create a compiler instance and run the esm transformer for it\n   * @param options\n   * @param transformers\n   * @param tsModule\n   * @returns\n   */\n  createEsmCompiler(options: TypeScriptCompilerOptions, transformers: TsConfigTransformer[] = [], tsModule = ts) {\n    return this.createCompiler(options, [this.getEsmTransformer(), ...transformers], tsModule);\n  }\n\n  /**\n   * Create a transformer that change the ts module to CommonJS\n   * @returns\n   */\n  getCjsTransformer(): TsConfigTransformer {\n    const cjsTransformer = (config: TypescriptConfigMutator) => {\n      config.setModule('CommonJS');\n      return config;\n    };\n    return cjsTransformer;\n  }\n\n  /**\n   * Create a transformer that change the ts module to ES2020\n   * @returns\n   */\n  getEsmTransformer(): TsConfigTransformer {\n    const esmTransformer = (config: TypescriptConfigMutator) => {\n      config.setModule('ES2020');\n      return config;\n    };\n    return esmTransformer;\n  }\n\n  /**\n   * create an instance of a typescript semantic schema extractor.\n   */\n  createSchemaExtractor(tsconfig: any, path?: string): SchemaExtractor {\n    return new TypeScriptExtractor(\n      tsconfig,\n      this.schemaTransformerSlot,\n      this,\n      path || this.workspace.path,\n      this.depResolver,\n      this.workspace\n    );\n  }\n\n  /**\n   * add the default package json properties to the component\n   * :TODO @gilad why do we need this DSL? can't I just get the args here.\n   */\n  getCjsPackageJsonProps(): PackageJsonProps {\n    return {\n      main: 'dist/{main}.js',\n      types: '{main}.ts',\n    };\n  }\n\n  /**\n   * add type: module to the package.json props and the default props\n   * :TODO @gilad why do we need this DSL? can't I just get the args here.\n   */\n  getEsmPackageJsonProps(): PackageJsonProps {\n    return {\n      // main: 'dist-esm/{main}.js',\n      main: 'dist/{main}.js',\n      type: 'module',\n      types: '{main}.ts',\n    };\n  }\n\n  public getSupportedFilesForTsserver(components: Component[]): string[] {\n    const files = components\n      .map((c) => c.filesystem.files)\n      .flat()\n      .map((f) => f.path);\n    return files.filter((f) => f.endsWith('.ts') || f.endsWith('.tsx'));\n  }\n\n  private async onPreWatch(components: Component[], watchOpts: WatchOptions) {\n    const workspace = this.workspace;\n    if (!workspace || !watchOpts.spawnTSServer) {\n      return;\n    }\n    const { verbose, checkTypes } = watchOpts;\n    const files = checkTypes ? this.getSupportedFilesForTsserver(components) : [];\n    const printTypeErrors = Boolean(checkTypes);\n    await this.initTsserverClientFromWorkspace({ verbose, checkTypes, printTypeErrors }, files);\n  }\n\n  private async onComponentChange(component: Component, files: string[]) {\n    if (!this.tsServer) {\n      return {\n        results: 'N/A',\n      };\n    }\n    await pMapSeries(files, (file) => this.tsServer.onFileChange(file));\n    return {\n      results: 'succeed',\n    };\n  }\n\n  static runtime = MainRuntime;\n  static dependencies = [\n    SchemaAspect,\n    LoggerAspect,\n    AspectLoaderAspect,\n    WorkspaceAspect,\n    CLIAspect,\n    DependencyResolverAspect,\n  ];\n  static slots = [Slot.withType<SchemaTransformer[]>()];\n\n  static async provider(\n    [schema, loggerExt, aspectLoader, workspace, cli, depResolver]: [\n      SchemaMain,\n      LoggerMain,\n      AspectLoaderMain,\n      Workspace,\n      CLIMain,\n      DependencyResolverMain\n    ],\n    config,\n    [schemaTransformerSlot]: [SchemaTransformerSlot]\n  ) {\n    schema.registerParser(new TypeScriptParser());\n    const logger = loggerExt.createLogger(TypescriptAspect.id);\n    aspectLoader.registerPlugins([new SchemaTransformerPlugin(schemaTransformerSlot)]);\n    const tsMain = new TypescriptMain(logger, schemaTransformerSlot, workspace, depResolver);\n    schemaTransformerSlot.register([\n      new ExportDeclaration(),\n      new FunctionDeclaration(),\n      new MethodDeclaration(),\n      new PropertyDeclaration(),\n      new VariableStatementTransformer(),\n      new VariableDeclaration(),\n      new Constructor(),\n      new SourceFileTransformer(),\n      new TypeAliasTransformer(),\n      new ClassDecelerationTransformer(),\n      new PropertySignature(),\n      new LiteralTypeTransformer(),\n      new IndexSignature(),\n      new InterfaceDeclarationTransformer(),\n      new MethodSignatureTransformer(),\n      new EnumDeclarationTransformer(),\n    ]);\n\n    if (workspace) {\n      workspace.registerOnPreWatch(tsMain.onPreWatch.bind(this));\n      workspace.registerOnComponentChange(tsMain.onComponentChange.bind(this));\n      workspace.registerOnComponentAdd(tsMain.onComponentChange.bind(this));\n    }\n\n    const checkTypesCmd = new CheckTypesCmd(tsMain, workspace, logger);\n    cli.register(checkTypesCmd);\n\n    return tsMain;\n  }\n}\n\nTypescriptAspect.addRuntime(TypescriptMain);\n\nexport function runTransformersWithContext(\n  config: TypescriptConfigMutator,\n  transformers: TsConfigTransformer[] = [],\n  context: TsConfigTransformContext\n): TypescriptConfigMutator {\n  if (!Array.isArray(transformers)) return config;\n  const newConfig = transformers.reduce((acc, transformer) => {\n    return transformer(acc, context);\n  }, config);\n  return newConfig;\n}\n"],"mappings":"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"}
+{"version":3,"names":["TypescriptMain","constructor","logger","schemaTransformerSlot","workspace","depResolver","createCompiler","options","transformers","tsModule","ts","configMutator","TypescriptConfigMutator","transformerContext","afterMutation","runTransformersWithContext","clone","TypescriptCompiler","TypescriptAspect","id","raw","getTsserverClient","tsServer","initTsserverClient","projectPath","files","TsserverClient","init","initTsserverClientFromWorkspace","Error","path","createCjsCompiler","getCjsTransformer","createEsmCompiler","getEsmTransformer","cjsTransformer","config","setModule","esmTransformer","createSchemaExtractor","tsconfig","TypeScriptExtractor","getCjsPackageJsonProps","main","types","getEsmPackageJsonProps","type","getSupportedFilesForTsserver","components","map","c","filesystem","flat","f","filter","endsWith","onPreWatch","watchOpts","spawnTSServer","verbose","checkTypes","printTypeErrors","Boolean","onComponentChange","component","results","pMapSeries","file","onFileChange","provider","schema","loggerExt","aspectLoader","cli","registerParser","TypeScriptParser","createLogger","registerPlugins","SchemaTransformerPlugin","tsMain","register","ExportDeclaration","FunctionDeclaration","VariableStatementTransformer","VariableDeclaration","SourceFileTransformer","TypeAliasTransformer","ClassDecelerationTransformer","LiteralTypeTransformer","InterfaceDeclarationTransformer","EnumDeclarationTransformer","registerOnPreWatch","bind","registerOnComponentChange","registerOnComponentAdd","checkTypesCmd","CheckTypesCmd","MainRuntime","SchemaAspect","LoggerAspect","AspectLoaderAspect","WorkspaceAspect","CLIAspect","DependencyResolverAspect","Slot","withType","addRuntime","context","Array","isArray","newConfig","reduce","acc","transformer"],"sources":["typescript.main.runtime.ts"],"sourcesContent":["import ts from 'typescript';\nimport { Slot, SlotRegistry } from '@teambit/harmony';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Compiler } from '@teambit/compiler';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SchemaAspect, SchemaExtractor, SchemaMain } from '@teambit/schema';\nimport { PackageJsonProps } from '@teambit/pkg';\nimport { TypescriptConfigMutator } from '@teambit/typescript.modules.ts-config-mutator';\nimport { WorkspaceAspect } from '@teambit/workspace';\nimport type { WatchOptions, Workspace } from '@teambit/workspace';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport pMapSeries from 'p-map-series';\nimport { TsserverClient, TsserverClientOpts } from '@teambit/ts-server';\nimport AspectLoaderAspect, { AspectLoaderMain } from '@teambit/aspect-loader';\nimport type { Component } from '@teambit/component';\nimport { TypeScriptExtractor } from './typescript.extractor';\nimport { TypeScriptCompilerOptions } from './compiler-options';\nimport { TypescriptAspect } from './typescript.aspect';\nimport { TypescriptCompiler } from './typescript.compiler';\nimport { TypeScriptParser } from './typescript.parser';\nimport { SchemaTransformer } from './schema-transformer';\nimport { SchemaTransformerPlugin } from './schema-transformer.plugin';\nimport {\n  ExportDeclaration,\n  TypeAliasTransformer,\n  FunctionDeclaration,\n  VariableStatementTransformer,\n  VariableDeclaration,\n  SourceFileTransformer,\n  ClassDecelerationTransformer,\n  LiteralTypeTransformer,\n  InterfaceDeclarationTransformer,\n  EnumDeclarationTransformer,\n} from './transformers';\nimport { CheckTypesCmd } from './cmds/check-types.cmd';\n\nexport type TsMode = 'build' | 'dev';\n\nexport type SchemaTransformerSlot = SlotRegistry<SchemaTransformer[]>;\n\nexport type TsConfigTransformContext = {\n  // mode: TsMode;\n};\n\nexport type TsConfigTransformer = (\n  config: TypescriptConfigMutator,\n  context: TsConfigTransformContext\n) => TypescriptConfigMutator;\n\nexport class TypescriptMain {\n  constructor(\n    private logger: Logger,\n    private schemaTransformerSlot: SchemaTransformerSlot,\n    private workspace: Workspace,\n    private depResolver: DependencyResolverMain\n  ) {}\n\n  private tsServer: TsserverClient;\n  /**\n   * create a new compiler.\n   */\n  createCompiler(\n    options: TypeScriptCompilerOptions,\n    transformers: TsConfigTransformer[] = [],\n    tsModule = ts\n  ): Compiler {\n    const configMutator = new TypescriptConfigMutator(options);\n    const transformerContext: TsConfigTransformContext = {};\n    const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);\n    return new TypescriptCompiler(TypescriptAspect.id, this.logger, afterMutation.raw, tsModule);\n  }\n\n  /**\n   * get TsserverClient instance if initiated already, otherwise, return undefined.\n   */\n  getTsserverClient(): TsserverClient | undefined {\n    return this.tsServer;\n  }\n\n  /**\n   * starts a tsserver process to communicate with its API.\n   * @param projectPath absolute path of the project root directory\n   * @param options TsserverClientOpts\n   * @param files optionally, if check-types is enabled, provide files to open and type check.\n   * @returns TsserverClient\n   */\n  async initTsserverClient(\n    projectPath: string,\n    options: TsserverClientOpts = {},\n    files: string[] = []\n  ): Promise<TsserverClient> {\n    this.tsServer = new TsserverClient(projectPath, this.logger, options, files);\n    this.tsServer.init();\n    return this.tsServer;\n  }\n\n  /**\n   * starts a tsserver process to communicate with its API. use only when running on the workspace.\n   * @param options TsserverClientOpts\n   * @param files optionally, if check-types is enabled, provide files to open and type check.\n   * @returns TsserverClient\n   */\n  async initTsserverClientFromWorkspace(\n    options: TsserverClientOpts = {},\n    files: string[] = []\n  ): Promise<TsserverClient> {\n    if (!this.workspace) {\n      throw new Error(`initTsserverClientFromWorkspace: workspace was not found`);\n    }\n    return this.initTsserverClient(this.workspace.path, options, files);\n  }\n\n  /**\n   * Create a compiler instance and run the cjs transformer for it\n   * @param options\n   * @param transformers\n   * @param tsModule\n   * @returns\n   */\n  createCjsCompiler(options: TypeScriptCompilerOptions, transformers: TsConfigTransformer[] = [], tsModule = ts) {\n    return this.createCompiler(options, [this.getCjsTransformer(), ...transformers], tsModule);\n  }\n\n  /**\n   * Create a compiler instance and run the esm transformer for it\n   * @param options\n   * @param transformers\n   * @param tsModule\n   * @returns\n   */\n  createEsmCompiler(options: TypeScriptCompilerOptions, transformers: TsConfigTransformer[] = [], tsModule = ts) {\n    return this.createCompiler(options, [this.getEsmTransformer(), ...transformers], tsModule);\n  }\n\n  /**\n   * Create a transformer that change the ts module to CommonJS\n   * @returns\n   */\n  getCjsTransformer(): TsConfigTransformer {\n    const cjsTransformer = (config: TypescriptConfigMutator) => {\n      config.setModule('CommonJS');\n      return config;\n    };\n    return cjsTransformer;\n  }\n\n  /**\n   * Create a transformer that change the ts module to ES2020\n   * @returns\n   */\n  getEsmTransformer(): TsConfigTransformer {\n    const esmTransformer = (config: TypescriptConfigMutator) => {\n      config.setModule('ES2020');\n      return config;\n    };\n    return esmTransformer;\n  }\n\n  /**\n   * create an instance of a typescript semantic schema extractor.\n   */\n  createSchemaExtractor(tsconfig: any, path?: string): SchemaExtractor {\n    return new TypeScriptExtractor(\n      tsconfig,\n      this.schemaTransformerSlot,\n      this,\n      path || this.workspace.path,\n      this.depResolver,\n      this.workspace\n    );\n  }\n\n  /**\n   * add the default package json properties to the component\n   * :TODO @gilad why do we need this DSL? can't I just get the args here.\n   */\n  getCjsPackageJsonProps(): PackageJsonProps {\n    return {\n      main: 'dist/{main}.js',\n      types: '{main}.ts',\n    };\n  }\n\n  /**\n   * add type: module to the package.json props and the default props\n   * :TODO @gilad why do we need this DSL? can't I just get the args here.\n   */\n  getEsmPackageJsonProps(): PackageJsonProps {\n    return {\n      // main: 'dist-esm/{main}.js',\n      main: 'dist/{main}.js',\n      type: 'module',\n      types: '{main}.ts',\n    };\n  }\n\n  public getSupportedFilesForTsserver(components: Component[]): string[] {\n    const files = components\n      .map((c) => c.filesystem.files)\n      .flat()\n      .map((f) => f.path);\n    return files.filter((f) => f.endsWith('.ts') || f.endsWith('.tsx'));\n  }\n\n  private async onPreWatch(components: Component[], watchOpts: WatchOptions) {\n    const workspace = this.workspace;\n    if (!workspace || !watchOpts.spawnTSServer) {\n      return;\n    }\n    const { verbose, checkTypes } = watchOpts;\n    const files = checkTypes ? this.getSupportedFilesForTsserver(components) : [];\n    const printTypeErrors = Boolean(checkTypes);\n    await this.initTsserverClientFromWorkspace({ verbose, checkTypes, printTypeErrors }, files);\n  }\n\n  private async onComponentChange(component: Component, files: string[]) {\n    if (!this.tsServer) {\n      return {\n        results: 'N/A',\n      };\n    }\n    await pMapSeries(files, (file) => this.tsServer.onFileChange(file));\n    return {\n      results: 'succeed',\n    };\n  }\n\n  static runtime = MainRuntime;\n  static dependencies = [\n    SchemaAspect,\n    LoggerAspect,\n    AspectLoaderAspect,\n    WorkspaceAspect,\n    CLIAspect,\n    DependencyResolverAspect,\n  ];\n  static slots = [Slot.withType<SchemaTransformer[]>()];\n\n  static async provider(\n    [schema, loggerExt, aspectLoader, workspace, cli, depResolver]: [\n      SchemaMain,\n      LoggerMain,\n      AspectLoaderMain,\n      Workspace,\n      CLIMain,\n      DependencyResolverMain\n    ],\n    config,\n    [schemaTransformerSlot]: [SchemaTransformerSlot]\n  ) {\n    schema.registerParser(new TypeScriptParser());\n    const logger = loggerExt.createLogger(TypescriptAspect.id);\n    aspectLoader.registerPlugins([new SchemaTransformerPlugin(schemaTransformerSlot)]);\n    const tsMain = new TypescriptMain(logger, schemaTransformerSlot, workspace, depResolver);\n    schemaTransformerSlot.register([\n      new ExportDeclaration(),\n      new FunctionDeclaration(),\n      new VariableStatementTransformer(),\n      new VariableDeclaration(),\n      new SourceFileTransformer(),\n      new TypeAliasTransformer(),\n      new ClassDecelerationTransformer(),\n      new LiteralTypeTransformer(),\n      new InterfaceDeclarationTransformer(),\n      new EnumDeclarationTransformer(),\n    ]);\n\n    if (workspace) {\n      workspace.registerOnPreWatch(tsMain.onPreWatch.bind(this));\n      workspace.registerOnComponentChange(tsMain.onComponentChange.bind(this));\n      workspace.registerOnComponentAdd(tsMain.onComponentChange.bind(this));\n    }\n\n    const checkTypesCmd = new CheckTypesCmd(tsMain, workspace, logger);\n    cli.register(checkTypesCmd);\n\n    return tsMain;\n  }\n}\n\nTypescriptAspect.addRuntime(TypescriptMain);\n\nexport function runTransformersWithContext(\n  config: TypescriptConfigMutator,\n  transformers: TsConfigTransformer[] = [],\n  context: TsConfigTransformContext\n): TypescriptConfigMutator {\n  if (!Array.isArray(transformers)) return config;\n  const newConfig = transformers.reduce((acc, transformer) => {\n    return transformer(acc, context);\n  }, config);\n  return newConfig;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/typescript",
-  "version": "0.0.741",
+  "version": "0.0.744",
   "homepage": "https://bit.dev/teambit/typescript/typescript",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.typescript",
     "name": "typescript",
-    "version": "0.0.741"
+    "version": "0.0.744"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,21 +18,21 @@
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
-    "@teambit/compiler": "0.0.741",
+    "@teambit/compiler": "0.0.744",
     "@teambit/typescript.modules.ts-config-mutator": "0.0.68",
-    "@teambit/component": "0.0.741",
-    "@teambit/dependency-resolver": "0.0.741",
-    "@teambit/semantics.entities.semantic-schema": "0.0.14",
+    "@teambit/component": "0.0.744",
+    "@teambit/dependency-resolver": "0.0.744",
+    "@teambit/semantics.entities.semantic-schema": "0.0.16",
     "@teambit/ts-server": "0.0.32",
-    "@teambit/aspect-loader": "0.0.741",
+    "@teambit/aspect-loader": "0.0.744",
     "@teambit/bit-error": "0.0.394",
-    "@teambit/builder": "0.0.741",
-    "@teambit/isolator": "0.0.741",
-    "@teambit/logger": "0.0.584",
-    "@teambit/schema": "0.0.741",
-    "@teambit/workspace": "0.0.741",
-    "@teambit/cli": "0.0.492",
-    "@teambit/pkg": "0.0.741"
+    "@teambit/builder": "0.0.744",
+    "@teambit/isolator": "0.0.744",
+    "@teambit/logger": "0.0.586",
+    "@teambit/schema": "0.0.744",
+    "@teambit/workspace": "0.0.744",
+    "@teambit/cli": "0.0.493",
+    "@teambit/pkg": "0.0.744"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -45,10 +45,10 @@
     "@types/jest": "^26.0.0",
     "@types/react-dom": "^17.0.5",
     "@types/node": "12.20.4",
-    "@teambit/typescript.aspect-docs.typescript": "0.0.137"
+    "@teambit/typescript.aspect-docs.typescript": "0.0.138"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.272",
+    "@teambit/legacy": "1.0.273",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -76,7 +76,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.272",
+        "@teambit/legacy": "1.0.273",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }

package/{preview-1653494536947.js → preview-1653827208409.js}

@@ -1,2 +1,2 @@
-export const compositions = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.typescript_typescript@0.0.741/dist/typescript.composition.js')]
-export const overview = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.typescript_typescript@0.0.741/dist/typescript.docs.mdx')]
+export const compositions = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.typescript_typescript@0.0.744/dist/typescript.composition.js')]
+export const overview = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.typescript_typescript@0.0.744/dist/typescript.docs.mdx')]

package/transformers/class-deceleration.ts

@@ -1,12 +1,12 @@
 import pMapSeries from 'p-map-series';
 import { compact } from 'lodash';
-import { ClassSchema, GetAccessorSchema, SetAccessorSchema } from '@teambit/semantics.entities.semantic-schema';
-import ts, { Node, ClassDeclaration, isSemicolonClassElement } from 'typescript';
+import { ClassSchema } from '@teambit/semantics.entities.semantic-schema';
+import ts, { Node, ClassDeclaration } from 'typescript';
 import { SchemaTransformer } from '../schema-transformer';
 import { SchemaExtractorContext } from '../schema-extractor-context';
 import { ExportIdentifier } from '../export-identifier';
-import { parseTypeFromQuickInfo } from './utils/parse-type-from-quick-info';
-import { getParams } from './utils/get-params';
+import { jsDocToDocSchema } from './utils/jsdoc-to-doc-schema';
+import { classElementToSchema } from './utils/class-element-to-schema';
 
 export class ClassDecelerationTransformer implements SchemaTransformer {
   predicate(node: Node) {
@@ -29,28 +29,9 @@ export class ClassDecelerationTransformer implements SchemaTransformer {
       if (isPrivate) {
         return null;
       }
-      if (isSemicolonClassElement(member)) {
-        return null;
-      }
-      switch (member.kind) {
-        case ts.SyntaxKind.GetAccessor: {
-          const getter = member as ts.GetAccessorDeclaration;
-          const info = await context.getQuickInfo(getter.name);
-          const displaySig = info?.body?.displayString || '';
-          const typeStr = parseTypeFromQuickInfo(info);
-          const type = await context.resolveType(getter, typeStr);
-          return new GetAccessorSchema(context.getLocation(getter), getter.name.getText(), type, displaySig);
-        }
-        case ts.SyntaxKind.SetAccessor: {
-          const setter = member as ts.SetAccessorDeclaration;
-          const params = await getParams(setter.parameters, context);
-          const displaySig = await context.getQuickInfoDisplayString(setter.name);
-          return new SetAccessorSchema(context.getLocation(setter), setter.name.getText(), params[0], displaySig);
-        }
-        default:
-          return context.computeSchema(member);
-      }
+      return classElementToSchema(member, context);
     });
-    return new ClassSchema(className, compact(members), context.getLocation(node));
+    const doc = await jsDocToDocSchema(node, context);
+    return new ClassSchema(className, compact(members), context.getLocation(node), doc);
   }
 }

package/transformers/index.ts

@@ -1,16 +1,10 @@
 export { ExportDeclaration } from './export-declaration';
 export { FunctionDeclaration } from './function-declaration';
-export { MethodDeclaration } from './method-declaration';
-export { PropertyDeclaration } from './property-declaration';
 export { VariableStatementTransformer } from './variable-statement';
 export { VariableDeclaration } from './variable-declaration';
 export { SourceFileTransformer } from './source-file-transformer';
 export { TypeAliasTransformer } from './type-alias';
 export { ClassDecelerationTransformer } from './class-deceleration';
-export { Constructor } from './constructor';
-export { PropertySignature } from './property-signature';
 export { LiteralTypeTransformer } from './literal-type';
-export { IndexSignature } from './index-signature';
 export { InterfaceDeclarationTransformer } from './interface-declaration';
-export { MethodSignatureTransformer } from './method-signature';
 export { EnumDeclarationTransformer } from './enum-declaration';

package/transformers/interface-declaration.ts

@@ -1,13 +1,14 @@
-import ts, { Node, InterfaceDeclaration } from 'typescript';
+import { Node, InterfaceDeclaration, SyntaxKind } from 'typescript';
 import pMapSeries from 'p-map-series';
 import { InterfaceSchema } from '@teambit/semantics.entities.semantic-schema';
 import { SchemaTransformer } from '../schema-transformer';
 import { SchemaExtractorContext } from '../schema-extractor-context';
 import { ExportIdentifier } from '../export-identifier';
+import { typeElementToSchema } from './utils/type-element-to-schema';
 
 export class InterfaceDeclarationTransformer implements SchemaTransformer {
   predicate(node: Node) {
-    return node.kind === ts.SyntaxKind.InterfaceDeclaration;
+    return node.kind === SyntaxKind.InterfaceDeclaration;
   }
 
   async getIdentifiers(node: InterfaceDeclaration): Promise<ExportIdentifier[]> {
@@ -15,10 +16,7 @@ export class InterfaceDeclarationTransformer implements SchemaTransformer {
   }
 
   async transform(interfaceDec: InterfaceDeclaration, context: SchemaExtractorContext) {
-    const members = await pMapSeries(interfaceDec.members, async (member) => {
-      const typeSchema = await context.computeSchema(member);
-      return typeSchema;
-    });
+    const members = await pMapSeries(interfaceDec.members, (member) => typeElementToSchema(member, context));
     return new InterfaceSchema(context.getLocation(interfaceDec), interfaceDec.name.getText(), members);
   }
 }

package/transformers/utils/class-element-to-schema.ts

@@ -0,0 +1,61 @@
+import {
+  ClassElement,
+  ConstructorDeclaration,
+  GetAccessorDeclaration,
+  IndexSignatureDeclaration,
+  MethodDeclaration,
+  PropertyDeclaration,
+  SetAccessorDeclaration,
+  SyntaxKind,
+} from 'typescript';
+import { ConstructorSchema, SchemaNode, VariableSchema } from '@teambit/semantics.entities.semantic-schema';
+import { SchemaExtractorContext } from '../../schema-extractor-context';
+import { getParams } from './get-params';
+import { getAccessor, indexSignature, setAccessor } from './type-element-to-schema';
+import { parseTypeFromQuickInfo } from './parse-type-from-quick-info';
+import { toFunctionLikeSchema } from './to-function-schema';
+
+export async function classElementToSchema(
+  node: ClassElement,
+  context: SchemaExtractorContext
+): Promise<SchemaNode | null> {
+  switch (node.kind) {
+    case SyntaxKind.Constructor:
+      return constructor(node as ConstructorDeclaration, context);
+    case SyntaxKind.PropertyDeclaration:
+      return propertyDeclaration(node as PropertyDeclaration, context);
+    case SyntaxKind.MethodDeclaration:
+      return methodDeclaration(node as MethodDeclaration, context);
+    case SyntaxKind.GetAccessor:
+      return getAccessor(node as GetAccessorDeclaration, context);
+    case SyntaxKind.SetAccessor:
+      return setAccessor(node as SetAccessorDeclaration, context);
+    case SyntaxKind.IndexSignature:
+      return indexSignature(node as IndexSignatureDeclaration, context);
+    case SyntaxKind.ClassStaticBlockDeclaration: // not sure what is it, but the name sounds like not something we need
+    case SyntaxKind.SemicolonClassElement: // seems to be just a semicolon
+      return null;
+    default:
+      // should never be here unless typescript added new class elements
+      throw new Error(`unrecognized ClassElement type. got ${node.kind}`);
+  }
+}
+
+async function constructor(node: ConstructorDeclaration, context: SchemaExtractorContext) {
+  const args = await getParams(node.parameters, context);
+  return new ConstructorSchema(context.getLocation(node), args);
+}
+
+async function propertyDeclaration(node: PropertyDeclaration, context: SchemaExtractorContext) {
+  const name = node.name.getText();
+  const info = await context.getQuickInfo(node.name);
+  const displaySig = info?.body?.displayString;
+  const typeStr = parseTypeFromQuickInfo(info);
+  const type = await context.resolveType(node, typeStr);
+
+  return new VariableSchema(context.getLocation(node), name, displaySig || '', type);
+}
+
+async function methodDeclaration(node: MethodDeclaration, context: SchemaExtractorContext) {
+  return toFunctionLikeSchema(node, context);
+}

package/transformers/utils/jsdoc-to-doc-schema.ts

@@ -0,0 +1,81 @@
+/* eslint-disable no-fallthrough */
+import { getTextOfJSDocComment, JSDocReturnTag, JSDocTag, Node, SyntaxKind } from 'typescript';
+import { getJsDoc, canHaveJsDoc } from 'tsutils';
+import pMapSeries from 'p-map-series';
+import { DocSchema, ReturnTagSchema, TagName, TagSchema } from '@teambit/semantics.entities.semantic-schema';
+import { SchemaExtractorContext } from '../../schema-extractor-context';
+import { typeNodeToSchema } from './type-node-to-schema';
+
+export async function jsDocToDocSchema(node: Node, context: SchemaExtractorContext): Promise<DocSchema | undefined> {
+  if (!canHaveJsDoc(node)) {
+    return undefined;
+  }
+  const jsDocs = getJsDoc(node);
+  if (!jsDocs.length) {
+    return undefined;
+  }
+  // not sure how common it is to have multiple JSDocs. never seen it before.
+  // regardless, in typescript implementation of methods like `getJSDocDeprecatedTag()`, they use the first one. (`getFirstJSDocTag()`)
+  const jsDoc = jsDocs[0];
+  const location = context.getLocation(jsDoc);
+  const comment = getTextOfJSDocComment(jsDoc.comment);
+  const tags = jsDoc.tags ? await pMapSeries(jsDoc.tags, (tag) => tagParser(tag, context)) : undefined;
+  return new DocSchema(location, comment, tags);
+}
+
+async function tagParser(tag: JSDocTag, context: SchemaExtractorContext): Promise<TagSchema> {
+  let tagName: TagName | string = tag.tagName.getText();
+  switch (tag.kind) {
+    case SyntaxKind.JSDocReturnTag:
+      return returnTag(tag as JSDocReturnTag, context);
+    case SyntaxKind.JSDocAugmentsTag:
+      tagName = TagName.augments;
+    case SyntaxKind.JSDocAuthorTag:
+      tagName = TagName.author;
+    case SyntaxKind.JSDocClassTag:
+      tagName = TagName.class;
+    case SyntaxKind.JSDocCallbackTag:
+      tagName = TagName.callback;
+    case SyntaxKind.JSDocPublicTag:
+      tagName = TagName.public;
+    case SyntaxKind.JSDocPrivateTag:
+      tagName = TagName.private;
+    case SyntaxKind.JSDocProtectedTag:
+      tagName = TagName.protected;
+    case SyntaxKind.JSDocReadonlyTag:
+      tagName = TagName.readonly;
+    case SyntaxKind.JSDocOverrideTag:
+      tagName = TagName.override;
+    case SyntaxKind.JSDocDeprecatedTag:
+      tagName = TagName.deprecated;
+    case SyntaxKind.JSDocSeeTag:
+      tagName = TagName.see;
+    case SyntaxKind.JSDocEnumTag:
+      tagName = TagName.enum;
+    case SyntaxKind.JSDocParameterTag:
+      tagName = TagName.parameter;
+    case SyntaxKind.JSDocThisTag:
+      tagName = TagName.this;
+    case SyntaxKind.JSDocTypeTag:
+      tagName = TagName.type;
+    case SyntaxKind.JSDocTemplateTag:
+      tagName = TagName.template;
+    case SyntaxKind.JSDocTypedefTag:
+      tagName = TagName.typedef;
+    case SyntaxKind.JSDocPropertyTag:
+      tagName = TagName.property;
+    case SyntaxKind.JSDocImplementsTag:
+      tagName = TagName.implements;
+    default:
+      return simpleTag(tag, tagName, context);
+  }
+}
+
+function simpleTag(tag: JSDocTag, tagName: TagName | string, context: SchemaExtractorContext): TagSchema {
+  return new TagSchema(context.getLocation(tag), tagName, getTextOfJSDocComment(tag.comment));
+}
+
+async function returnTag(tag: JSDocReturnTag, context: SchemaExtractorContext) {
+  const type = tag.typeExpression?.type ? await typeNodeToSchema(tag.typeExpression?.type, context) : undefined;
+  return new ReturnTagSchema(context.getLocation(tag), TagName.return, getTextOfJSDocComment(tag.comment), type);
+}

package/transformers/utils/to-function-schema.ts

@@ -3,17 +3,21 @@ import { FunctionLikeSchema, Modifier } from '@teambit/semantics.entities.semant
 import { SchemaExtractorContext } from '../../schema-extractor-context';
 import { getParams } from './get-params';
 import { parseTypeFromQuickInfo } from './parse-type-from-quick-info';
+import { jsDocToDocSchema } from './jsdoc-to-doc-schema';
 
-export async function toFunctionLikeSchema(node: SignatureDeclaration, context: SchemaExtractorContext) {
-  const name = node.name?.getText() || '';
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const info = await context.getQuickInfo(node.name!);
-  const returnTypeStr = parseTypeFromQuickInfo(info);
+export async function toFunctionLikeSchema(
+  node: SignatureDeclaration,
+  context: SchemaExtractorContext,
+  funcName?: string
+) {
+  const name = funcName || node.name?.getText() || '';
+  const info = node.name ? await context.getQuickInfo(node.name) : null;
+  const returnTypeStr = info ? parseTypeFromQuickInfo(info) : 'any';
   const displaySig = info?.body?.displayString || '';
   const args = await getParams(node.parameters, context);
-  const returnType = await context.resolveType(node, returnTypeStr);
+  const returnType = await context.resolveType(node, returnTypeStr, Boolean(info));
   const modifiers = node.modifiers?.map((modifier) => modifier.getText()) || [];
   const location = context.getLocation(node);
-
-  return new FunctionLikeSchema(location, name, args, returnType, displaySig, modifiers as Modifier[]);
+  const doc = await jsDocToDocSchema(node, context);
+  return new FunctionLikeSchema(location, name, args, returnType, displaySig, modifiers as Modifier[], doc);
 }

package/transformers/utils/type-element-to-schema.ts

@@ -0,0 +1,72 @@
+import ts, {
+  SyntaxKind,
+  TypeElement,
+  MethodSignature,
+  isComputedPropertyName,
+  IndexSignatureDeclaration,
+  GetAccessorDeclaration,
+  SetAccessorDeclaration,
+  ConstructSignatureDeclaration,
+} from 'typescript';
+import {
+  GetAccessorSchema,
+  IndexSignatureSchema,
+  SchemaNode,
+  SetAccessorSchema,
+  VariableSchema,
+} from '@teambit/semantics.entities.semantic-schema';
+import { toFunctionLikeSchema } from './to-function-schema';
+import { SchemaExtractorContext } from '../../schema-extractor-context';
+import { parseTypeFromQuickInfo } from './parse-type-from-quick-info';
+import { typeNodeToSchema } from './type-node-to-schema';
+import { getParams } from './get-params';
+
+export async function typeElementToSchema(node: TypeElement, context: SchemaExtractorContext): Promise<SchemaNode> {
+  switch (node.kind) {
+    case SyntaxKind.MethodSignature:
+      return toFunctionLikeSchema(node as MethodSignature, context);
+    case SyntaxKind.ConstructSignature:
+      return toFunctionLikeSchema(node as ConstructSignatureDeclaration, context, 'new');
+    case SyntaxKind.CallSignature:
+      throw new Error(`CallSignature was not implemented yet`);
+    case SyntaxKind.PropertySignature:
+      return propertySignature(node as ts.PropertySignature, context);
+    case SyntaxKind.IndexSignature:
+      return indexSignature(node as IndexSignatureDeclaration, context);
+    case SyntaxKind.GetAccessor:
+      return getAccessor(node as GetAccessorDeclaration, context);
+    case SyntaxKind.SetAccessor:
+      return setAccessor(node as SetAccessorDeclaration, context);
+    default:
+      throw new Error(`typeElementToSchema expect type-element node. got ${node.kind}`);
+  }
+}
+
+async function propertySignature(node: ts.PropertySignature, context: SchemaExtractorContext) {
+  const name = node.name.getText();
+  const info = isComputedPropertyName(node.name) ? undefined : await context.getQuickInfo(node.name);
+  const displaySig = info?.body?.displayString || '';
+  const typeStr = parseTypeFromQuickInfo(info);
+  const type = await context.resolveType(node, typeStr);
+  return new VariableSchema(context.getLocation(node), name, displaySig, type);
+}
+
+export async function indexSignature(node: IndexSignatureDeclaration, context: SchemaExtractorContext) {
+  const params = await getParams(node.parameters, context);
+  const type = await typeNodeToSchema(node.type, context);
+  return new IndexSignatureSchema(context.getLocation(node), params, type);
+}
+
+export async function getAccessor(node: GetAccessorDeclaration, context: SchemaExtractorContext) {
+  const info = await context.getQuickInfo(node.name);
+  const displaySig = info?.body?.displayString || '';
+  const typeStr = parseTypeFromQuickInfo(info);
+  const type = await context.resolveType(node, typeStr);
+  return new GetAccessorSchema(context.getLocation(node), node.name.getText(), type, displaySig);
+}
+
+export async function setAccessor(node: SetAccessorDeclaration, context: SchemaExtractorContext) {
+  const params = await getParams(node.parameters, context);
+  const displaySig = await context.getQuickInfoDisplayString(node.name);
+  return new SetAccessorSchema(context.getLocation(node), node.name.getText(), params[0], displaySig);
+}

package/transformers/utils/type-node-to-schema.ts

@@ -17,6 +17,7 @@ import {
   IndexedAccessTypeNode,
   TemplateLiteralTypeNode,
   TemplateLiteralTypeSpan,
+  ThisTypeNode,
 } from 'typescript';
 import {
   SchemaNode,
@@ -36,10 +37,14 @@ import {
   IndexedAccessSchema,
   TemplateLiteralTypeSpanSchema,
   TemplateLiteralTypeSchema,
+  ThisTypeSchema,
+  Modifier,
 } from '@teambit/semantics.entities.semantic-schema';
 import pMapSeries from 'p-map-series';
 import { SchemaExtractorContext } from '../../schema-extractor-context';
 import { getParams } from './get-params';
+import { typeElementToSchema } from './type-element-to-schema';
+import { jsDocToDocSchema } from './jsdoc-to-doc-schema';
 
 // eslint-disable-next-line complexity
 export async function typeNodeToSchema(node: TypeNode, context: SchemaExtractorContext): Promise<SchemaNode> {
@@ -78,13 +83,14 @@ export async function typeNodeToSchema(node: TypeNode, context: SchemaExtractorC
       return templateLiteralTypeSpan(node as TemplateLiteralTypeSpan, context);
     case SyntaxKind.TemplateLiteralType:
       return templateLiteralType(node as TemplateLiteralTypeNode, context);
+    case SyntaxKind.ThisType:
+      return thisType(node as ThisTypeNode, context);
     case SyntaxKind.ConstructorType:
     case SyntaxKind.NamedTupleMember:
     case SyntaxKind.OptionalType:
     case SyntaxKind.RestType:
     case SyntaxKind.ConditionalType:
     case SyntaxKind.InferType:
-    case SyntaxKind.ThisType:
     case SyntaxKind.MappedType:
     case SyntaxKind.ImportType:
     case SyntaxKind.ExpressionWithTypeArguments:
@@ -153,10 +159,7 @@ async function unionType(node: UnionTypeNode, context: SchemaExtractorContext) {
  * this "TypeLiteral" is an object with properties, such as: `{ a: string; b: number }`, similar to Interface.
  */
 async function typeLiteral(node: TypeLiteralNode, context: SchemaExtractorContext) {
-  const members = await pMapSeries(node.members, async (member) => {
-    const typeSchema = await context.computeSchema(member);
-    return typeSchema;
-  });
+  const members = await pMapSeries(node.members, (member) => typeElementToSchema(member, context));
   const location = context.getLocation(node);
   return new TypeLiteralSchema(location, members);
 }
@@ -183,7 +186,9 @@ async function functionType(node: FunctionTypeNode, context: SchemaExtractorCont
   const params = await getParams(node.parameters, context);
   const returnType = await typeNodeToSchema(node.type, context);
   const location = context.getLocation(node);
-  return new FunctionLikeSchema(location, name, params, returnType, '');
+  const modifiers = node.modifiers?.map((modifier) => modifier.getText()) || [];
+  const doc = await jsDocToDocSchema(node, context);
+  return new FunctionLikeSchema(location, name, params, returnType, '', modifiers as Modifier[], doc);
 }
 
 /**
@@ -261,3 +266,7 @@ async function templateLiteralTypeSpan(node: TemplateLiteralTypeSpan, context: S
   const literal = node.literal.text;
   return new TemplateLiteralTypeSpanSchema(context.getLocation(node), literal, type);
 }
+
+async function thisType(node: ThisTypeNode, context: SchemaExtractorContext) {
+  return new ThisTypeSchema(context.getLocation(node));
+}

package/transformers/variable-declaration.ts

@@ -1,10 +1,11 @@
-import { SchemaNode, VariableSchema, FunctionLikeSchema } from '@teambit/semantics.entities.semantic-schema';
+import { SchemaNode, VariableSchema, FunctionLikeSchema, Modifier } from '@teambit/semantics.entities.semantic-schema';
 import ts, { Node, VariableDeclaration as VariableDeclarationNode, ArrowFunction } from 'typescript';
 import { SchemaTransformer } from '../schema-transformer';
 import { SchemaExtractorContext } from '../schema-extractor-context';
 import { ExportIdentifier } from '../export-identifier';
 import { getParams } from './utils/get-params';
 import { parseReturnTypeFromQuickInfo, parseTypeFromQuickInfo } from './utils/parse-type-from-quick-info';
+import { jsDocToDocSchema } from './utils/jsdoc-to-doc-schema';
 
 export class VariableDeclaration implements SchemaTransformer {
   predicate(node: Node) {
@@ -28,7 +29,9 @@ export class VariableDeclaration implements SchemaTransformer {
       const args = await getParams((varDec.initializer as ArrowFunction).parameters, context);
       const typeStr = parseReturnTypeFromQuickInfo(info);
       const returnType = await context.resolveType(varDec, typeStr);
-      return new FunctionLikeSchema(location, name, args, returnType, displaySig);
+      const modifiers = varDec.modifiers?.map((modifier) => modifier.getText()) || [];
+      const doc = await jsDocToDocSchema(varDec, context);
+      return new FunctionLikeSchema(location, name, args, returnType, displaySig, modifiers as Modifier[], doc);
     }
     const typeStr = parseTypeFromQuickInfo(info);
     const type = await context.resolveType(varDec, typeStr);

package/dist/transformers/constructor.d.ts

@@ -1,10 +0,0 @@
-import { SchemaNode } from '@teambit/semantics.entities.semantic-schema';
-import { Node, ConstructorDeclaration } from 'typescript';
-import { SchemaExtractorContext } from '../schema-extractor-context';
-import { SchemaTransformer } from '../schema-transformer';
-import { ExportIdentifier } from '../export-identifier';
-export declare class Constructor implements SchemaTransformer {
-    predicate(node: Node): boolean;
-    getIdentifiers(node: ConstructorDeclaration): Promise<ExportIdentifier[]>;
-    transform(constructorDec: ConstructorDeclaration, context: SchemaExtractorContext): Promise<SchemaNode>;
-}