All tests passing

TODO

@@ -4,7 +4,6 @@ Still to implement:
 - implement clojure.spec.test
   - instrument
   - ...
-- 'Real' parsing
 
 Other TODO:
 

lib/and.js

@@ -8,11 +8,11 @@ const describe = require('./util/describe');
 
 function and(...predicates) {
     return {
-        conform: value => {
+        conform: (value, unwrap) => {
             let allValid = true;
 
             const results = _.reduce(predicates, (result, p) => {
-                const val = conform(p, result);
+                const val = conform(p, result, unwrap);
 
                 allValid = allValid && (val !== invalidString);
 

test/star.js

@@ -11,11 +11,11 @@ const {isBoolean, isInteger, isOdd, isString} = s.utils;
 describe('Test the star (*) function', () => {
     s.def('::odd?', s.and(isInteger, isOdd));
     const odds = s.star('::odd?');
-    
-    xit('should return the value', () => {
+
+    it('should return the value', () => {
         expect(s.conform(odds, [1, 3])).to.eql([1, 3]);
     });
-    
+
     it('should accept an empty value sequence', () => {
         expect(s.conform(odds, [])).to.eql([]);
     });