refactor: de-global env #65
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
Replace object parameters with separate parameters. This is mostly done for consistency, as most functions in the project use multiple parameters. Also it makes the function signature a lot shorter.
Remove env usage from pkg-manifest-io
Remove env usage from upm-config-io
Remove env from fetchPackageInfo
Remove usage from registry-client
Removes the _ functions that exist in some cmd files by either making them local functions inside the main cmd function or by just moving their content into the main cmd function. The goals for this are: - Move env usage up into just the env functions - Avoid unnecessary parameter passing
Remove env from getNpmFetchOptions function
Remove env usage from manifest-assertions
Remove env usage from writeUnityToken
Manifest-path is no longer stored on env, but calculated on demand from cwd. The goal here is to shrink env / deduplicate information in it. parseEnv still checks whether manifest-path exists
Make env a non-global value
instead of storing urls for regular and upstream registry, as well as all auths, now we store only the auths for the used registries and put them together with the registry urls
nmpAuth is only used inside the parse-env function and can be removed from env
color is only used inside the parse-env function and can be made local
region is only used inside the parse-env function and can be made local
This typo caused color to be used in test scenarios which would mess with the mock console
If the color option is undefined it should also count as true
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.
Goal
This is a preparation refactor for the next PR where I want to tackle CLI validation. After starting with that I noticed, that I would like to do validation on
envstuff before we even get inside the cmd-function. To make implementation of that easierenvwas extracted all the way up into these cmd-functions so it can easily be moved one more step up into the cli-logic.Changes
Besides some other small refactors, this pull requests cleans up the env logic in three major ways:
Remove unused properties
Some properties, such as
colorare only ever used inside theparseEnvfunction and can be removed from theenvobject.Also
envcurrently stored all registry auth information even though you will only ever need the one for the registries that are currently in use. This was also cleaned up.Pull up
envusagesInstead of referencing
envdeep inside utility functions only relevant pieces of information are passed in.envis now only used inside cmd-functions e.g. at the top level.Un-global
envSince
envis now created and only used inside of cmd-functions, theparseEnvfunction now returns the createdenvobject instead of making it available globally.