This repository has been archived by the owner on Dec 11, 2024. It is now read-only.
Fix transitive dependency case #45
Merged
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
|
Testing in progress |
afsalthaj
commented
Jun 9, 2024
wasm-rpc-stubgen/src/lib.rs
Outdated
| @@ -295,6 +310,7 @@ pub fn add_stub_dependency(args: AddStubDependencyArgs) -> anyhow::Result<()> { | |||
| // If stub generated world points to the destination world (meaning the destination still owns the world for which the stub is generated), | |||
| // we re-generation of stub with inlined types and copy the inlined stub to the destination | |||
| if dest_owns_stub_world(&world_name, &destination_wit_root) { | |||
| dbg!("Is destination owning stub world"); | |||
There was a problem hiding this comment.
Will remove once testing is finished
afsalthaj
changed the title
afsalthaj
commented
Jun 9, 2024
wasm-rpc-stubgen/src/lib.rs
Outdated
|
|
||
| if internal::is_invalid_dependency(&destination_wit_root, &parsed) { | ||
| println!( | ||
| "Skipping the copy of cyclic dependencies {} to the the same as {}", |
afsalthaj
commented
Jun 9, 2024
wasm-rpc-stubgen/src/lib.rs
Outdated
|
|
||
| // For those dependencies we add to the source, if they, by any chance, imports from the skipped/invalid dependencies (basically they are destination_wit package itself) | ||
| // we simply replace. This is the reasoning | ||
| // The dependencies we import never logically end up using these imports in the WIT files. |
There was a problem hiding this comment.
Make the comment more clear
nicoburniske
approved these changes
Jun 20, 2024
| Ok(re.replace_all(&read_data, "").to_string()) | ||
| } | ||
|
|
||
| pub fn get_file_name(path: &PathBuf) -> anyhow::Result<String> { |
There was a problem hiding this comment.
Not blocking at all, but there's no need to use String here, we can just use the PathBuf. I think we'd need to update the enum case WitAction::WriteWit to use PathBuf as a field instead of String.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
https://github.com/afsalthaj/testwasmrpc/tree/transitive_dependency
The above tested code has
caller,callee(and acallee2which isn't significant here)And the following scenarios have been tested with this change
callerdepends oncallee-stubcalleein turn depends oncaller-stubcallerdepends oncaller-stubitself (just to see we are not regressing this fix that was done earlier - it shouldn't)cargo make build-flowafter code changes (i.e, adding imports and adding actual usage) is also done. Multiple runs are important as there are state changes after the first run.The PR #42 hasn't tried to solve transitive dependency case, and it looks like much more easier than the direct-cyclic dependency case. There is no logical intervention into the direct cyclic dependency fix in this PR, still I have included that in the test case.