-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
fix: add validation support for Union schema types #15734
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
codervipul775
wants to merge
7
commits into
Automattic:master
Choose a base branch
from
codervipul775:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
59c420a
fix: add validation support for Union schema types
codervipul775 1116f3b
Fixed the extra spaces
codervipul775 5d2f052
Refactor validation test for arbitrary fields
codervipul775 974c1ef
Add tests for Union schema type validation
codervipul775 5343cdc
Add castSchemaTypeSymbol for schema type tracking
codervipul775 d0bfe63
Refactor casting logic in union schema
codervipul775 df32490
Refactor union schema validation tests
codervipul775 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ const SchemaUnionOptions = require('../options/schemaUnionOptions'); | |
| const SchemaType = require('../schemaType'); | ||
|
|
||
| const firstValueSymbol = Symbol('firstValue'); | ||
| const castSchemaTypeSymbol = Symbol('mongoose#castSchemaType'); | ||
|
|
||
| /*! | ||
| * ignore | ||
|
|
@@ -20,11 +21,23 @@ class Union extends SchemaType { | |
| throw new Error('Union schema type requires an array of types'); | ||
| } | ||
| this.schemaTypes = options.of.map(obj => options.parentSchema.interpretAsType(key, obj, schemaOptions)); | ||
|
|
||
| this.validators.push({ | ||
| validator: () => true, | ||
| type: 'union' | ||
| }); | ||
| } | ||
|
|
||
| cast(val, doc, init, prev, options) { | ||
| let firstValue = firstValueSymbol; | ||
| let firstSchemaType = null; | ||
| let lastError; | ||
| let bestMatch = null; | ||
| let bestMatchScore = -1; | ||
| let bestMatchSchemaType = null; | ||
|
|
||
| const isObject = val != null && typeof val === 'object' && !Array.isArray(val); | ||
|
|
||
| // Loop through each schema type in the union. If one of the schematypes returns a value that is `=== val`, then | ||
| // use `val`. Otherwise, if one of the schematypes casted successfully, use the first successfully casted value. | ||
| // Finally, if none of the schematypes casted successfully, throw the error from the last schema type in the union. | ||
|
|
@@ -34,16 +47,44 @@ class Union extends SchemaType { | |
| try { | ||
| const casted = this.schemaTypes[i].cast(val, doc, init, prev, options); | ||
| if (casted === val) { | ||
| if (casted != null && typeof casted === 'object' && casted.$__ != null) { | ||
| casted.$__[castSchemaTypeSymbol] = this.schemaTypes[i]; | ||
| } | ||
| return casted; | ||
| } | ||
|
|
||
| if (isObject && casted != null && typeof casted === 'object') { | ||
| const inputKeys = Object.keys(val); | ||
| const preservedFields = inputKeys.filter(key => key in casted && key !== '_id').length; | ||
| const score = preservedFields; | ||
|
|
||
| if (score > bestMatchScore) { | ||
| bestMatchScore = score; | ||
| bestMatch = casted; | ||
| bestMatchSchemaType = this.schemaTypes[i]; | ||
| } | ||
| } | ||
|
|
||
| if (firstValue === firstValueSymbol) { | ||
| firstValue = casted; | ||
| firstSchemaType = this.schemaTypes[i]; | ||
| } | ||
| } catch (error) { | ||
| lastError = error; | ||
| } | ||
| } | ||
|
|
||
| if (bestMatch !== null) { | ||
| if (bestMatch != null && typeof bestMatch === 'object' && bestMatch.$__ != null) { | ||
| bestMatch.$__[castSchemaTypeSymbol] = bestMatchSchemaType; | ||
| } | ||
| return bestMatch; | ||
| } | ||
|
|
||
| if (firstValue !== firstValueSymbol) { | ||
| if (firstValue != null && typeof firstValue === 'object' && firstValue.$__ != null) { | ||
| firstValue.$__[castSchemaTypeSymbol] = firstSchemaType; | ||
| } | ||
| return firstValue; | ||
| } | ||
| throw lastError; | ||
|
|
@@ -52,7 +93,14 @@ class Union extends SchemaType { | |
| // Setters also need to be aware of casting - we need to apply the setters of the entry in the union we choose. | ||
| applySetters(val, doc, init, prev, options) { | ||
| let firstValue = firstValueSymbol; | ||
| let firstSchemaType = null; | ||
| let lastError; | ||
| let bestMatch = null; | ||
| let bestMatchScore = -1; | ||
| let bestMatchSchemaType = null; | ||
|
|
||
| const isObject = val != null && typeof val === 'object' && !Array.isArray(val); | ||
|
|
||
| // Loop through each schema type in the union. If one of the schematypes returns a value that is `=== val`, then | ||
| // use `val`. Otherwise, if one of the schematypes casted successfully, use the first successfully casted value. | ||
| // Finally, if none of the schematypes casted successfully, throw the error from the last schema type in the union. | ||
|
|
@@ -67,16 +115,44 @@ class Union extends SchemaType { | |
| castedVal = this.schemaTypes[i].cast(castedVal, doc, init, prev, options); | ||
| } | ||
| if (castedVal === val) { | ||
| if (castedVal != null && typeof castedVal === 'object' && castedVal.$__ != null) { | ||
| castedVal.$__[castSchemaTypeSymbol] = this.schemaTypes[i]; | ||
| } | ||
| return castedVal; | ||
| } | ||
|
|
||
| if (isObject && castedVal != null && typeof castedVal === 'object') { | ||
| const inputKeys = Object.keys(val); | ||
| const preservedFields = inputKeys.filter(key => key in castedVal && key !== '_id').length; | ||
| const score = preservedFields; | ||
|
|
||
| if (score > bestMatchScore) { | ||
| bestMatchScore = score; | ||
| bestMatch = castedVal; | ||
| bestMatchSchemaType = this.schemaTypes[i]; | ||
| } | ||
| } | ||
|
|
||
| if (firstValue === firstValueSymbol) { | ||
| firstValue = castedVal; | ||
| firstSchemaType = this.schemaTypes[i]; | ||
| } | ||
| } catch (error) { | ||
| lastError = error; | ||
| } | ||
| } | ||
|
|
||
| if (bestMatch !== null) { | ||
| if (bestMatch != null && typeof bestMatch === 'object' && bestMatch.$__ != null) { | ||
| bestMatch.$__[castSchemaTypeSymbol] = bestMatchSchemaType; | ||
| } | ||
| return bestMatch; | ||
| } | ||
|
|
||
| if (firstValue !== firstValueSymbol) { | ||
| if (firstValue != null && typeof firstValue === 'object' && firstValue.$__ != null) { | ||
| firstValue.$__[castSchemaTypeSymbol] = firstSchemaType; | ||
| } | ||
| return firstValue; | ||
| } | ||
| throw lastError; | ||
|
|
@@ -88,6 +164,155 @@ class Union extends SchemaType { | |
| schematype.schemaTypes = this.schemaTypes.map(schemaType => schemaType.clone()); | ||
| return schematype; | ||
| } | ||
|
|
||
| /** | ||
| * Validates the value against all schema types in the union. | ||
| * The value must successfully validate against at least one schema type. | ||
| * | ||
| * @api private | ||
| */ | ||
| doValidate(value, fn, scope, options) { | ||
| if (options && options.skipSchemaValidators) { | ||
| return fn(null); | ||
| } | ||
|
|
||
| SchemaType.prototype.doValidate.call(this, value, function(error) { | ||
| if (error) { | ||
| return fn(error); | ||
| } | ||
| if (value == null) { | ||
| return fn(null); | ||
| } | ||
|
|
||
| // Check if we stored which schema type was used during casting | ||
| if (value && value.$__ && value.$__[castSchemaTypeSymbol]) { | ||
| const schemaType = value.$__[castSchemaTypeSymbol]; | ||
| return schemaType.doValidate(value, fn, scope, options); | ||
| } | ||
|
|
||
| if (value && value.schema && value.$__) { | ||
| const subdocSchema = value.schema; | ||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| const schemaType = this.schemaTypes[i]; | ||
| if (schemaType.schema && schemaType.schema === subdocSchema) { | ||
| return schemaType.doValidate(value, fn, scope, options); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // For non-subdoc values, try to cast with each schema type to determine which one to validate with | ||
| let schemaTypeToValidate = null; | ||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| try { | ||
| this.schemaTypes[i].cast(value); | ||
|
||
| schemaTypeToValidate = this.schemaTypes[i]; | ||
| break; | ||
| } catch (err) { | ||
| // Continue trying other schema types | ||
| } | ||
| } | ||
|
|
||
| if (schemaTypeToValidate) { | ||
| return schemaTypeToValidate.doValidate(value, fn, scope, options); | ||
| } | ||
|
|
||
| // Fallback: try all and return first success | ||
| const validationErrors = []; | ||
| let callbackCalled = false; | ||
| let completed = 0; | ||
|
|
||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| const schemaType = this.schemaTypes[i]; | ||
|
|
||
| schemaType.doValidate(value, (err) => { | ||
| if (callbackCalled) { | ||
| return; | ||
| } | ||
|
|
||
| completed++; | ||
|
|
||
| if (!err) { | ||
| callbackCalled = true; | ||
| return fn(null); | ||
| } | ||
|
|
||
| validationErrors.push(err); | ||
|
|
||
| if (completed === this.schemaTypes.length) { | ||
| callbackCalled = true; | ||
| return fn(validationErrors[0]); | ||
| } | ||
| }, scope, options); | ||
| } | ||
| }.bind(this), scope, options); | ||
| } | ||
|
|
||
| /** | ||
| * Synchronously validates the value against all schema types in the union. | ||
| * The value must successfully validate against at least one schema type. | ||
| * | ||
| * @api private | ||
| */ | ||
| doValidateSync(value, scope, options) { | ||
| if (!options || !options.skipSchemaValidators) { | ||
| const schemaTypeError = SchemaType.prototype.doValidateSync.call(this, value, scope); | ||
| if (schemaTypeError) { | ||
| return schemaTypeError; | ||
| } | ||
| } | ||
|
|
||
| if (value == null) { | ||
| return; | ||
| } | ||
|
|
||
| // Check if we stored which schema type was used during casting | ||
| if (value && value.$__ && value.$__[castSchemaTypeSymbol]) { | ||
| const schemaType = value.$__[castSchemaTypeSymbol]; | ||
| return schemaType.doValidateSync(value, scope, options); | ||
| } | ||
|
|
||
| if (value && value.schema && value.$__) { | ||
| const subdocSchema = value.schema; | ||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| const schemaType = this.schemaTypes[i]; | ||
| if (schemaType.schema && schemaType.schema === subdocSchema) { | ||
| return schemaType.doValidateSync(value, scope, options); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // For non-subdoc values, try to cast with each schema type to determine which one to validate with | ||
| let schemaTypeToValidate = null; | ||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| try { | ||
| this.schemaTypes[i].cast(value); | ||
| schemaTypeToValidate = this.schemaTypes[i]; | ||
| break; | ||
| } catch (err) { | ||
| // Continue trying other schema types | ||
| } | ||
| } | ||
|
|
||
| if (schemaTypeToValidate) { | ||
| return schemaTypeToValidate.doValidateSync(value, scope, options); | ||
| } | ||
|
|
||
| // Fallback: try all and return first success | ||
| const validationErrors = []; | ||
|
|
||
| for (let i = 0; i < this.schemaTypes.length; ++i) { | ||
| const schemaType = this.schemaTypes[i]; | ||
|
|
||
| const err = schemaType.doValidateSync(value, scope, options); | ||
| if (!err) { | ||
| return null; | ||
| } | ||
|
|
||
| validationErrors.push(err); | ||
| } | ||
|
|
||
| return validationErrors[0]; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Going for a best match scoring is a bit overkill IMO, this sort of pattern will be difficult to explain and document. I would prefer to keep more of a "first entry in the union that matches" approach.