This repository has been archived by the owner on Feb 6, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Improve UX: Support glob patterns in triple-slash comment #27
Open
YiranJing
wants to merge
4
commits into
canva-public:main
Choose a base branch
from
YiranJing:yiran-add-glob-pattern-directive
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 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 @@ | ||
/// <dependency-tree depends-on="./*.sh" /> |
Empty file.
Empty file.
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 |
---|---|---|
|
@@ -6,3 +6,4 @@ | |
*/ | ||
|
||
/// <dependency-tree depends-on="./dep4.ejs" /> | ||
/// <dependency-tree depends-on="./dir1/**/*" /> |
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
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 |
---|---|---|
|
@@ -3,8 +3,10 @@ | |
import * as camelcase from 'camelcase'; | ||
import escapeRegExp = require('lodash.escaperegexp'); | ||
import { OptionsV2, parseStringPromise as xml2js } from 'xml2js'; | ||
import { DependencyTree, FileToDeps, Path } from '../'; | ||
import { DependencyTree, FileToDeps, Path, ReferenceTransformFn } from '../'; | ||
import { FileProcessor } from '../file_processor'; | ||
import * as path from 'path'; | ||
import * as fg from 'fast-glob'; | ||
|
||
type Directive = { | ||
dependsOn?: string; | ||
|
@@ -19,6 +21,19 @@ type Options = { | |
fileTypes: string[]; | ||
}; | ||
|
||
/** | ||
* Gets a list of files if the reference is a glob pattern. Otherwise, returns the original reference. | ||
*/ | ||
export const transformReference: ReferenceTransformFn = ( | ||
ref: string, | ||
source: string, | ||
) => { | ||
if (fg.isDynamicPattern(ref)) { | ||
return fg.sync(ref, { cwd: path.dirname(source), absolute: true }); | ||
} | ||
return ref; | ||
}; | ||
|
||
/** | ||
* An abstract DirectiveProcessor class that implements language-agnostic generic logic of | ||
* directives' parsing. For more info see: tools/dependency-tree/docs/directive.md. | ||
|
@@ -165,7 +180,7 @@ abstract class DirectiveProcessor implements FileProcessor { | |
dependsOn && | ||
dependencyTree.resolveAndCollect( | ||
file, | ||
dependencyTree.transformReference(dependsOn, file), | ||
transformReference(dependsOn, file), | ||
Comment on lines
-168
to
+183
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. This change will block user provide their own custom 🤔 but I don't think users need an extra transformer for the |
||
importedFiles, | ||
missing, | ||
); | ||
|
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.
update the readme with a complete example. (make it easier for new users to understand)