-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into calendar-day-updates
- Loading branch information
Showing
15 changed files
with
462 additions
and
304 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@keystonejs/keystone': patch | ||
| --- | ||
|
|
||
| Refactored hook management into a separate module. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@keystonejs/keystone': patch | ||
| --- | ||
|
|
||
| Fixed a bug where `existingItem` had the wrong value in hooks during an `updateManyMutation`. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- | ||
| '@keystonejs/demo-project-meetup': patch | ||
| --- | ||
|
|
||
| Updated usage of Apollo based on Next.js [example](https://github.com/vercel/next.js/blob/canary/examples/with-apollo). | ||
|
|
||
| The **key changes** are: | ||
| - Less boilerplate code for setting/initializing Apollo Client | ||
| - Update home, events and about page to opt in for SSG | ||
| - Removed MyApp.getIntialProps as it will stop the [Auto Static optimization](https://nextjs.org/docs/api-reference/data-fetching/getInitialProps#caveats). | ||
| - Handle the authentication in client-side only. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@keystonejs/keystone': patch | ||
| --- | ||
|
|
||
| Factored out utility `List` functions into a separate module. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@keystonejs/keystone': patch | ||
| --- | ||
|
|
||
| Updated internal access control functions to directly accept access control definition. |
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| const { omitBy, arrayToObject } = require('@keystonejs/utils'); | ||
| const { mapToFields } = require('./utils'); | ||
| const { ValidationFailureError } = require('./graphqlErrors'); | ||
|
|
||
| class HookManager { | ||
| constructor({ fields, hooks, listKey }) { | ||
| this.fields = fields; | ||
| this.hooks = hooks; | ||
| this.listKey = listKey; | ||
| this.fieldsByPath = arrayToObject(this.fields, 'path'); | ||
| } | ||
|
|
||
| _fieldsFromObject(obj) { | ||
| return Object.keys(obj) | ||
| .map(fieldPath => this.fieldsByPath[fieldPath]) | ||
| .filter(field => field); | ||
| } | ||
|
|
||
| _throwValidationFailure({ errors, operation, originalInput }) { | ||
| throw new ValidationFailureError({ | ||
| data: { | ||
| messages: errors.map(e => e.msg), | ||
| errors: errors.map(e => e.data), | ||
| listKey: this.listKey, | ||
| operation, | ||
| }, | ||
| internalData: { errors: errors.map(e => e.internalData), data: originalInput }, | ||
| }); | ||
| } | ||
|
|
||
| async resolveInput({ resolvedData, existingItem, context, operation, originalInput }) { | ||
| const args = { resolvedData, existingItem, context, originalInput, operation }; | ||
|
|
||
| // First we run the field type hooks | ||
| // NOTE: resolveInput is run on _every_ field, regardless if it has a value | ||
| // passed in or not | ||
| resolvedData = await mapToFields(this.fields, field => field.resolveInput(args)); | ||
|
|
||
| // We then filter out the `undefined` results (they should return `null` or | ||
| // a value) | ||
| resolvedData = omitBy(resolvedData, key => typeof resolvedData[key] === 'undefined'); | ||
|
|
||
| // Run the schema-level field hooks, passing in the results from the field | ||
| // type hooks | ||
| resolvedData = { | ||
| ...resolvedData, | ||
| ...(await mapToFields( | ||
| this.fields.filter(field => field.hooks.resolveInput), | ||
| field => field.hooks.resolveInput({ ...args, resolvedData }) | ||
| )), | ||
| }; | ||
|
|
||
| // And filter out the `undefined`s again. | ||
| resolvedData = omitBy(resolvedData, key => typeof resolvedData[key] === 'undefined'); | ||
|
|
||
| if (this.hooks.resolveInput) { | ||
| // And run any list-level hook | ||
| resolvedData = await this.hooks.resolveInput({ ...args, resolvedData }); | ||
| if (typeof resolvedData !== 'object') { | ||
| throw new Error( | ||
| `Expected ${ | ||
| this.listKey | ||
| }.hooks.resolveInput() to return an object, but got a ${typeof resolvedData}: ${resolvedData}` | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // Finally returning the amalgamated result of all the hooks. | ||
| return resolvedData; | ||
| } | ||
|
|
||
| async validateInput({ resolvedData, existingItem, context, operation, originalInput }) { | ||
| const args = { resolvedData, existingItem, context, originalInput, operation }; | ||
| // Check for isRequired | ||
| const fieldValidationErrors = this.fields | ||
| .filter( | ||
| field => | ||
| field.isRequired && | ||
| !field.isRelationship && | ||
| ((operation === 'create' && | ||
| (resolvedData[field.path] === undefined || resolvedData[field.path] === null)) || | ||
| (operation === 'update' && | ||
| Object.prototype.hasOwnProperty.call(resolvedData, field.path) && | ||
| (resolvedData[field.path] === undefined || resolvedData[field.path] === null))) | ||
| ) | ||
| .map(f => ({ | ||
| msg: `Required field "${f.path}" is null or undefined.`, | ||
| data: { resolvedData, operation, originalInput }, | ||
| internalData: {}, | ||
| })); | ||
| if (fieldValidationErrors.length) { | ||
| this._throwValidationFailure({ errors: fieldValidationErrors, operation, originalInput }); | ||
| } | ||
|
|
||
| const fields = this._fieldsFromObject(resolvedData); | ||
| await this._validateHook({ args, fields, operation, hookName: 'validateInput' }); | ||
| } | ||
|
|
||
| async validateDelete({ existingItem, context, operation }) { | ||
| const args = { existingItem, context, operation }; | ||
| const fields = this.fields; | ||
| await this._validateHook({ args, fields, operation, hookName: 'validateDelete' }); | ||
| } | ||
|
|
||
| async _validateHook({ args, fields, operation, hookName }) { | ||
| const { originalInput } = args; | ||
| const fieldValidationErrors = []; | ||
| // FIXME: Can we do this in a way where we simply return validation errors instead? | ||
| args.addFieldValidationError = (msg, _data = {}, internalData = {}) => | ||
| fieldValidationErrors.push({ msg, data: _data, internalData }); | ||
| await mapToFields(fields, field => field[hookName](args)); | ||
| await mapToFields( | ||
| fields.filter(field => field.hooks[hookName]), | ||
| field => field.hooks[hookName](args) | ||
| ); | ||
| if (fieldValidationErrors.length) { | ||
| this._throwValidationFailure({ errors: fieldValidationErrors, operation, originalInput }); | ||
| } | ||
|
|
||
| if (this.hooks[hookName]) { | ||
| const listValidationErrors = []; | ||
| await this.hooks[hookName]({ | ||
| ...args, | ||
| addValidationError: (msg, _data = {}, internalData = {}) => | ||
| listValidationErrors.push({ msg, data: _data, internalData }), | ||
| }); | ||
| if (listValidationErrors.length) { | ||
| this._throwValidationFailure({ errors: listValidationErrors, operation, originalInput }); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| async beforeChange({ resolvedData, existingItem, context, operation, originalInput }) { | ||
| const args = { resolvedData, existingItem, context, originalInput, operation }; | ||
| await this._runHook({ args, fieldObject: resolvedData, hookName: 'beforeChange' }); | ||
| } | ||
|
|
||
| async beforeDelete({ existingItem, context, operation }) { | ||
| const args = { existingItem, context, operation }; | ||
| await this._runHook({ args, fieldObject: existingItem, hookName: 'beforeDelete' }); | ||
| } | ||
|
|
||
| async afterChange({ updatedItem, existingItem, context, operation, originalInput }) { | ||
| const args = { updatedItem, originalInput, existingItem, context, operation }; | ||
| await this._runHook({ args, fieldObject: updatedItem, hookName: 'afterChange' }); | ||
| } | ||
|
|
||
| async afterDelete({ existingItem, context, operation }) { | ||
| const args = { existingItem, context, operation }; | ||
| await this._runHook({ args, fieldObject: existingItem, hookName: 'afterDelete' }); | ||
| } | ||
|
|
||
| async _runHook({ args, fieldObject, hookName }) { | ||
| // Used to apply hooks that only produce side effects | ||
| const fields = this._fieldsFromObject(fieldObject); | ||
| await mapToFields(fields, field => field[hookName](args)); | ||
| await mapToFields( | ||
| fields.filter(field => field.hooks[hookName]), | ||
| field => field.hooks[hookName](args) | ||
| ); | ||
|
|
||
| if (this.hooks[hookName]) await this.hooks[hookName](args); | ||
| } | ||
| } | ||
|
|
||
| module.exports = { HookManager }; |
Oops, something went wrong.