-
Notifications
You must be signed in to change notification settings - Fork 51
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
feat: scanDirs respects input dirs order #148
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export default function () { | ||
return 'bar' | ||
} |
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 |
---|---|---|
|
@@ -10,28 +10,29 @@ export async function scanDirExports (dir: string | string[], options?: ScanDirE | |
|
||
const fileFilter = options?.fileFilter || (() => true) | ||
const filePatterns = options?.filePatterns || ['*.{ts,js,mjs,cjs,mts,cts}'] | ||
const files = await fg( | ||
dirs.flatMap(i => [ | ||
i, | ||
...filePatterns.map(p => join(i, p)) | ||
]), | ||
{ | ||
absolute: true, | ||
cwd: options?.cwd || process.cwd(), | ||
onlyFiles: true, | ||
followSymbolicLinks: true | ||
} | ||
).then(r => r.map(f => normalize(f)).sort().filter(fileFilter)) | ||
|
||
const imports: Import[] = [] | ||
|
||
await Promise.all( | ||
files.map(async (path) => { | ||
imports.push(...await scanExports(path)) | ||
}) | ||
const result = await Promise.all( | ||
// Do multiple glob searches to persist the order of input dirs | ||
dirs.map(async i => await fg( | ||
[i, ...filePatterns].map(p => join(i, p)), | ||
{ | ||
absolute: true, | ||
cwd: options?.cwd || process.cwd(), | ||
onlyFiles: true, | ||
followSymbolicLinks: true | ||
}) | ||
.then(r => r | ||
.map(f => normalize(f)) | ||
.filter(fileFilter) | ||
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 don't think it's necessary to filter here since you're filtering after flattening the array |
||
.sort() | ||
) | ||
) | ||
) | ||
|
||
return imports | ||
const files = Array.from(new Set(result.flat())).filter(fileFilter) | ||
const fileExports = await Promise.all(files.map(scanExports)) | ||
|
||
return fileExports.flat() | ||
} | ||
|
||
export async function scanExports (filepath: string) { | ||
|
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
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.
there's a mistake here, it should be
[i, ...filePatterns.map(p => join(i, p))]
insteadThere 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.
Thanks! Fixed in v1.0.1