@teambit/typescript 0.0.531 → 0.0.535

package/dist/index.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "TypescriptConfigMutator", {
+Object.defineProperty(exports, "TypescriptAspect", {
   enumerable: true,
   get: function () {
-    return _typescriptModules().TypescriptConfigMutator;
+    return _typescript2().TypescriptAspect;
   }
 });
 Object.defineProperty(exports, "TypescriptCompiler", {
@@ -15,10 +15,10 @@ Object.defineProperty(exports, "TypescriptCompiler", {
     return _typescript().TypescriptCompiler;
   }
 });
-Object.defineProperty(exports, "TypescriptAspect", {
+Object.defineProperty(exports, "TypescriptConfigMutator", {
   enumerable: true,
   get: function () {
-    return _typescript2().TypescriptAspect;
+    return _typescriptModules().TypescriptConfigMutator;
   }
 });
 

package/dist/typescript.main.runtime.d.ts

@@ -17,13 +17,13 @@ export declare class TypescriptMain {
     constructor(logger: Logger, workspace?: Workspace | undefined);
     createCompiler(options: TypeScriptCompilerOptions, transformers?: TsConfigTransformer[], tsModule?: typeof ts): Compiler;
     getTsserverClient(): TsserverClient | undefined;
-    initTsserverClient(projectPath: string, options?: TsserverClientOpts): Promise<TsserverClient>;
-    initTsserverClientFromWorkspace(options?: TsserverClientOpts): Promise<TsserverClient>;
+    initTsserverClient(projectPath: string, options?: TsserverClientOpts, files?: string[]): Promise<TsserverClient>;
+    initTsserverClientFromWorkspace(options?: TsserverClientOpts, files?: string[]): Promise<TsserverClient>;
+    createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor;
+    getPackageJsonProps(): PackageJsonProps;
     private getAllFilesForTsserver;
     private onPreWatch;
     private onComponentChange;
-    createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor;
-    getPackageJsonProps(): PackageJsonProps;
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static dependencies: import("@teambit/harmony").Aspect[];
     static provider([schema, loggerExt, workspace]: [SchemaMain, LoggerMain, Workspace]): Promise<TypescriptMain>;

package/dist/typescript.main.runtime.js

@@ -13,8 +13,8 @@ require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.runTransformersWithContext = runTransformersWithContext;
 exports.TypescriptMain = void 0;
+exports.runTransformersWithContext = runTransformersWithContext;
 
 function _defineProperty2() {
   const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -169,23 +169,62 @@ class TypescriptMain {
     const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);
     return new (_typescript4().TypescriptCompiler)(_typescript3().TypescriptAspect.id, this.logger, afterMutation.raw, tsModule);
   }
+  /**
+   * get TsserverClient instance if initiated already, otherwise, return undefined.
+   */
+
 
   getTsserverClient() {
     return this.tsServer;
   }
+  /**
+   * starts a tsserver process to communicate with its API.
+   * @param projectPath absolute path of the project root directory
+   * @param options TsserverClientOpts
+   * @param files optionally, if check-types is enabled, provide files to open and type check.
+   * @returns TsserverClient
+   */
 
-  async initTsserverClient(projectPath, options = {}) {
-    this.tsServer = new (_tsServer().TsserverClient)(projectPath, this.logger, options);
+
+  async initTsserverClient(projectPath, options = {}, files = []) {
+    this.tsServer = new (_tsServer().TsserverClient)(projectPath, this.logger, options, files);
     this.tsServer.init();
     return this.tsServer;
   }
+  /**
+   * starts a tsserver process to communicate with its API. use only when running on the workspace.
+   * @param options TsserverClientOpts
+   * @param files optionally, if check-types is enabled, provide files to open and type check.
+   * @returns TsserverClient
+   */
 
-  async initTsserverClientFromWorkspace(options = {}) {
+
+  async initTsserverClientFromWorkspace(options = {}, files = []) {
     if (!this.workspace) {
       throw new Error(`initTsserverClientFromWorkspace: workspace was not found`);
     }
 
-    return this.initTsserverClient(this.workspace.path, options);
+    return this.initTsserverClient(this.workspace.path, options, files);
+  }
+  /**
+   * create an instance of a typescript semantic schema extractor.
+   */
+
+
+  createSchemaExtractor(tsconfig) {
+    return new (_typescript2().TypeScriptExtractor)(tsconfig);
+  }
+  /**
+   * add the default package json properties to the component
+   * :TODO @gilad why do we need this DSL? can't I just get the args here.
+   */
+
+
+  getPackageJsonProps() {
+    return {
+      main: 'dist/{main}.js',
+      types: '{main}.ts'
+    };
   }
 
   getAllFilesForTsserver(components) {
@@ -196,22 +235,19 @@ class TypescriptMain {
   async onPreWatch(components, watchOpts) {
     const workspace = this.workspace;
 
-    if (!workspace || !watchOpts.checkTypes) {
+    if (!workspace || !watchOpts.spawnTSServer) {
       return;
     }
 
+    const {
+      verbose,
+      checkTypes
+    } = watchOpts;
+    const files = checkTypes ? this.getAllFilesForTsserver(components) : [];
     await this.initTsserverClientFromWorkspace({
-      verbose: watchOpts.verbose
-    });
-    const supportedFiles = this.getAllFilesForTsserver(components);
-    this.tsServer.openMultipleFiles(supportedFiles);
-    const start = Date.now();
-    this.tsServer.getDiagnostic().then(() => {
-      const end = Date.now() - start;
-      this.logger.console(`\ncompleted preliminary type checking. took ${end / 1000} sec`);
-    }).catch(err => {
-      this.logger.error(`failed getting the diag info from ts-server`, err);
-    });
+      verbose,
+      checkTypes
+    }, files);
   }
 
   async onComponentChange(component, files) {
@@ -221,38 +257,9 @@ class TypescriptMain {
       };
     }
 
-    await (0, _pMapSeries().default)(files, file => this.tsServer.changed(file));
-    let results = 'succeed';
-    const start = Date.now();
-    this.tsServer.getDiagnostic().then(() => {
-      const end = Date.now() - start;
-      this.logger.console(`\ntype checking had been completed (${end / 1000} sec) for the following files:\n${files.join('\n')}`);
-    }).catch(err => {
-      results = 'failed';
-      this.logger.error(`failed getting the diag info from ts-server`, err);
-    });
+    await (0, _pMapSeries().default)(files, file => this.tsServer.onFileChange(file));
     return {
-      results
-    };
-  }
-  /**
-   * create an instance of a typescript semantic schema extractor.
-   */
-
-
-  createSchemaExtractor(tsconfig) {
-    return new (_typescript2().TypeScriptExtractor)(tsconfig);
-  }
-  /**
-   * add the default package json properties to the component
-   * :TODO @gilad why do we need this DSL? can't I just get the args here.
-   */
-
-
-  getPackageJsonProps() {
-    return {
-      main: 'dist/{main}.js',
-      types: '{main}.ts'
+      results: 'succeed'
     };
   }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["typescript.main.runtime.ts"],"names":["TypescriptMain","constructor","logger","workspace","registerOnPreWatch","onPreWatch","bind","registerOnComponentChange","onComponentChange","registerOnComponentAdd","createCompiler","options","transformers","tsModule","ts","configMutator","TypescriptConfigMutator","transformerContext","afterMutation","runTransformersWithContext","clone","TypescriptCompiler","TypescriptAspect","id","raw","getTsserverClient","tsServer","initTsserverClient","projectPath","TsserverClient","init","initTsserverClientFromWorkspace","Error","path","getAllFilesForTsserver","components","files","map","c","filesystem","flat","f","filter","endsWith","watchOpts","checkTypes","verbose","supportedFiles","openMultipleFiles","start","Date","now","getDiagnostic","then","end","console","catch","err","error","component","results","file","changed","join","createSchemaExtractor","tsconfig","TypeScriptExtractor","getPackageJsonProps","main","types","provider","schema","loggerExt","registerParser","TypeScriptParser","createLogger","MainRuntime","SchemaAspect","LoggerAspect","WorkspaceAspect","addRuntime","config","context","Array","isArray","newConfig","reduce","acc","transformer"],"mappings":"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","sourcesContent":["import ts, { TsConfigSourceFile } from 'typescript';\nimport { 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 pMapSeries from 'p-map-series';\nimport { TsserverClient, TsserverClientOpts } from '@teambit/ts-server';\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';\n\nexport type TsMode = 'build' | 'dev';\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  private tsServer: TsserverClient;\n  constructor(private logger: Logger, private workspace?: Workspace) {\n    if (this.workspace) {\n      this.workspace.registerOnPreWatch(this.onPreWatch.bind(this));\n      this.workspace.registerOnComponentChange(this.onComponentChange.bind(this));\n      this.workspace.registerOnComponentAdd(this.onComponentChange.bind(this));\n    }\n  }\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  getTsserverClient(): TsserverClient | undefined {\n    return this.tsServer;\n  }\n\n  async initTsserverClient(projectPath: string, options: TsserverClientOpts = {}): Promise<TsserverClient> {\n    this.tsServer = new TsserverClient(projectPath, this.logger, options);\n    this.tsServer.init();\n    return this.tsServer;\n  }\n\n  async initTsserverClientFromWorkspace(options: TsserverClientOpts = {}): Promise<TsserverClient> {\n    if (!this.workspace) {\n      throw new Error(`initTsserverClientFromWorkspace: workspace was not found`);\n    }\n    return this.initTsserverClient(this.workspace.path, options);\n  }\n\n  private getAllFilesForTsserver(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.checkTypes) {\n      return;\n    }\n    await this.initTsserverClientFromWorkspace({ verbose: watchOpts.verbose });\n    const supportedFiles = this.getAllFilesForTsserver(components);\n    this.tsServer.openMultipleFiles(supportedFiles);\n    const start = Date.now();\n    this.tsServer\n      .getDiagnostic()\n      .then(() => {\n        const end = Date.now() - start;\n        this.logger.console(`\\ncompleted preliminary type checking. took ${end / 1000} sec`);\n      })\n      .catch((err) => {\n        this.logger.error(`failed getting the diag info from ts-server`, err);\n      });\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.changed(file));\n    let results = 'succeed';\n    const start = Date.now();\n    this.tsServer\n      .getDiagnostic()\n      .then(() => {\n        const end = Date.now() - start;\n        this.logger.console(\n          `\\ntype checking had been completed (${end / 1000} sec) for the following files:\\n${files.join('\\n')}`\n        );\n      })\n      .catch((err) => {\n        results = 'failed';\n        this.logger.error(`failed getting the diag info from ts-server`, err);\n      });\n    return {\n      results,\n    };\n  }\n\n  /**\n   * create an instance of a typescript semantic schema extractor.\n   */\n  createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor {\n    return new TypeScriptExtractor(tsconfig);\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  getPackageJsonProps(): PackageJsonProps {\n    return {\n      main: 'dist/{main}.js',\n      types: '{main}.ts',\n    };\n  }\n\n  static runtime = MainRuntime;\n  static dependencies = [SchemaAspect, LoggerAspect, WorkspaceAspect];\n\n  static async provider([schema, loggerExt, workspace]: [SchemaMain, LoggerMain, Workspace]) {\n    schema.registerParser(new TypeScriptParser());\n    const logger = loggerExt.createLogger(TypescriptAspect.id);\n    schema.registerParser(new TypeScriptParser(logger));\n\n    return new TypescriptMain(logger, workspace);\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"]}
+{"version":3,"sources":["typescript.main.runtime.ts"],"names":["TypescriptMain","constructor","logger","workspace","registerOnPreWatch","onPreWatch","bind","registerOnComponentChange","onComponentChange","registerOnComponentAdd","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","createSchemaExtractor","tsconfig","TypeScriptExtractor","getPackageJsonProps","main","types","getAllFilesForTsserver","components","map","c","filesystem","flat","f","filter","endsWith","watchOpts","spawnTSServer","verbose","checkTypes","component","results","file","onFileChange","provider","schema","loggerExt","registerParser","TypeScriptParser","createLogger","MainRuntime","SchemaAspect","LoggerAspect","WorkspaceAspect","addRuntime","config","context","Array","isArray","newConfig","reduce","acc","transformer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAaO,MAAMA,cAAN,CAAqB;AAE1BC,EAAAA,WAAW,CAASC,MAAT,EAAiCC,SAAjC,EAAwD;AAAA,SAA/CD,MAA+C,GAA/CA,MAA+C;AAAA,SAAvBC,SAAuB,GAAvBA,SAAuB;AAAA;;AACjE,QAAI,KAAKA,SAAT,EAAoB;AAClB,WAAKA,SAAL,CAAeC,kBAAf,CAAkC,KAAKC,UAAL,CAAgBC,IAAhB,CAAqB,IAArB,CAAlC;AACA,WAAKH,SAAL,CAAeI,yBAAf,CAAyC,KAAKC,iBAAL,CAAuBF,IAAvB,CAA4B,IAA5B,CAAzC;AACA,WAAKH,SAAL,CAAeM,sBAAf,CAAsC,KAAKD,iBAAL,CAAuBF,IAAvB,CAA4B,IAA5B,CAAtC;AACD;AACF;AACD;AACF;AACA;;;AACEI,EAAAA,cAAc,CACZC,OADY,EAEZC,YAAmC,GAAG,EAF1B,EAGZC,QAAQ,GAAGC,qBAHC,EAIF;AACV,UAAMC,aAAa,GAAG,KAAIC,4CAAJ,EAA4BL,OAA5B,CAAtB;AACA,UAAMM,kBAA4C,GAAG,EAArD;AACA,UAAMC,aAAa,GAAGC,0BAA0B,CAACJ,aAAa,CAACK,KAAd,EAAD,EAAwBR,YAAxB,EAAsCK,kBAAtC,CAAhD;AACA,WAAO,KAAII,iCAAJ,EAAuBC,gCAAiBC,EAAxC,EAA4C,KAAKrB,MAAjD,EAAyDgB,aAAa,CAACM,GAAvE,EAA4EX,QAA5E,CAAP;AACD;AAED;AACF;AACA;;;AACEY,EAAAA,iBAAiB,GAA+B;AAC9C,WAAO,KAAKC,QAAZ;AACD;AAED;AACF;AACA;AACA;AACA;AACA;AACA;;;AAC0B,QAAlBC,kBAAkB,CACtBC,WADsB,EAEtBjB,OAA2B,GAAG,EAFR,EAGtBkB,KAAe,GAAG,EAHI,EAIG;AACzB,SAAKH,QAAL,GAAgB,KAAII,0BAAJ,EAAmBF,WAAnB,EAAgC,KAAK1B,MAArC,EAA6CS,OAA7C,EAAsDkB,KAAtD,CAAhB;AACA,SAAKH,QAAL,CAAcK,IAAd;AACA,WAAO,KAAKL,QAAZ;AACD;AAED;AACF;AACA;AACA;AACA;AACA;;;AACuC,QAA/BM,+BAA+B,CACnCrB,OAA2B,GAAG,EADK,EAEnCkB,KAAe,GAAG,EAFiB,EAGV;AACzB,QAAI,CAAC,KAAK1B,SAAV,EAAqB;AACnB,YAAM,IAAI8B,KAAJ,CAAW,0DAAX,CAAN;AACD;;AACD,WAAO,KAAKN,kBAAL,CAAwB,KAAKxB,SAAL,CAAe+B,IAAvC,EAA6CvB,OAA7C,EAAsDkB,KAAtD,CAAP;AACD;AAED;AACF;AACA;;;AACEM,EAAAA,qBAAqB,CAACC,QAAD,EAAgD;AACnE,WAAO,KAAIC,kCAAJ,EAAwBD,QAAxB,CAAP;AACD;AAED;AACF;AACA;AACA;;;AACEE,EAAAA,mBAAmB,GAAqB;AACtC,WAAO;AACLC,MAAAA,IAAI,EAAE,gBADD;AAELC,MAAAA,KAAK,EAAE;AAFF,KAAP;AAID;;AAEOC,EAAAA,sBAAsB,CAACC,UAAD,EAAoC;AAChE,UAAMb,KAAK,GAAGa,UAAU,CACrBC,GADW,CACNC,CAAD,IAAOA,CAAC,CAACC,UAAF,CAAahB,KADb,EAEXiB,IAFW,GAGXH,GAHW,CAGNI,CAAD,IAAOA,CAAC,CAACb,IAHF,CAAd;AAIA,WAAOL,KAAK,CAACmB,MAAN,CAAcD,CAAD,IAAOA,CAAC,CAACE,QAAF,CAAW,KAAX,KAAqBF,CAAC,CAACE,QAAF,CAAW,MAAX,CAAzC,CAAP;AACD;;AAEuB,QAAV5C,UAAU,CAACqC,UAAD,EAA0BQ,SAA1B,EAAmD;AACzE,UAAM/C,SAAS,GAAG,KAAKA,SAAvB;;AACA,QAAI,CAACA,SAAD,IAAc,CAAC+C,SAAS,CAACC,aAA7B,EAA4C;AAC1C;AACD;;AACD,UAAM;AAAEC,MAAAA,OAAF;AAAWC,MAAAA;AAAX,QAA0BH,SAAhC;AACA,UAAMrB,KAAK,GAAGwB,UAAU,GAAG,KAAKZ,sBAAL,CAA4BC,UAA5B,CAAH,GAA6C,EAArE;AACA,UAAM,KAAKV,+BAAL,CAAqC;AAAEoB,MAAAA,OAAF;AAAWC,MAAAA;AAAX,KAArC,EAA8DxB,KAA9D,CAAN;AACD;;AAE8B,QAAjBrB,iBAAiB,CAAC8C,SAAD,EAAuBzB,KAAvB,EAAwC;AACrE,QAAI,CAAC,KAAKH,QAAV,EAAoB;AAClB,aAAO;AACL6B,QAAAA,OAAO,EAAE;AADJ,OAAP;AAGD;;AACD,UAAM,2BAAW1B,KAAX,EAAmB2B,IAAD,IAAU,KAAK9B,QAAL,CAAc+B,YAAd,CAA2BD,IAA3B,CAA5B,CAAN;AACA,WAAO;AACLD,MAAAA,OAAO,EAAE;AADJ,KAAP;AAGD;;AAKoB,eAARG,QAAQ,CAAC,CAACC,MAAD,EAASC,SAAT,EAAoBzD,SAApB,CAAD,EAAsE;AACzFwD,IAAAA,MAAM,CAACE,cAAP,CAAsB,KAAIC,+BAAJ,GAAtB;AACA,UAAM5D,MAAM,GAAG0D,SAAS,CAACG,YAAV,CAAuBzC,gCAAiBC,EAAxC,CAAf;AACAoC,IAAAA,MAAM,CAACE,cAAP,CAAsB,KAAIC,+BAAJ,EAAqB5D,MAArB,CAAtB;AAEA,WAAO,IAAIF,cAAJ,CAAmBE,MAAnB,EAA2BC,SAA3B,CAAP;AACD;;AAxHyB;;;gCAAfH,c,aA+GMgE,kB;gCA/GNhE,c,kBAgHW,CAACiE,sBAAD,EAAeC,sBAAf,EAA6BC,oBAA7B,C;;AAWxB7C,gCAAiB8C,UAAjB,CAA4BpE,cAA5B;;AAEO,SAASmB,0BAAT,CACLkD,MADK,EAELzD,YAAmC,GAAG,EAFjC,EAGL0D,OAHK,EAIoB;AACzB,MAAI,CAACC,KAAK,CAACC,OAAN,CAAc5D,YAAd,CAAL,EAAkC,OAAOyD,MAAP;AAClC,QAAMI,SAAS,GAAG7D,YAAY,CAAC8D,MAAb,CAAoB,CAACC,GAAD,EAAMC,WAAN,KAAsB;AAC1D,WAAOA,WAAW,CAACD,GAAD,EAAML,OAAN,CAAlB;AACD,GAFiB,EAEfD,MAFe,CAAlB;AAGA,SAAOI,SAAP;AACD","sourcesContent":["import ts, { TsConfigSourceFile } from 'typescript';\nimport { 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 pMapSeries from 'p-map-series';\nimport { TsserverClient, TsserverClientOpts } from '@teambit/ts-server';\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';\n\nexport type TsMode = 'build' | 'dev';\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  private tsServer: TsserverClient;\n  constructor(private logger: Logger, private workspace?: Workspace) {\n    if (this.workspace) {\n      this.workspace.registerOnPreWatch(this.onPreWatch.bind(this));\n      this.workspace.registerOnComponentChange(this.onComponentChange.bind(this));\n      this.workspace.registerOnComponentAdd(this.onComponentChange.bind(this));\n    }\n  }\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 an instance of a typescript semantic schema extractor.\n   */\n  createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor {\n    return new TypeScriptExtractor(tsconfig);\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  getPackageJsonProps(): PackageJsonProps {\n    return {\n      main: 'dist/{main}.js',\n      types: '{main}.ts',\n    };\n  }\n\n  private getAllFilesForTsserver(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.getAllFilesForTsserver(components) : [];\n    await this.initTsserverClientFromWorkspace({ verbose, checkTypes }, 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 = [SchemaAspect, LoggerAspect, WorkspaceAspect];\n\n  static async provider([schema, loggerExt, workspace]: [SchemaMain, LoggerMain, Workspace]) {\n    schema.registerParser(new TypeScriptParser());\n    const logger = loggerExt.createLogger(TypescriptAspect.id);\n    schema.registerParser(new TypeScriptParser(logger));\n\n    return new TypescriptMain(logger, workspace);\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"]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/typescript",
-  "version": "0.0.531",
+  "version": "0.0.535",
   "homepage": "https://bit.dev/teambit/typescript/typescript",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.typescript",
     "name": "typescript",
-    "version": "0.0.531"
+    "version": "0.0.535"
   },
   "dependencies": {
     "@teambit/harmony": "0.2.11",
@@ -16,18 +16,18 @@
     "p-map-series": "2.1.0",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/compiler": "0.0.531",
-    "@teambit/typescript.modules.ts-config-mutator": "0.0.29",
+    "@teambit/compiler": "0.0.535",
+    "@teambit/typescript.modules.ts-config-mutator": "0.0.31",
     "@teambit/bit-error": "0.0.366",
-    "@teambit/builder": "0.0.531",
-    "@teambit/isolator": "0.0.531",
-    "@teambit/logger": "0.0.455",
-    "@teambit/component": "0.0.531",
-    "@teambit/schema": "0.0.531",
+    "@teambit/builder": "0.0.535",
+    "@teambit/isolator": "0.0.535",
+    "@teambit/logger": "0.0.457",
+    "@teambit/component": "0.0.535",
+    "@teambit/schema": "0.0.535",
     "@teambit/cli": "0.0.380",
-    "@teambit/pkg": "0.0.531",
-    "@teambit/ts-server": "0.0.1",
-    "@teambit/workspace": "0.0.531"
+    "@teambit/pkg": "0.0.535",
+    "@teambit/ts-server": "0.0.3",
+    "@teambit/workspace": "0.0.535"
   },
   "devDependencies": {
     "chai": "4.3.0",
@@ -39,7 +39,7 @@
     "@types/react-dom": "^17.0.5",
     "@types/react": "^17.0.8",
     "@types/node": "12.20.4",
-    "@teambit/typescript.aspect-docs.typescript": "0.0.91"
+    "@teambit/typescript.aspect-docs.typescript": "0.0.93"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.76",

package/typescript.main.runtime.ts

@@ -50,21 +50,62 @@ export class TypescriptMain {
     return new TypescriptCompiler(TypescriptAspect.id, this.logger, afterMutation.raw, tsModule);
   }
 
+  /**
+   * get TsserverClient instance if initiated already, otherwise, return undefined.
+   */
   getTsserverClient(): TsserverClient | undefined {
     return this.tsServer;
   }
 
-  async initTsserverClient(projectPath: string, options: TsserverClientOpts = {}): Promise<TsserverClient> {
-    this.tsServer = new TsserverClient(projectPath, this.logger, options);
+  /**
+   * starts a tsserver process to communicate with its API.
+   * @param projectPath absolute path of the project root directory
+   * @param options TsserverClientOpts
+   * @param files optionally, if check-types is enabled, provide files to open and type check.
+   * @returns TsserverClient
+   */
+  async initTsserverClient(
+    projectPath: string,
+    options: TsserverClientOpts = {},
+    files: string[] = []
+  ): Promise<TsserverClient> {
+    this.tsServer = new TsserverClient(projectPath, this.logger, options, files);
     this.tsServer.init();
     return this.tsServer;
   }
 
-  async initTsserverClientFromWorkspace(options: TsserverClientOpts = {}): Promise<TsserverClient> {
+  /**
+   * starts a tsserver process to communicate with its API. use only when running on the workspace.
+   * @param options TsserverClientOpts
+   * @param files optionally, if check-types is enabled, provide files to open and type check.
+   * @returns TsserverClient
+   */
+  async initTsserverClientFromWorkspace(
+    options: TsserverClientOpts = {},
+    files: string[] = []
+  ): Promise<TsserverClient> {
     if (!this.workspace) {
       throw new Error(`initTsserverClientFromWorkspace: workspace was not found`);
     }
-    return this.initTsserverClient(this.workspace.path, options);
+    return this.initTsserverClient(this.workspace.path, options, files);
+  }
+
+  /**
+   * create an instance of a typescript semantic schema extractor.
+   */
+  createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor {
+    return new TypeScriptExtractor(tsconfig);
+  }
+
+  /**
+   * add the default package json properties to the component
+   * :TODO @gilad why do we need this DSL? can't I just get the args here.
+   */
+  getPackageJsonProps(): PackageJsonProps {
+    return {
+      main: 'dist/{main}.js',
+      types: '{main}.ts',
+    };
   }
 
   private getAllFilesForTsserver(components: Component[]): string[] {
@@ -77,22 +118,12 @@ export class TypescriptMain {
 
   private async onPreWatch(components: Component[], watchOpts: WatchOptions) {
     const workspace = this.workspace;
-    if (!workspace || !watchOpts.checkTypes) {
+    if (!workspace || !watchOpts.spawnTSServer) {
       return;
     }
-    await this.initTsserverClientFromWorkspace({ verbose: watchOpts.verbose });
-    const supportedFiles = this.getAllFilesForTsserver(components);
-    this.tsServer.openMultipleFiles(supportedFiles);
-    const start = Date.now();
-    this.tsServer
-      .getDiagnostic()
-      .then(() => {
-        const end = Date.now() - start;
-        this.logger.console(`\ncompleted preliminary type checking. took ${end / 1000} sec`);
-      })
-      .catch((err) => {
-        this.logger.error(`failed getting the diag info from ts-server`, err);
-      });
+    const { verbose, checkTypes } = watchOpts;
+    const files = checkTypes ? this.getAllFilesForTsserver(components) : [];
+    await this.initTsserverClientFromWorkspace({ verbose, checkTypes }, files);
   }
 
   private async onComponentChange(component: Component, files: string[]) {
@@ -101,41 +132,9 @@ export class TypescriptMain {
         results: 'N/A',
       };
     }
-    await pMapSeries(files, (file) => this.tsServer.changed(file));
-    let results = 'succeed';
-    const start = Date.now();
-    this.tsServer
-      .getDiagnostic()
-      .then(() => {
-        const end = Date.now() - start;
-        this.logger.console(
-          `\ntype checking had been completed (${end / 1000} sec) for the following files:\n${files.join('\n')}`
-        );
-      })
-      .catch((err) => {
-        results = 'failed';
-        this.logger.error(`failed getting the diag info from ts-server`, err);
-      });
+    await pMapSeries(files, (file) => this.tsServer.onFileChange(file));
     return {
-      results,
-    };
-  }
-
-  /**
-   * create an instance of a typescript semantic schema extractor.
-   */
-  createSchemaExtractor(tsconfig: TsConfigSourceFile): SchemaExtractor {
-    return new TypeScriptExtractor(tsconfig);
-  }
-
-  /**
-   * add the default package json properties to the component
-   * :TODO @gilad why do we need this DSL? can't I just get the args here.
-   */
-  getPackageJsonProps(): PackageJsonProps {
-    return {
-      main: 'dist/{main}.js',
-      types: '{main}.ts',
+      results: 'succeed',
     };
   }