-
Notifications
You must be signed in to change notification settings - Fork 64
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
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b5ab1a8
Add glob for issue #26
cybrown 6da8eef
Fixed the readme to read exclude instead of excludes
dylanowen 67cf506
Merge branch 'master' of https://github.com/cybrown/dts-generator
dylanowen f0f4167
fixed exclude options not resolving correclty
dylanowen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) => { | ||
return result.concat(pathArray); | ||
}, []); | ||
} | ||
|
||
function processTree(sourceFile: ts.SourceFile, replacer: (node: ts.Node) => string): string { | ||
|
@@ -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) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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); }); | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.