Merge branch 'release/2.5.2' of github.com:wearebraid/vue-formulate i…

…nto release/2.5.2

package.json

@@ -17,7 +17,7 @@
     "build:umd": "rollup --config build/rollup.config.js --format umd --file dist/formulate.umd.js",
     "build:iife": "rollup --config build/rollup.iife.config.js --format iife --file dist/formulate.min.js",
     "build:css": "node-sass themes/snow/snow.scss dist/snow.css && postcss --use autoprefixer -b '> 2%' < dist/snow.css | postcss --no-map --use cssnano > dist/snow.min.css",
-    "test": "NODE_ENV=test jest --config test/jest.conf.js --coverage",
+    "test": "cross-env NODE_ENV=test jest --config test/jest.conf.js --coverage",
     "test:watch": "NODE_ENV=test jest --config test/jest.conf.js --watch",
     "test:coverage": "NODE_ENV=test jest --config test/jest.conf.js --coverage",
     "cypress": "cypress open",
@@ -59,6 +59,7 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^25.5.1",
+    "cross-env": "^7.0.3",
     "cssnano": "^4.1.10",
     "cypress": "^6.0.1",
     "cypress-file-upload": "^4.1.1",

src/libs/rules.js

@@ -237,21 +237,18 @@ export default {
   },
 
   /**
-   * Rule: must be a value
+   * Rule: must be a value - allows for an optional argument "whitespace" with a possible value 'trim' and default 'pre'.
    */
-  required: function ({ value }, isRequired = true) {
+  required: function ({ value }, whitespace = 'pre') {
     return Promise.resolve((() => {
-      if (!isRequired || ['no', 'false'].includes(isRequired)) {
-        return true
-      }
       if (Array.isArray(value)) {
         return !!value.length
       }
       if (value instanceof FileUpload) {
         return value.getFiles().length > 0
       }
       if (typeof value === 'string') {
-        return !!value
+        return whitespace === 'trim' ? !!value.trim() : !!value
       }
       if (typeof value === 'object') {
         return (!value) ? false : !!Object.keys(value).length

test/unit/rules.test.js

@@ -448,12 +448,18 @@ describe('number', () => {
 describe('required', () => {
   it('fails on empty string', async () => expect(await rules.required({ value: '' })).toBe(false))
 
+  it('fails with only whitespace as value when second argument is "trim"', async () => expect(await rules.required({ value: ' ' }, 'trim')).toBe(false))
+
   it('fails on empty array', async () => expect(await rules.required({ value: [] })).toBe(false))
 
   it('fails on empty object', async () => expect(await rules.required({ value: {} })).toBe(false))
 
   it('fails on null', async () => expect(await rules.required({ value: null })).toBe(false))
 
+  it('passes with only whitespace as value', async () => expect(await rules.required({ value: ' ' })).toBe(true))
+
+  it('passes with only whitespace as value when second argument is not "trim"', async () => expect(await rules.required({ value: ' ' }, 'pre')).toBe(true))
+
   it('passes with the number zero', async () => expect(await rules.required({ value: 0 })).toBe(true))
 
   it('passes with the boolean false', async () => expect(await rules.required({ value: false })).toBe(true))
@@ -462,10 +468,6 @@ describe('required', () => {
 
   it('passes with a non empty object', async () => expect(await rules.required({ value: { a: 'b' } })).toBe(true))
 
-  it('passes with empty value if second argument is false', async () => expect(await rules.required({ value: '' }, false)).toBe(true))
-
-  it('passes with empty value if second argument is false string', async () => expect(await rules.required({ value: '' }, 'false')).toBe(true))
-
   it('passes with FileUpload', async () => expect(await rules.required({ value: new FileUpload({ files: [{ name: 'j.png' }] }) })).toBe(true))
 
   it('fails with empty FileUpload', async () => expect(await rules.required({ value: new FileUpload({ files: [] }) })).toBe(false))