Export everything from base file

README.md

@@ -120,7 +120,7 @@ npm install geneva@next
 You first need a code runner.
 
 ```javascript
-const Geneva = require('geneva');
+const { Geneva } = require('geneva');
 const geneva = new Geneva();
 ```
 

index.js

@@ -1,3 +1 @@
-var Geneva = require("./lib/base");
-
-module.exports = Geneva;
+module.exports = require("./lib/base");

lib/base.js

@@ -1,6 +1,6 @@
 const lodash = require('lodash');
 
-module.exports = class Geneva {
+class Geneva {
   constructor(options = {}) {
     this.initial = options.initial || {};
     this.forms = options.forms || {};
@@ -23,7 +23,6 @@ module.exports = class Geneva {
   }
 };
 
-
 class Runtime {
   constructor(scope, parser) {
     // Global scope for entire runtime
@@ -237,3 +236,12 @@ class Scope {
     this.refs[name] = value;
   }
 };
+
+module.exports = {
+  Geneva,
+  Runtime,
+  Scope,
+  Parser,
+  Form,
+  defaultForms
+}

test/test_defn.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -13,4 +13,4 @@ describe('Defn', () => {
     );
     expect(result).to.equal(16);
   });
-});
+});

test/test_eval.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -12,4 +12,4 @@ describe('Eval', () => {
       expect(result).to.deep.equal(3);
     });
   })
-});
+});

test/test_if.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -9,7 +9,7 @@ describe('Form: if', () => {
         const geneva = new Geneva();
         const result = geneva.run(['!if', false, 'success', 'fail']);
         expect(result).to.equal('fail');
-      }) ;
+      });
     });
   });
 
@@ -19,15 +19,15 @@ describe('Form: if', () => {
         const geneva = new Geneva();
         const result = geneva.run(['!if', true, 42]);
         expect(result).to.equal(42);
-      }) ;
+      });
     });
 
     context('when test is false', () => {
       it('returns the success value', () => {
         const geneva = new Geneva();
         const result = geneva.run(['!if', false, 42]);
         expect(result).to.equal(null);
-      }) ;
+      });
     });
   });
 });

test/test_initial_data.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 

test/test_lambda.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -17,7 +17,7 @@ describe('Lambda', () => {
   });
 
   context('global scope', () => {
-    context('when a variable is defined first', () =>{
+    context('when a variable is defined first', () => {
       it('should be accessible', () => {
         const geneva = new Geneva();
         const result = geneva.run(
@@ -31,7 +31,7 @@ describe('Lambda', () => {
       });
     });
 
-    context('when a variable is defined after', () =>{
+    context('when a variable is defined after', () => {
       it('should not be accessible', () => {
         const geneva = new Geneva();
         const runner = () => {
@@ -51,7 +51,7 @@ describe('Lambda', () => {
   context('when a more complex lambda is defined', () => {
     it('returns the correct value for nested calls', () => {
       const geneva = new Geneva();
-      const result = geneva.run( 
+      const result = geneva.run(
         ['!do',
           [['!lambda', [],
             [['!lambda', ['x'], '~x'], 42]]]]
@@ -61,7 +61,7 @@ describe('Lambda', () => {
 
     it('passes along scope to other functions', () => {
       const geneva = new Geneva();
-      const result = geneva.run( 
+      const result = geneva.run(
         ['!map', [1, 2, 3], ['!fn', ['n'],
           ['!multiply', '~n', 10]]]
       );
@@ -70,7 +70,7 @@ describe('Lambda', () => {
 
     it('returns handles scope correctly', () => {
       const geneva = new Geneva();
-      const result = geneva.run( 
+      const result = geneva.run(
         ['!do',
           ['!def', 'x', 42],
           // Define a nested lambda function
@@ -85,4 +85,4 @@ describe('Lambda', () => {
       expect(result).to.equal(42)
     });
   });
-});
+});

test/test_quote.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -10,4 +10,4 @@ describe('Quote', () => {
       expect(result).to.deep.equal(['!sum', [1, 2]]);
     });
   })
-});
+});

test/test_read_string.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 

test/test_ref.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -13,4 +13,4 @@ describe('References', () => {
       expect(result).to.equal(42);
     });
   });
-});
+});

test/test_run.js

@@ -1,4 +1,4 @@
-const Geneva = require('../lib/base');
+const { Geneva } = require('../lib/base');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -30,18 +30,18 @@ describe('Geneva', () => {
     context('when given a plain object', () => {
       it('returns the object', () => {
         const geneva = new Geneva();
-        const result = geneva.run({foo: 'bar'});
-        expect(result).to.deep.equal({foo: 'bar'});
+        const result = geneva.run({ foo: 'bar' });
+        expect(result).to.deep.equal({ foo: 'bar' });
       });
     });
 
 
     context('when given an object with code', () => {
       it('processes the code in the object', () => {
         const geneva = new Geneva();
-        const result = geneva.run({foo: ['!sum', [1, 3]]});
-        expect(result).to.deep.equal({foo: 4});
+        const result = geneva.run({ foo: ['!sum', [1, 3]] });
+        expect(result).to.deep.equal({ foo: 4 });
       });
     });
   });
-});
+});