fixup! fixup! fix(scripts): resolve api-extractor execution issue wit…

…hin packages with new DX
microsoft · Aug 19, 2021 · 3c6ab2e · 3c6ab2e
1 parent 3dbd166
commit 3c6ab2e
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/scripts/tasks/api-extractor.ts b/scripts/tasks/api-extractor.ts
@@ -2,7 +2,7 @@ import fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
 import jju from 'jju';
-import { apiExtractorVerifyTask, task, series, resolveCwd, logger, TscTaskOptions } from 'just-scripts';
+import { apiExtractorVerifyTask, task, series, resolveCwd, logger, TscTaskOptions, condition } from 'just-scripts';
 
 const noop = () => {};
 
@@ -26,32 +26,26 @@ export function apiExtractor() {
             tsConfigPath: resolveCwd('./tsconfig.json'),
           });
 
-          console.log({ overrideApi });
+          const shouldExecOverrideTasks = () => overrideApi !== null;
 
           const cleanupOverrides = overrideApi ? () => overrideApi.resetConfig() : () => noop;
 
-          const taskName = `api-extractor:${configName}`;
+          task('api-extractor:override-config', () => {
+            if (overrideApi) {
+              overrideApi.overrideConfig();
+            }
+          });
+          task('api-extractor:cleanup-override-config', () => {
+            cleanupOverrides();
+          });
 
+          const taskName = `api-extractor:${configName}`;
           task(
             taskName,
             series(
-              () => {
-                if (overrideApi) {
-                  overrideApi.overrideConfig();
-                }
-              },
-              () => {
-                try {
-                  apiExtractorVerifyTask({ configJsonFilePath: configPath, localBuild });
-                } catch (err) {
-                  cleanupOverrides();
-                  console.error(err);
-                  process.exit(1);
-                }
-              },
-              () => {
-                cleanupOverrides();
-              },
+              condition('api-extractor:override-config', shouldExecOverrideTasks),
+              apiExtractorVerifyTask({ configJsonFilePath: configPath, localBuild }),
+              condition('api-extractor:cleanup-override-config', shouldExecOverrideTasks),
             ),
           );
 
@@ -80,8 +74,6 @@ function overrideExtractorConfigForPackagesWithTsPathAliases(options: {
   const tsConfig: TsConfig = jju.parse(fs.readFileSync(options.tsConfigPath, 'utf-8'));
   const shouldOverrideConfig = Boolean(tsConfig.extends);
 
-  console.log({ shouldOverrideConfig });
-
   if (!shouldOverrideConfig) {
     return null;
   }