add option to merge settings #3464
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
added 2 commits
July 23, 2020 15:21
🦋 Changeset is good to goLatest commit: e9f508b We got this. This PR includes changesets to release 12 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Binary Size ReportAffected SDKs
Test Logs
|
.changeset/mean-jokes-tan.md
Outdated
| '@firebase/firestore-types': patch | ||
| --- | ||
|
|
||
| feat: Added `inherit` setting to merge existing settings with new settings when calling `firestore.settings()`. |
There was a problem hiding this comment.
Maybe something with "the settings from a previous call. This allows customizing custom settings on top of the settings that were applied by @firestore/testing. Yadadada."
Comment on lines
391
to
412
| settingsLiteral.host = | ||
| settingsLiteral.host === undefined | ||
| ? this._settings.host | ||
| : settingsLiteral.host; | ||
| settingsLiteral.ssl = | ||
| settingsLiteral.ssl === undefined | ||
| ? this._settings.ssl | ||
| : settingsLiteral.ssl; | ||
| settingsLiteral.timestampsInSnapshots = | ||
| settingsLiteral.timestampsInSnapshots === undefined | ||
| ? this._settings.timestampsInSnapshots | ||
| : settingsLiteral.timestampsInSnapshots; | ||
| settingsLiteral.cacheSizeBytes = | ||
| settingsLiteral.cacheSizeBytes === undefined | ||
| ? this._settings.cacheSizeBytes | ||
| : settingsLiteral.cacheSizeBytes; | ||
| settingsLiteral.ignoreUndefinedProperties = | ||
| settingsLiteral.ignoreUndefinedProperties === undefined | ||
| ? this._settings.ignoreUndefinedProperties | ||
| : settingsLiteral.ignoreUndefinedProperties; | ||
|
|
||
| return settingsLiteral; |
There was a problem hiding this comment.
return {...this._settings, ...settingsLiteral }
There was a problem hiding this comment.
done. Renamed forceLongPolling to experimentalForceLongPolling in order to use spread operator properly.
| @@ -57,6 +57,17 @@ export function firestore(): Firestore { | |||
| return FIRESTORE; | |||
| } | |||
|
|
|||
| export function namedFirestore(projectId: string): Firestore { | |||
| return new Firestore( | |||
There was a problem hiding this comment.
You don't need the name, do you? I think you just need to return a new instance. This could just be newTestFirstore().
schmidt-sebastian
assigned thebrianchen and unassigned thebrianchen and schmidt-sebastian
schmidt-sebastian
approved these changes
Jul 27, 2020
.changeset/mean-jokes-tan.md
Outdated
| '@firebase/firestore': patch | ||
| '@firebase/firestore-types': patch | ||
| --- | ||
| feat: Added `inherit` setting to merge the new settings with the settings from a previous call when calling `firestore.settings()`. This allows adding settings on top of the settings that were applied by `@firebase/testing`. |
There was a problem hiding this comment.
Suggested change
| feat: Added `inherit` setting to merge the new settings with the settings from a previous call when calling `firestore.settings()`. This allows adding settings on top of the settings that were applied by `@firebase/testing`. | |
| feat: Added `inherit` option to `firestore.settings()`, which merges the provided settings with settings from a previous call . This allows adding settings on top of the settings that were applied by `@firebase/testing`. | |
| Also line wrap. |
egilmorez
reviewed
Aug 10, 2020
packages/firebase/index.d.ts
Outdated
|
|
||
| /** | ||
| * Whether to merge the provided settings with the existing settings. If | ||
| * set to `true`, the settings will be merged with existing settings. If |
There was a problem hiding this comment.
We avoid "will" when possible. So this could be "are merged" and the line below just "settings replace..."
egilmorez
approved these changes
Aug 10, 2020
Feiyang1
approved these changes
Aug 13, 2020
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.
Fixes #3354.