Merge pull request #3 from Agoric/2-explicit-module-rewrites

require transforms to handle modules explicitly

src/index.js

@@ -41,11 +41,20 @@ export const makeEvaluators = (makerOptions = {}) => {
       staticOptions,
     );
 
+    const moduleOptions =
+      sourceType === 'module' ? { moduleRewritten: false } : {};
     const sourceState = fullTransforms.reduce(
       (ss, transform) => (transform.rewrite ? transform.rewrite(ss) : ss),
-      { ...staticOptions, src: source },
+      { ...staticOptions, ...moduleOptions, src: source },
     );
 
+    if (sourceType === 'module' && !sourceState.moduleRewritten) {
+      throw SyntaxError(`Module source was not explicitly rewritten`);
+    }
+    if (sourceType !== 'module' && sourceState.moduleRewritten) {
+      throw SyntaxError(`Non-module source was explicitly rewritten as module`);
+    }
+
     // Work around Babel appending semicolons.
     // TODO: This belongs only in the individual transforms.
     const maybeSource = sourceState.src;

test/test-evaluate.js

@@ -209,3 +209,59 @@ test('options.transforms', t => {
     t.end();
   }
 });
+
+test('evaluateModule needs explicit enabling', async t => {
+  try {
+    const {
+      evaluateModule: defaultModule,
+      evaluateProgram: defaultProgram,
+    } = makeEvaluators();
+
+    t.equal(defaultProgram('123; 456'), 456, 'default program works');
+    t.throws(
+      () => defaultModule('123; 456'),
+      SyntaxError,
+      'default module fails',
+    );
+
+    let rewriteAll = false;
+    const moduleTransform = {
+      rewrite(ss) {
+        if (rewriteAll || ss.sourceType === 'module') {
+          return {
+            ...ss,
+            src: 'Promise.resolve({default: 123})',
+            moduleRewritten: true,
+          };
+        }
+        return ss;
+      },
+    };
+
+    const {
+      evaluateModule: myModule,
+      evaluateProgram: myProgram,
+    } = makeEvaluators({
+      transforms: [moduleTransform],
+    });
+
+    t.equal(myProgram('123; 456'), 456, 'my program works');
+    t.deepEqual(
+      await myModule('export default 345;'),
+      { default: 123 },
+      'module rewrites',
+    );
+
+    rewriteAll = true;
+    t.throws(
+      () => myProgram('123; 456'),
+      SyntaxError,
+      'module rewrite in program context fails',
+    );
+  } catch (e) {
+    console.log('unexpected exception', e);
+    t.assert(false, e);
+  } finally {
+    t.end();
+  }
+});