Skip to content

Commit

Permalink
Merge branch '5.10' into Automatticgh-9183
Browse files Browse the repository at this point in the history
  • Loading branch information
AbdelrahmanHafez committed Jul 2, 2020
2 parents 2398073 + 156de0c commit ea3954e
Show file tree
Hide file tree
Showing 61 changed files with 958 additions and 196 deletions.
19 changes: 19 additions & 0 deletions History.md
@@ -1,3 +1,22 @@
5.9.21 / 2020-07-01
===================
* fix: propagate `typeKey` option to implicitly created schemas from `typePojoToMixed` #9185 [joaoritter](https://github.com/joaoritter)
* fix(populate): handle embedded discriminator `refPath` with multiple documents #9153
* fix(populate): handle deselected foreign field with `perDocumentLimit` and multiple documents #9175
* fix(document): disallow `transform` functions that return promises #9176 #9163 [AbdelrahmanHafez](https://github.com/AbdelrahmanHafez)
* fix(document): use strict equality when checking mixed paths for modifications #9165
* docs: add target="_blank" to all edit links #9058

5.9.20 / 2020-06-22
===================
* fix(populate): handle populating primitive array under document array discriminator #9148
* fix(connection): make sure to close previous connection when calling `openUri()` on an already open connection #9107
* fix(model): fix conflicting $setOnInsert default values with `update` values in bulkWrite #9160 #9157 [AbdelrahmanHafez](https://github.com/AbdelrahmanHafez)
* docs(validation): add note about validateBeforeSave and invalidate #9144 [dandv](https://github.com/dandv)
* docs: specify the array field syntax for invalidate #9137 [dandv](https://github.com/dandv)
* docs: fix several typos and broken references #9024 [AbdelrahmanHafez](https://github.com/AbdelrahmanHafez)
* docs: fix minor typo #9143 [dandv](https://github.com/dandv)

5.9.19 / 2020-06-15
===================
* fix: upgrade mongodb driver -> 3.5.9 #9124 [AbdelrahmanHafez](https://github.com/AbdelrahmanHafez)
Expand Down
2 changes: 1 addition & 1 deletion docs/acquit.pug
@@ -1,7 +1,7 @@
extends layout

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/api.pug
Expand Up @@ -30,7 +30,7 @@ block content
each item in docs
hr.separate-api
div.item-header-wrap
<a class="edit-docs-link" href="#{item.editLink}">
<a class="edit-docs-link" href="#{item.editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>
h2(id=item.name, class="item-header")
Expand Down
2 changes: 1 addition & 1 deletion docs/api_split.pug
Expand Up @@ -15,7 +15,7 @@ append style
}

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>
h1 #{name}
Expand Down
2 changes: 1 addition & 1 deletion docs/async-await.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/browser.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/built-with-mongoose.pug
@@ -1,7 +1,7 @@
extends layout

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/compatibility.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/connections.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/deprecations.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/documents.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/faq.pug
Expand Up @@ -17,7 +17,7 @@ block append style
}

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/further_reading.pug
Expand Up @@ -21,7 +21,7 @@ append style
}

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/geojson.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/guide.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/guides.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/jest.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/lambda.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/middleware.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/migration.pug
Expand Up @@ -7,7 +7,7 @@ block append style
}

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/models.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/plugins.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/populate.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/queries.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/schematypes.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/subdocs.pug
Expand Up @@ -5,7 +5,7 @@ append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
2 changes: 1 addition & 1 deletion docs/transactions.pug
Expand Up @@ -5,7 +5,7 @@ block append style
script(type="text/javascript" src="/docs/js/native.js")

block content
<a class="edit-docs-link" href="#{editLink}">
<a class="edit-docs-link" href="#{editLink}" target="_blank">
<img src="/docs/images/pencil.svg" />
</a>

Expand Down
9 changes: 3 additions & 6 deletions index.pug
Expand Up @@ -262,9 +262,6 @@ html(lang='en')
<a href="https://www.bonus.com.de/freispiele">
<img class="sponsor" src="https://images.opencollective.com/bonusfinder-deutschland/646169e/logo.png" style="height: 100px">
</a>
<a href="https://www.monetta.pl/">
<img class="sponsor" src="https://images.opencollective.com/monetta/7d65ae6/logo.png" style="height: 100px">
</a>
<a href="https://www.minitool.com/">
<img class="sponsor" src="https://images.opencollective.com/minitool-solution-ltd/1519aa6/logo.png" style="height: 100px">
</a>
Expand All @@ -277,9 +274,6 @@ html(lang='en')
<a href="https://searchpromocodes.com/">
<img class="sponsor" src="https://images.opencollective.com/searchpromocodes/68ae5dd/logo/256.png" style="height: 100px">
</a>
<a href="https://unscramblex.com/">
<img class="sponsor" src="https://images.opencollective.com/unscramblex/87d6a68/logo/256.png" style="height: 100px">
</a>
<a href="https://www.nettikasinot.org/">
<img class="sponsor" src="https://images.opencollective.com/nettikasinot-org/bbd887f/logo/256.png" style="height: 100px">
</a>
Expand Down Expand Up @@ -364,6 +358,9 @@ html(lang='en')
<a href="https://www.japanesecasino.com/">
<img class="sponsor" src="https://images.opencollective.com/japanesecasino/b0ffe3c/logo/256.png" style="height: 100px">
</a>
<a href="https://www.parhaatkasinot.com/">
<img class="sponsor" src="https://images.opencollective.com/parhaatkasinot/e7fda21/logo/256.png" style="height: 100px">
</a>
</div>
</div>

Expand Down
26 changes: 26 additions & 0 deletions lib/aggregate.js
Expand Up @@ -909,6 +909,32 @@ Aggregate.prototype.facet = function(options) {
return this.append({ $facet: options });
};

/**
* Helper for [Atlas Text Search](https://docs.atlas.mongodb.com/reference/atlas-search/tutorial/)'s
* `$search` stage.
*
* ####Example:
*
* Model.aggregate().
* search({
* text: {
* query: 'baseball',
* path: 'plot'
* }
* });
*
* // Output: [{ plot: '...', title: '...' }]
*
* @param {Object} $search options
* @return {Aggregate} this
* @see $search https://docs.atlas.mongodb.com/reference/atlas-search/tutorial/
* @api public
*/

Aggregate.prototype.search = function(options) {
return this.append({ $search: options });
};

/**
* Returns the current pipeline
*
Expand Down

0 comments on commit ea3954e

Please sign in to comment.