New specs

specs/and.js

@@ -0,0 +1,7 @@
+const s = require('../lib/spec');
+const isPred = require('./pred');
+
+module.exports = {
+    args: s.star(isPred),
+    ret: s.isSpec
+};

specs/or.js

@@ -0,0 +1,9 @@
+const s = require('../lib/spec');
+const isPred = require('./pred');
+
+const {isString} = s.utils;
+
+module.exports = {
+    args: s.star(s.tuple(isString, isPred)),
+    ret: s.isSpec
+};

test/and.js

@@ -4,7 +4,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {idemPotent} = require('./utils');
+const {exerciseFunc, idemPotent} = require('./utils');
 
 const {isEven, isInteger, invalidString, unknownString} = s.utils;
 
@@ -29,6 +29,10 @@ describe('Test the and function', () => {
         expect(s.conform(s.and(s.cat('n1', isInteger), '::one-bigger'), [13])).to.eql({n1: 13});
     });
 
+    it('should allow zero predicates on any input', () => {
+        expect(s.isValid(s.and(), [])).to.be.true;
+    });
+
     it('should unform a conformed value', () => {
         expect(idemPotent('::even?', 42)).to.be.true;
     });
@@ -56,5 +60,9 @@ describe('Test the and function', () => {
     it('should implement describe', () => {
         expect(s.describe('::even?')).to.eql(['and', 'isInteger', 'isEven']);
     });
+
+    xit('should exercise the and spec', () => {
+        exerciseFunc(s.and, '../specs/and');
+    });
 });
 

test/or.js

@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {idemPotent} = require('./utils');
+const {exerciseFunc, idemPotent} = require('./utils');
 
 const {isInt, isInteger, isString, unknownString} = s.utils;
 
@@ -31,6 +31,10 @@ describe('Test the or function', () => {
         expect(s.conform('::name-or-id', 13)).to.eql([':id', 13]);
     });
 
+    it('should not allow zero predicates on any input', () => {
+        expect(s.isValid(s.or(), [])).to.be.false;
+    });
+
     it('should unform a conformed value', () => {
         expect(idemPotent('::name-or-id', 'abc')).to.be.true;
     });
@@ -69,4 +73,8 @@ describe('Test the or function', () => {
     it('should implement describe', () => {
         expect(s.describe('::name-or-id')).to.eql(['or', ':name', 'isString', ':id', 'isInt']);
     });
+
+    xit('should exercise the or spec', () => {
+        exerciseFunc(s.or, '../specs/or');
+    });
 });