More strict cleanupSource()

Agoric · Oct 1, 2019 · f26d939 · f26d939
1 parent 2d9cd98
commit f26d939
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/utilities.js b/src/utilities.js
@@ -30,7 +30,12 @@ export function assert(condition, message) {
 // Remove code modifications.
 export function cleanupSource(src) {
   // Restore eval which is modified by esm module.
-  src = src.replace(/\(0,[^)]+\)/g, '(0, eval)');
+  // (0, eval) => (0, _<something>.e)
+  src = src.replace(/\(0, _[^.]+\.e\)/g, '(0, eval)');
+
+  // Restore Reflect which is modified by esm module.
+  // Reflect => _<something>.e.Reflect
+  src = src.replace(/_[^.]+\.g\.Reflect/g, 'Reflect');
 
   // Remove code coverage which is injected by nyc module.
   src = src.replace(/cov_[^+]+\+\+[;,]/g, '');

diff --git a/test/module/utilities.js b/test/module/utilities.js
@@ -65,14 +65,18 @@ test('assert', t => {
 });
 
 test('cleanupSource', t => {
-  t.plan(2);
+  t.plan(3);
 
+  t.equal(
+    cleanupSource(`function() { return (0, _123.e)('true'); }`),
+    `function() { return (0, eval)('true'); }`
+  );
   t.equals(
+    cleanupSource(`function() { const { apply } = _123.g.Reflect; }`),
+    `function() { const { apply } = Reflect; }`
+  );
+  t.equal(
     cleanupSource(`function() { cov_2kmyol0g2w[0]++;return true; }`),
     'function() { return true; }'
   );
-  t.equals(
-    cleanupSource(`function() { return (0, _123)('true'); }`),
-    `function() { return (0, eval)('true'); }`
-  );
 });