Merge pull request #1099 from Agoric/mfig/source-map-lineno

Make output from bundleSource correspond to source map lines

Author: michaelfig

packages/agoric-cli/integration-tests/test-workflow.js

@@ -36,17 +36,32 @@ test('workflow', async t => {
     // Kill an entire process group.
     const pkill = (cp, signal = 'SIGINT') => process.kill(-cp.pid, signal);
 
+    function pspawnStdout(...args) {
+      let output = '';
+      const ps = pspawn(...args);
+      ps.cp.stdout.on('data', chunk => {
+        output += chunk.toString('utf-8');
+      });
+      ps.then(ret => {
+        if (ret !== 0) {
+          process.stdout.write(output);
+        }
+      });
+      return ps;
+    }
+
     // Run all main programs with the '--sdk' flag if we are in agoric-sdk.
     const extraArgs = fs.existsSync(`${__dirname}/../../cosmic-swingset`)
       ? ['--sdk']
       : [];
-    const myMain = args => {
+    function myMain(args) {
       // console.error('running agoric-cli', ...extraArgs, ...args);
-      return pspawn(`agoric`, [...extraArgs, ...args], {
+      return pspawnStdout(`agoric`, [...extraArgs, ...args], {
         stdio: ['ignore', 'pipe', 'inherit'],
+        env: { ...process.env, DEBUG: 'agoric' },
         detached: true,
       });
-    };
+    }
 
     const olddir = process.cwd();
     const { name, removeCallback } = tmp.dirSync({
@@ -150,7 +165,7 @@ test('workflow', async t => {
 
       // ==============
       // cd ui && yarn install
-      const instRet = await pspawn(`yarn`, ['install'], {
+      const instRet = await pspawnStdout(`yarn`, ['install'], {
         stdio: ['ignore', 'pipe', 'inherit'],
         cwd: 'ui',
         detached: true,

packages/bundle-source/package.json

@@ -24,7 +24,8 @@
     "@rollup/plugin-node-resolve": "^7.1.1",
     "acorn": "^7.1.0",
     "esm": "^3.2.5",
-    "rollup": "^1.32.0"
+    "rollup": "^1.32.0",
+    "source-map": "^0.7.3"
   },
   "keywords": [],
   "files": [

packages/bundle-source/src/index.js

@@ -5,6 +5,8 @@ import commonjs0 from '@rollup/plugin-commonjs';
 import eventualSend from '@agoric/acorn-eventual-send';
 import * as acorn from 'acorn';
 
+import { SourceMapConsumer } from 'source-map';
+
 const DEFAULT_MODULE_FORMAT = 'nestedEvaluate';
 const DEFAULT_FILE_PREFIX = '/bundled-source';
 const SUPPORTED_FORMATS = ['getExport', 'nestedEvaluate'];
@@ -55,11 +57,46 @@ export default async function bundleSource(
     if (isEntry) {
       entrypoint = fileName;
     }
+    let unmappedCode = code;
+    if (
+      moduleFormat === 'nestedEvaluate' &&
+      !fileName.startsWith('_virtual/')
+    ) {
+      unmappedCode = '';
+      // eslint-disable-next-line no-await-in-loop
+      const consumer = await new SourceMapConsumer(chunk.map);
+      const genLines = code.split('\n');
+      let lastLine = 1;
+      for (let genLine = 0; genLine < genLines.length; genLine += 1) {
+        const pos = consumer.originalPositionFor({
+          line: genLine + 1,
+          column: 0,
+        });
+        const { line: origLine } = pos;
+
+        const srcLine = origLine === null ? lastLine : origLine;
+        const priorChar = unmappedCode[unmappedCode.length - 1];
+        if (
+          srcLine === lastLine &&
+          !['\n', ';', '{', undefined].includes(priorChar) &&
+          !['}'].includes(genLines[genLine][0])
+        ) {
+          unmappedCode += `;`;
+        }
+        while (lastLine < srcLine) {
+          unmappedCode += `\n`;
+          lastLine += 1;
+        }
+        unmappedCode += genLines[genLine];
+      }
+    }
+
     // Rewrite apparent import expressions so that they don't fail under SES.
     // We also do apparent HTML comments.
-    const defangedCode = code
+    const defangedCode = unmappedCode
       .replace(IMPORT_RE, '$1notreally')
       .replace(HTML_COMMENT_RE, '<->');
+    // console.log(`<<<<<< ${fileName}\n${defangedCode}\n>>>>>>>>`);
     sourceBundle[fileName] = defangedCode;
   }
 
@@ -191,7 +228,7 @@ ${sourceMap}`;
         );
       }
 
-      // log('evaluating', typeof nestedEvaluate, code);
+      // log('evaluating', code);
       return nestedEvaluate(code)(contextRequire);
     }
 
@@ -212,7 +249,7 @@ function getExportWithNestedEvaluate(filePrefix) {
   ${computeExports}
 
   // Evaluate the entrypoint recursively.
-  return computeExports(entrypoint, { require, log(...args) { return console.log(...args); } });
+  return computeExports(entrypoint, { require });
 }
 ${sourceMap}`;
   }

packages/bundle-source/test/sanity.js

@@ -27,9 +27,10 @@ test('nestedEvaluate', async t => {
 
     const bundle = ex1.default();
     const err = bundle.makeError('foo');
+    // console.log(err.stack);
     t.assert(
-      err.stack.indexOf('(/bundled-source/encourage.js:') >= 0,
-      'bundled source is in stack trace',
+      err.stack.indexOf('(/bundled-source/encourage.js:3:') >= 0,
+      'bundled source is in stack trace with correct line number',
     );
 
     const {
@@ -94,7 +95,7 @@ test('getExport', async t => {
     const srcMap2 = `(${src2})\n${map2}`;
 
     const nestedEvaluate = src => {
-      // console.log('========== evaluating', src);
+      // console.log('========== evaluating', src, '\n=========');
       return evaluate(src, { require, nestedEvaluate });
     };
     // eslint-disable-next-line no-eval

packages/default-evaluate-options/package.json

@@ -2,11 +2,10 @@
   "name": "@agoric/default-evaluate-options",
   "version": "0.3.5",
   "description": "Agoric default evaluation options for Realms and SES",
-  "main": "dist/default-evaluate-options.cjs.js",
-  "module": "src/index.js",
-  "browser": "dist/default-evaluate-options.umd.js",
+  "main": "src/index.js",
   "scripts": {
-    "build": "rollup -c",
+    "build": "exit 0",
+    "build:rollup": "rollup -c",
     "test": "tape -r esm 'test/**/*.js'",
     "lint-fix": "eslint --fix '**/*.js'",
     "lint-check": "eslint '**/*.js'",

packages/evaluate/src/index.js

@@ -100,6 +100,8 @@ export const makeEvaluators = (makerOptions = {}) => {
       }
     })`;
 
+    // console.log('##### evaluate ######\n${src}\n###### end evaluate #####');
+
     // The eval below is indirect, so that we are only in the global scope.
     // eslint-disable-next-line no-eval
     return (1, eval)(scopedEval)(sourceState.endowments)(src);

packages/eventual-send/package.json

@@ -2,13 +2,11 @@
   "name": "@agoric/eventual-send",
   "version": "0.9.1",
   "description": "Extend a Promise class to implement the eventual-send API",
-  "main": "dist/eventual-send.cjs.js",
-  "module": "src/index.js",
-  "browser": "dist/eventual-send.umd.js",
+  "main": "src/index.js",
   "types": "src/index.d.ts",
   "scripts": {
     "test": "tape -r esm 'test/**/test*.js'",
-    "build": "rollup -c",
+    "build": "exit 0",
     "lint-fix": "eslint --fix '**/*.js'",
     "lint-check": "eslint '**/*.js'"
   },

packages/transform-eventual-send/package.json

@@ -2,14 +2,12 @@
   "name": "@agoric/transform-eventual-send",
   "version": "1.2.4",
   "description": "transform-eventual-send",
-  "main": "dist/transform-eventual-send.cjs.js",
-  "module": "src/index.js",
-  "browser": "dist/transform-eventual-send.umd.js",
+  "main": "src/index.js",
   "scripts": {
     "test": "tape -r esm 'test/**/*.js'",
     "lint-fix": "eslint --fix '**/*.js'",
     "lint-check": "eslint '**/*.js'",
-    "build": "node -r esm ./scripts/build-esend.js && rollup -c rollup.config.js"
+    "build": "node -r esm ./scripts/build-esend.js"
   },
   "devDependencies": {
     "@agoric/acorn-eventual-send": "^2.0.4",

packages/transform-eventual-send/src/index.js

@@ -64,7 +64,7 @@ function makeEventualSendTransformer(parser, generate) {
         plugins: ['eventualSend'],
       });
       // Create the source from the ast.
-      const output = generate(ast, {}, source);
+      const output = generate(ast, { retainLines: true }, source);
 
       // Work around Babel appending semicolons.
       const maybeSource = output.code;

packages/transform-metering/package.json

@@ -2,14 +2,12 @@
   "name": "@agoric/transform-metering",
   "version": "1.2.4",
   "description": "transform-metering",
-  "main": "dist/transform-metering.cjs.js",
-  "module": "src/index.js",
-  "browser": "dist/transform-metering.umd.js",
+  "main": "src/index.js",
   "scripts": {
     "test": "tape -r esm 'test/**/*.js'",
     "lint-fix": "eslint --fix '**/*.{js,jsx}'",
     "lint-check": "eslint '**/*.{js,jsx}'",
-    "build": "rollup -c rollup.config.js"
+    "build": "exit 0"
   },
   "devDependencies": {
     "@babel/core": "^7.5.0",

yarn.lock

@@ -13460,6 +13460,11 @@ source-map@^0.5.0, source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemap-codec@^1.4.4:
   version "1.4.6"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"