Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed some bugs around excludes not resolving #74

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import Foo = require('package-name/Foo');

* `baseDir?: string`: The base directory for the package being bundled. Any dependencies discovered outside this
directory will be excluded from the bundle. *Note* this is no longer the preferred way to configure `dts-generator`, please see `project`.
* `excludes?: string[]`: A list of glob patterns, relative to `baseDir`, that should be excluded from the bundle. Use
* `exclude?: string[]`: A list of glob patterns, relative to `baseDir`, that should be excluded from the bundle. Use
the `--exclude` flag one or more times on the command-line. Defaults to `[ "node_modules/**/*.d.ts" ]`.
* `externs?: string[]`: A list of external module reference paths that should be inserted as reference comments. Use
the `--extern` flag one or more times on the command-line.
Expand Down
20 changes: 11 additions & 9 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ function getFilenames(baseDir: string, files: string[]): string[] {
return files.map(function (filename) {
const resolvedFilename = pathUtil.resolve(filename);
if (resolvedFilename.indexOf(baseDir) === 0) {
return resolvedFilename;
return glob.sync(resolvedFilename);
}

return pathUtil.resolve(baseDir, filename);
});
return glob.sync(pathUtil.resolve(baseDir, filename));
}).reduce((result, pathArray) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's plan to rebase this after #32 lands.

return result.concat(pathArray);
}, []);
}

function processTree(sourceFile: ts.SourceFile, replacer: (node: ts.Node) => string): string {
Expand Down Expand Up @@ -204,14 +206,14 @@ export default function generate(options: Options): Promise<void> {
filenames.forEach(name => { verboseMessage(' ' + name); });
const excludesMap: { [filename: string]: boolean; } = {};

options.exclude = options.exclude || [ 'node_modules/**/*.d.ts' ];
options.exclude = getFilenames(baseDir, options.exclude || [ 'node_modules/**/*.d.ts' ]);

options.exclude && options.exclude.forEach(function (filename) {
glob.sync(filename).forEach(function(globFileName) {
excludesMap[filenameToMid(pathUtil.resolve(baseDir, globFileName))] = true;
});
options.exclude.forEach(function (filename) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the original options.exclude && was in case node_modules contained no *.d.ts files? Seems unlikely to have that issue though?

excludesMap[filenameToMid(filename)] = true;
});
if (options.exclude) {

// at this point we'll always have an array so just check if it's empty
if (options.exclude.length > 0) {
verboseMessage('exclude:');
options.exclude.forEach(name => { verboseMessage(' ' + name); });
}
Expand Down