fix: utilize typings output directory when copying typings

Author: Harrison Ifeanyichukwu

README.md

@@ -436,6 +436,8 @@ You can override these options by creating and placing a `.buildrc.js` file in y
 
 - **externals**: Defines list of external modules. By default, `peerDependency` modules are read from your project's package.json file and included automatically when generating lib builds. So you don't need to add those.
 
+- **typingsDir**: Defines output folder to copy typings file over to. defaults to each build type `{outDir}/typings`
+
 ## Contributing
 
 We welcome your own contributions, ranging from code refactoring, documentation improvements, new feature implementations, bugs/issues reporting, etc. **Thanks in advance!!!**

src/.buildrc.ts

@@ -56,6 +56,8 @@ const config: Config = {
 
   externals: [],
 
+  typingsDir: '',
+
   /**
    * defines config settings for generating distributed codes. such as browser iife outputs
    */

src/@types/index.d.ts

@@ -51,6 +51,11 @@ export declare interface CommonConfig {
    * list of external modules for the specific build, by default, peer dependencie modules are auto included as externals for lib builds
    */
   externals?: string[];
+
+  /**
+   * typings directory, defaults to .typings folder inside your output directory
+   */
+  typingsDir?: string;
 }
 
 export declare interface LibConfig extends CommonConfig {
@@ -136,6 +141,11 @@ export declare interface Config {
    */
   externals: string[];
 
+  /**
+   * typings folder
+   */
+  typingsDir: string;
+
   /**
    * defines config settings for generating distributed codes
    */
@@ -230,6 +240,11 @@ export declare interface UserConfig {
    */
   externals?: string[];
 
+  /**
+   * typings directory, defaults to .typings folder inside your output directory
+   */
+  typingsDir?: string;
+
   /**
    * defines config settings for generating distributed codes.
    */

src/Constants.ts

@@ -8,6 +8,7 @@ export const COMMON_CONFIGS: (keyof CommonConfig)[] = [
   'uglify',
   'interop',
   'externals',
+  'typingsDir',
 ];
 
 export const REGEX_FIELDS: (keyof CommonConfig)[] = ['assets', 'include', 'exclude'];

src/index.ts

@@ -1,16 +1,20 @@
 import Bundler from './modules/Bundler';
-import { UserConfig } from './@types';
+import { UserConfig, Build } from './@types';
 
 export default {
-    /**
-     * returns array of rollup build objects
-     *
-     * @param uglifierPlugin the uglifier plugin if uglify is enabled or null if not
-     * @param otherPlugins array of other registered plugins
-     * @param config string pointing to your project config file or config object. defaults to .buildrc.js
-     */
-    getExports(uglifierPlugin: object | null, otherPlugins: object[], config: string | UserConfig = '.buildrc.js') {
-        const bundler = new Bundler(uglifierPlugin, otherPlugins, config);
-        return bundler.process();
-    }
-};
+  /**
+   * returns array of rollup build objects
+   *
+   * @param uglifierPlugin the uglifier plugin if uglify is enabled or null if not
+   * @param otherPlugins array of other registered plugins
+   * @param config string pointing to your project config file or config object. defaults to .buildrc.js
+   */
+  getExports(
+    uglifierPlugin: object | null,
+    otherPlugins: object[],
+    config: string | UserConfig = '.buildrc.js'
+  ): Build[] {
+    const bundler = new Bundler(uglifierPlugin, otherPlugins, config);
+    return bundler.process();
+  },
+};

src/modules/Bundler.ts

@@ -100,6 +100,14 @@ export default class Bundler {
       this.mergeConfig(prop, resolvedConfig, resolvedConfig.distConfig);
     });
 
+    //resolve typings folder
+    if (resolvedConfig.libConfig.typingsDir === '') {
+      resolvedConfig.libConfig.typingsDir = path.join(resolvedConfig.libConfig.outDir, 'typings');
+    }
+    if (resolvedConfig.distConfig.typingsDir === '') {
+      resolvedConfig.distConfig.typingsDir = path.join(resolvedConfig.distConfig.outDir, 'typings');
+    }
+
     //for lib config, add all per dependencies as externals
     if (packageFile.peerDependencies) {
       Object.keys(packageFile.peerDependencies).forEach(key => resolvedConfig.libConfig.externals.push(key));
@@ -134,7 +142,9 @@ export default class Bundler {
       src = oldRelativePath;
       const isTypeDefinitionFile = ext === '.d.ts';
 
-      if ((isTypeDefinitionFile && config.copyTypings) || (!isBuildFile && config.assets.some(regexMatches))) {
+      if (isTypeDefinitionFile && config.copyTypings) {
+        this.copyFile(filePath, path.join(config.typingsDir, oldRelativePath));
+      } else if (!isTypeDefinitionFile && !isBuildFile && config.assets.some(regexMatches)) {
         this.copyFile(filePath, path.join(config.outDir, oldRelativePath));
       } else if (
         isBuildFile &&