Merge 058cf13 into 4d1ac3c

yiminghe · Aug 6, 2019 · 247e582 · 247e582
2 parents 4d1ac3c + 058cf13
commit 247e582
Show file tree

Hide file tree

Showing 2 changed files with 223 additions and 2 deletions.
diff --git a/__tests__/validator.spec.js b/__tests__/validator.spec.js
@@ -207,4 +207,215 @@ describe('validator', () => {
       );
     });
   });
+
+  describe('promise api', () => {
+    it('works', done => {
+      new Schema({
+        v: [
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e1'));
+            },
+          },
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e2'));
+            },
+          },
+        ],
+        v2: [
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e3'));
+            },
+          },
+        ],
+        v3: [
+          {
+            validator() {
+              return false;
+            },
+          },
+          {
+            validator() {
+              return new Error('e5');
+            },
+          },
+          {
+            validator() {
+              return false;
+            },
+            message: 'e6',
+          },
+          {
+            validator() {
+              return true;
+            },
+          },
+        ],
+      })
+        .validate({
+          v: 2,
+        })
+        .catch(({ errors }) => {
+          expect(errors.length).toBe(6);
+          expect(errors[0].message).toBe('e1');
+          expect(errors[1].message).toBe('e2');
+          expect(errors[2].message).toBe('e3');
+          expect(errors[3].message).toBe('v3 fails');
+          expect(errors[4].message).toBe('e5');
+          expect(errors[5].message).toBe('e6');
+          done();
+        });
+    });
+
+    it('first works', done => {
+      new Schema({
+        v: [
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e1'));
+            },
+          },
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e2'));
+            },
+          },
+        ],
+        v2: [
+          {
+            validator(rule, value, callback) {
+              callback(new Error('e3'));
+            },
+          },
+        ],
+      })
+        .validate(
+          {
+            v: 2,
+            v2: 1,
+          },
+          {
+            first: true,
+          },
+        )
+        .catch(({ errors }) => {
+          expect(errors.length).toBe(1);
+          expect(errors[0].message).toBe('e1');
+          done();
+        });
+    });
+
+    describe('firstFields', () => {
+      it('works for true', done => {
+        new Schema({
+          v: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e1'));
+              },
+            },
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e2'));
+              },
+            },
+          ],
+
+          v2: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e3'));
+              },
+            },
+          ],
+          v3: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e4'));
+              },
+            },
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e5'));
+              },
+            },
+          ],
+        })
+          .validate(
+            {
+              v: 1,
+              v2: 1,
+              v3: 1,
+            },
+            {
+              firstFields: true,
+            },
+          )
+          .catch(({ errors }) => {
+            expect(errors.length).toBe(3);
+            expect(errors[0].message).toBe('e1');
+            expect(errors[1].message).toBe('e3');
+            expect(errors[2].message).toBe('e4');
+            done();
+          });
+      });
+
+      it('works for array', done => {
+        new Schema({
+          v: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e1'));
+              },
+            },
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e2'));
+              },
+            },
+          ],
+
+          v2: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e3'));
+              },
+            },
+          ],
+          v3: [
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e4'));
+              },
+            },
+            {
+              validator(rule, value, callback) {
+                callback(new Error('e5'));
+              },
+            },
+          ],
+        })
+          .validate(
+            {
+              v: 1,
+              v2: 1,
+              v3: 1,
+            },
+            {
+              firstFields: ['v'],
+            },
+          )
+          .catch(({ errors }) => {
+            expect(errors.length).toBe(4);
+            expect(errors[0].message).toBe('e1');
+            expect(errors[1].message).toBe('e3');
+            expect(errors[2].message).toBe('e4');
+            expect(errors[3].message).toBe('e5');
+            done();
+          });
+      });
+    });
+  });
 });
diff --git a/src/util.js b/src/util.js
@@ -145,8 +145,18 @@ function flattenObjArr(objArr) {
 
 export function asyncMap(objArr, option, func, callback) {
   if (option.first) {
-    const flattenArr = flattenObjArr(objArr);
-    return asyncSerialArray(flattenArr, func, callback);
+    const pending = new Promise((resolve, reject) => {
+      const next = errors => {
+        callback(errors);
+        return errors.length
+          ? reject({ errors, fields: convertFieldsError(errors) })
+          : resolve();
+      };
+      const flattenArr = flattenObjArr(objArr);
+      asyncSerialArray(flattenArr, func, next);
+    });
+    pending.catch(e => e);
+    return pending;
   }
   let firstFields = option.firstFields || [];
   if (firstFields === true) {