fix: generate typescript definitions in one pass

teclone · Nov 13, 2023 · a40de96 · a40de96
1 parent dbd0526
commit a40de96
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 45 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/assets/index.json b/src/assets/index.json
@@ -0,0 +1 @@
+{}
diff --git a/src/modules/Bundler.ts b/src/modules/Bundler.ts
@@ -328,56 +328,30 @@ class Bundler {
   ) {
     const processedTDFiles = new Set();
 
+    const options = {
+      declaration: true,
+      emitDeclarationOnly: true,
+    };
+
     log(chalk.gray(`Generating ${format} typescript definition files...\n`));
 
+    // write to filesytem and index
     return new Promise((resolve, reject) => {
-      let rejected = false;
-
-      // run with try catch block
-      const run = (callback) => {
-        try {
-          callback();
-        } catch (ex) {
-          rejected = true;
-          reject(ex);
-        }
-      };
-
-      // write to filesytem and index
-      const onEmit = (filename, content) =>
-        run(() => {
-          const out = path.join(outFolder, filename.split(this.src)[1]);
-          processedTDFiles.add(out);
-          fs.mkdirSync(path.dirname(out), { recursive: true });
-          fs.writeFileSync(out, content);
-        });
-
-      for (let i = 0; i < fileModules.length; i++) {
-        const fileModule = fileModules[i];
-        if (rejected) {
-          break;
-        }
-
-        const tsdOut = path.join(
-          outFolder,
-          fileModule.locationRelativeToSrc,
-          fileModule.baseName + '.d.ts'
-        );
-
-        if (processedTDFiles.has(tsdOut)) {
-          continue;
-        }
-
-        run(() => {
-          const program = ts.createProgram([fileModule.location], {
-            declaration: true,
-            emitDeclarationOnly: true,
-          });
+      const host = ts.createCompilerHost(options);
 
-          program.emit(undefined, onEmit, undefined, true);
-        });
-      }
+      host.writeFile = (filename: string, contents: string) => {
+        const out = path.join(outFolder, filename.split(this.src)[1]);
+        processedTDFiles.add(out);
+        fs.mkdirSync(path.dirname(out), { recursive: true });
+        fs.writeFileSync(out, contents);
+      };
 
+      const program = ts.createProgram(
+        fileModules.map((current) => current.location),
+        options,
+        host
+      );
+      program.emit();
       resolve(true);
     });
   }