refactor: add loader to load kcl package #486
Closed
Conversation
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
Signed-off-by: zongz <[email protected]>
Pull Request Test Coverage Report for Build 10938239849Details
💛 - Coveralls |
zong-zhe
changed the title
zong-zhe
commented
Sep 19, 2024
pkg/loader/loader.go
Outdated
| Load(pkgPath string) (*pkg.KclPkg, error) | ||
| } | ||
|
|
||
| // PkgLoader is a struct that contains the settings. |
There was a problem hiding this comment.
Remove Loader, there is no need for additional complex structures, a function is enough.
pkg/features/features.go
Outdated
| ) | ||
|
|
||
| var features = map[string]bool{ | ||
| SupportMVS: false, | ||
| SupportMVS: false, | ||
| SupportPackageLoader: false, |
There was a problem hiding this comment.
Use branch 'dev' to replace features gate
pkg/client/client.go
Outdated
| @@ -76,6 +79,7 @@ func NewKpmClient() (*KpmClient, error) { | |||
| logWriter: os.Stdout, | |||
| settings: *settings, | |||
| homePath: homePath, | |||
| PkgLoader: loader.NewFileLoader(settings), | |||
There was a problem hiding this comment.
remove Pkgloader from client.
pkg/client/client.go
Outdated
|
|
||
| // Get dependencies from kcl.mod.lock. | ||
| deps, err := c.LoadLockDeps(pkgPath) | ||
| if ok, err := features.Enabled(features.SupportPackageLoader); err != nil && ok { |
There was a problem hiding this comment.
Remove feature gates, refactor is not feature
Signed-off-by: zongz <[email protected]>
Signed-off-by: zongz <[email protected]>
Peefy
reviewed
Sep 19, 2024
| @@ -34,3 +34,7 @@ jobs: | |||
| uses: shogo82148/actions-goveralls@v1 | |||
| with: | |||
| path-to-profile: coverage.out | |||
| - name: Send coverage | |||
| HomePath: pkgPath, | ||
| Dependencies: *deps, | ||
| }, nil | ||
| return loader.Load( |
There was a problem hiding this comment.
Use Load.. functions in the package package.
| @@ -0,0 +1,153 @@ | |||
| package loader | |||
|
|
|||
| import ( | |||
There was a problem hiding this comment.
You can use LoadModFile function instead of using a new LoadModFile function in the loader package.
| @@ -58,6 +58,7 @@ func NewKclPkg(opts *opt.InitOptions) KclPkg { | |||
| } | |||
| } | |||
|
|
|||
| // Deprecated: Use `KpmClient.LoadPkgFromPath()` instead. | |||
There was a problem hiding this comment.
Remove the deprecated comment information.
Peefy
reviewed
Sep 19, 2024
| @@ -1832,7 +1793,22 @@ func (c *KpmClient) DownloadDeps(deps *pkg.Dependencies, lockDeps *pkg.Dependenc | |||
|
|
|||
| existDep, err := c.dependencyExistsLocal(pkghome, &d) | |||
| if existDep != nil && err == nil { | |||
|
|
|||
| if d.GetPackage() != "" { | |||
There was a problem hiding this comment.
The start comment of the function should be DownloadDeps instead of downloadDeps
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
1. Does this PR affect any open issues?(Y/N) and add issue references (e.g. "fix #123", "re #123".):
re #478
2. What is the scope of this PR (e.g. component or file name):
3. Provide a description of the PR(e.g. more details, effects, motivations or doc link):
4. Are there any breaking changes?(Y/N) and describe the breaking changes(e.g. more details, motivations or doc link):
5. Are there test cases for these changes?(Y/N) select and add more details, references or doc links: