fix(schema): allow overriding context and tsserver path when extracti…

…ng (teambit#7906)
ammar-knowledge · Sep 13, 2023 · a899063 · a899063
1 parent 5359a03
commit a899063
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/scopes/semantics/schema/index.ts b/scopes/semantics/schema/index.ts
@@ -2,6 +2,7 @@ import { SchemaAspect } from './schema.aspect';
 
 export { Parser } from './parser';
 export { SchemaExtractor } from './schema-extractor';
+export type { SchemaExtractorOptions } from './schema-extractor';
 export {
   SchemaTask,
   SCHEMA_ARTIFACT_NAME,

diff --git a/scopes/semantics/schema/schema-extractor.ts b/scopes/semantics/schema/schema-extractor.ts
@@ -6,7 +6,7 @@ export interface SchemaExtractor {
   /**
    * extract a semantic schema from a component.
    */
-  extract(component: Component, formatter?: Formatter): Promise<APISchema>;
+  extract(component: Component, options?: SchemaExtractorOptions): Promise<APISchema>;
   /**
    * release resources if no schemas are needed for this process.
    * for typescript, this will kill the tsserver process.
@@ -15,3 +15,9 @@ export interface SchemaExtractor {
    */
   dispose(): void;
 }
+
+export type SchemaExtractorOptions = {
+  formatter?: Formatter;
+  tsserverPath?: string;
+  contextPath?: string;
+};
diff --git a/scopes/semantics/schema/schema.main.runtime.ts b/scopes/semantics/schema/schema.main.runtime.ts
@@ -110,7 +110,7 @@ export class SchemaMain {
       }
       const schemaExtractor: SchemaExtractor = env.getSchemaExtractor(undefined, tsserverPath, contextPath);
 
-      const result = await schemaExtractor.extract(component, formatter);
+      const result = await schemaExtractor.extract(component, { formatter, tsserverPath, contextPath });
       if (shouldDisposeResourcesOnceDone) schemaExtractor.dispose();
 
       return result;

diff --git a/scopes/typescript/typescript/typescript.extractor.ts b/scopes/typescript/typescript/typescript.extractor.ts
@@ -1,6 +1,6 @@
 import ts, { Node, SourceFile, SyntaxKind } from 'typescript';
 import { getTsconfig } from 'get-tsconfig';
-import { SchemaExtractor } from '@teambit/schema';
+import { SchemaExtractor, SchemaExtractorOptions } from '@teambit/schema';
 import { TsserverClient } from '@teambit/ts-server';
 import type { Workspace } from '@teambit/workspace';
 import { ComponentDependency, DependencyResolverMain } from '@teambit/dependency-resolver';
@@ -52,7 +52,14 @@ export class TypeScriptExtractor implements SchemaExtractor {
   /**
    * extract a component schema.
    */
-  async extract(component: Component, formatter?: Formatter): Promise<APISchema> {
+  async extract(component: Component, options: SchemaExtractorOptions = {}): Promise<APISchema> {
+    // override the rootTsserverPath and rootContextPath if passed via options
+    if (options.tsserverPath) {
+      this.rootTsserverPath = options.tsserverPath;
+    }
+    if (options.contextPath) {
+      this.rootContextPath = options.contextPath;
+    }
     const tsserver = await this.getTsServer();
     const mainFile = component.mainFile;
     const compatibleExts = ['.tsx', '.ts'];
@@ -61,7 +68,7 @@ export class TypeScriptExtractor implements SchemaExtractor {
     );
     const allFiles = [mainFile, ...internalFiles];
 
-    const context = await this.createContext(tsserver, component, formatter);
+    const context = await this.createContext(tsserver, component, options.formatter);
 
     await pMapSeries(allFiles, async (file) => {
       const ast = this.parseSourceFile(file);