diff --git a/README.md b/README.md index 235094d..21a9027 100644 --- a/README.md +++ b/README.md @@ -484,7 +484,7 @@ export default { In the message body, any text wrapped in single braces will be replaced with their appropriate values that were passed in as options to the validator. For example: ```js -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; // validators/custom.js export default function validateIsOne(options) { return (key, newValue, oldValue, changes, content) => { diff --git a/addon/utils/get-messages.js b/addon/utils/get-messages.js index 473ec4c..7c4281e 100644 --- a/addon/utils/get-messages.js +++ b/addon/utils/get-messages.js @@ -3,8 +3,10 @@ import { A as emberArray } from '@ember/array'; import { isPresent } from '@ember/utils'; import config from 'ember-get-config'; -import defaultMessages from 'ember-changeset-validations/utils/messages'; -import withDefaults from 'ember-changeset-validations/utils/with-defaults'; +import { + defaultMessages, + withDefaults, +} from 'ember-changeset-validations/utils'; const { keys } = Object; const moduleName = `${config.modulePrefix}/validations/messages`; diff --git a/addon/utils/index.js b/addon/utils/index.js new file mode 100644 index 0000000..61059c1 --- /dev/null +++ b/addon/utils/index.js @@ -0,0 +1,7 @@ +export { default as getMessages } from './get-messages'; +export { default as handleMultipleValidations } from './handle-multiple-validations'; +export { default as defaultMessages } from './messages'; +export { default as toDate } from './to-date'; +export { default as buildMessage } from './validation-errors'; +export { default as withDefaults } from './with-defaults'; +export { default as wrapInArray } from './wrap'; diff --git a/addon/utils/validation-errors.js b/addon/utils/validation-errors.js index 545f54c..1e1c71d 100644 --- a/addon/utils/validation-errors.js +++ b/addon/utils/validation-errors.js @@ -7,7 +7,7 @@ import { get } from '@ember/object'; import { assert } from '@ember/debug'; import config from 'ember-get-config'; -import getMessages from 'ember-changeset-validations/utils/get-messages'; +import { getMessages } from 'ember-changeset-validations/utils'; export default function buildMessage(key, result) { let returnsRaw = config['changeset-validations']?.rawOutput || false; diff --git a/addon/validators/confirmation.js b/addon/validators/confirmation.js index 10a4916..e0810bd 100644 --- a/addon/validators/confirmation.js +++ b/addon/validators/confirmation.js @@ -1,4 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import evValidateConfirmation from 'ember-validators/confirmation'; export default function validateConfirmation(options = {}) { diff --git a/addon/validators/date.js b/addon/validators/date.js index e8c843e..1e052b7 100644 --- a/addon/validators/date.js +++ b/addon/validators/date.js @@ -1,6 +1,8 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; -import withDefaults from 'ember-changeset-validations/utils/with-defaults'; -import toDate from 'ember-changeset-validations/utils/to-date'; +import { + buildMessage, + withDefaults, + toDate, +} from 'ember-changeset-validations/utils'; const errorFormat = 'MMM Do, YYYY'; diff --git a/addon/validators/exclusion.js b/addon/validators/exclusion.js index 8b6be40..0f8bfb1 100644 --- a/addon/validators/exclusion.js +++ b/addon/validators/exclusion.js @@ -1,4 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import evValidateExclusion from 'ember-validators/exclusion'; export default function validateExclusion(options = {}) { diff --git a/addon/validators/format.js b/addon/validators/format.js index 098f962..4e893b0 100644 --- a/addon/validators/format.js +++ b/addon/validators/format.js @@ -1,5 +1,5 @@ import { isEmpty } from '@ember/utils'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import evValidateFormat from 'ember-validators/format'; export default function validateFormat(options = {}) { diff --git a/addon/validators/inclusion.js b/addon/validators/inclusion.js index abf6918..8280139 100644 --- a/addon/validators/inclusion.js +++ b/addon/validators/inclusion.js @@ -1,4 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import evValidateInclusion from 'ember-validators/inclusion'; export default function validateInclusion(options = {}) { diff --git a/addon/validators/length.js b/addon/validators/length.js index f634d6e..5b2eb01 100644 --- a/addon/validators/length.js +++ b/addon/validators/length.js @@ -1,5 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; -import withDefaults from 'ember-changeset-validations/utils/with-defaults'; +import { buildMessage, withDefaults } from 'ember-changeset-validations/utils'; import evValidateLength from 'ember-validators/length'; export default function validateLength(options = {}) { diff --git a/addon/validators/number.js b/addon/validators/number.js index 6893050..7ac915d 100644 --- a/addon/validators/number.js +++ b/addon/validators/number.js @@ -1,5 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; -import withDefaults from 'ember-changeset-validations/utils/with-defaults'; +import { buildMessage, withDefaults } from 'ember-changeset-validations/utils'; import evValidateNumber from 'ember-validators/number'; export default function validateNumber(options = {}) { diff --git a/addon/validators/presence.js b/addon/validators/presence.js index 92a4ac1..2a68859 100644 --- a/addon/validators/presence.js +++ b/addon/validators/presence.js @@ -1,4 +1,4 @@ -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import evValidatePresence from 'ember-validators/presence'; import { get } from '@ember/object'; diff --git a/tests/unit/utils/get-messages-test.js b/tests/unit/utils/get-messages-test.js index 70a5467..dd603ae 100644 --- a/tests/unit/utils/get-messages-test.js +++ b/tests/unit/utils/get-messages-test.js @@ -1,5 +1,7 @@ -import getMessages from 'ember-changeset-validations/utils/get-messages'; -import defaultMessages from 'ember-changeset-validations/utils/messages'; +import { + getMessages, + defaultMessages, +} from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Utility | get messages', function () { diff --git a/tests/unit/utils/validation-errors-test.js b/tests/unit/utils/validation-errors-test.js index 3dad17b..c8d7f58 100644 --- a/tests/unit/utils/validation-errors-test.js +++ b/tests/unit/utils/validation-errors-test.js @@ -1,5 +1,4 @@ -import getMessages from 'ember-changeset-validations/utils/get-messages'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { getMessages, buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; import config from 'ember-get-config'; diff --git a/tests/unit/validators/confirmation-test.js b/tests/unit/validators/confirmation-test.js index d7e1745..f6b04ee 100644 --- a/tests/unit/validators/confirmation-test.js +++ b/tests/unit/validators/confirmation-test.js @@ -1,5 +1,5 @@ import validateConfirmation from 'ember-changeset-validations/validators/confirmation'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | confirmation', function () { diff --git a/tests/unit/validators/date-test.js b/tests/unit/validators/date-test.js index 49bf402..4e9fbc5 100644 --- a/tests/unit/validators/date-test.js +++ b/tests/unit/validators/date-test.js @@ -1,5 +1,5 @@ import validateDate from 'ember-changeset-validations/validators/date'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | date', function () { diff --git a/tests/unit/validators/exclusion-test.js b/tests/unit/validators/exclusion-test.js index c7fbe29..0090a1b 100644 --- a/tests/unit/validators/exclusion-test.js +++ b/tests/unit/validators/exclusion-test.js @@ -1,5 +1,5 @@ import validateExclusion from 'ember-changeset-validations/validators/exclusion'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | exclusion', function () { diff --git a/tests/unit/validators/format-test.js b/tests/unit/validators/format-test.js index 37ded8a..bf9835f 100644 --- a/tests/unit/validators/format-test.js +++ b/tests/unit/validators/format-test.js @@ -1,5 +1,5 @@ import validateFormat from 'ember-changeset-validations/validators/format'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | format', function () { diff --git a/tests/unit/validators/inclusion-test.js b/tests/unit/validators/inclusion-test.js index 1c8144a..9c58e4e 100644 --- a/tests/unit/validators/inclusion-test.js +++ b/tests/unit/validators/inclusion-test.js @@ -1,5 +1,5 @@ import validateInclusion from 'ember-changeset-validations/validators/inclusion'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | inclusion', function () { diff --git a/tests/unit/validators/length-test.js b/tests/unit/validators/length-test.js index 6bb2d92..e436e37 100644 --- a/tests/unit/validators/length-test.js +++ b/tests/unit/validators/length-test.js @@ -1,5 +1,5 @@ import validateLength from 'ember-changeset-validations/validators/length'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | length', function () { diff --git a/tests/unit/validators/number-test.js b/tests/unit/validators/number-test.js index b7b2094..da16125 100644 --- a/tests/unit/validators/number-test.js +++ b/tests/unit/validators/number-test.js @@ -1,5 +1,5 @@ import validateNumber from 'ember-changeset-validations/validators/number'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | number', function () { diff --git a/tests/unit/validators/presence-test.js b/tests/unit/validators/presence-test.js index 9f1d9a0..de2d99f 100644 --- a/tests/unit/validators/presence-test.js +++ b/tests/unit/validators/presence-test.js @@ -1,5 +1,5 @@ import validatePresence from 'ember-changeset-validations/validators/presence'; -import buildMessage from 'ember-changeset-validations/utils/validation-errors'; +import { buildMessage } from 'ember-changeset-validations/utils'; import { module, test } from 'qunit'; module('Unit | Validator | presence', function () {