Merge a390845 into 8a1d7f0

src/app-error.ts

@@ -105,7 +105,9 @@ Check that you are using the correct source map.`;
     case 'InvalidMappingColumn': {
       const { generatedLine, generatedColumn, maxColumn } = context;
 
-      return `Your source map refers to generated column ${generatedColumn} on line ${generatedLine}, but the source only contains ${maxColumn} column(s) on that line.
+      // Add 1 since generatedColumn os 0-based
+      return `Your source map refers to generated column ${generatedColumn +
+        1} on line ${generatedLine}, but the source only contains ${maxColumn} column(s) on that line.
 Check that you are using the correct source map.`;
     }
 

src/explore.ts

@@ -176,24 +176,12 @@ function computeFileSizes(
       });
     }
 
-    // Ignore mapping referencing EOL character (e.g. https://github.com/microsoft/TypeScript/issues/34695)
-    if (`${line}${eol}`.lastIndexOf(eol) === generatedColumn) {
-      return;
-    }
-
-    checkInvalidMappingColumn({
+    // TODO: uncomment when https://github.com/danvk/source-map-explorer/issues/136 is fixed
+    /* checkInvalidMappingColumn({
       generatedLine,
-      generatedColumn,
+      generatedColumn: lastGeneratedColumn || generatedColumn,
       line,
-    });
-
-    if (lastGeneratedColumn !== null) {
-      checkInvalidMappingColumn({
-        generatedLine,
-        generatedColumn: lastGeneratedColumn,
-        line,
-      });
-    }
+    }); */
 
     const start = generatedColumn;
     const end = lastGeneratedColumn === null ? line.length - 1 : lastGeneratedColumn;
@@ -212,9 +200,7 @@ function computeFileSizes(
   let files: FileDataMap = {};
   let mappedBytes = 0;
 
-  const getSize = options.gzip
-    ? (string: string) => gzipSize.sync(string)
-    : (string: string) => Buffer.byteLength(string);
+  const getSize = options.gzip ? gzipSize.sync : Buffer.byteLength;
 
   mappingRanges.forEach((lineRanges, lineIndex) => {
     const line = lines[lineIndex];

tests/api.test.ts

@@ -200,11 +200,12 @@ describe('api', () => {
           bundlesAndFileTokens: { code: 'data/no-map.js' },
           expectedErrorCode: 'NoSourceMap',
         },
-        {
+        // TODO: Uncomment when #136 is fixed
+        /* {
           name: 'should throw if source map reference column beyond generated last column in line',
           bundlesAndFileTokens: 'data/invalid-map-column.js',
           expectedErrorCode: 'InvalidMappingColumn',
-        },
+        }, */
         {
           name: 'should throw if source map reference more lines than available in source',
           bundlesAndFileTokens: 'data/invalid-map-line.js',
@@ -231,7 +232,7 @@ describe('api', () => {
         {
           name: 'should throw when cannot save html to file',
           bundlesAndFileTokens: 'data/inline-map.js',
-          // `/` supposed to be invalid filename on both Linux and Windows
+          // `/` is supposed to be invalid filename on both Linux and Windows
           options: { output: { format: 'html', filename: '/' } },
           expectedErrorCode: 'CannotSaveFile',
         },
@@ -246,10 +247,16 @@ describe('api', () => {
       });
 
       it('should not throw if at least one result is successful', async () => {
-        const result = await explore(['data/foo.min.js', 'data/no-map.js']);
+        await expect(explore(['data/foo.min.js', 'data/no-map.js'])).to.not.be.rejected.then(
+          result => {
+            expect(result.bundles.length).to.eq(1);
+            expect(result.errors.length).to.eq(2);
+          }
+        );
+      });
 
-        expect(result.bundles.length).to.eq(1);
-        expect(result.errors.length).to.eq(2);
+      it('should not throw when analyzing source map referencing eol', async () => {
+        await expect(explore('data/map-reference-eol.js')).to.not.be.rejected;
       });
 
       it('should add "one source" source map warning when exploring single bundle', async () => {

tests/app-error.test.ts

@@ -13,7 +13,7 @@ describe('app-error', () => {
       {
         code: 'InvalidMappingColumn',
         generatedLine: 60,
-        generatedColumn: 81,
+        generatedColumn: 80,
         maxColumn: 80,
       },
       { code: 'CannotSaveFile' },

tests/cli.test.ts

@@ -68,14 +68,14 @@ describe('CLI', () => {
   it('should output multiple results as tsv', async () => {
     const result = await execute(SCRIPT_PATH, [
       'data/inline-map.js',
-      'data/map-reference-eol.js',
+      'data/one-source.js',
       '--tsv',
     ]);
 
     expect(result)
       .to.have.string('Source\tSize')
       .and.have.string('src/bar.js\t104')
-      .and.have.string('../generate-data/src/typescript.ts\t52');
+      .and.have.string('src/bar.js\t55');
   });
 
   it('should output result as html', async () => {

tests/generate-data/build.js

@@ -0,0 +1,47 @@
+const generate = require('generate-source-map');
+const convert = require('convert-source-map');
+const fs = require('fs');
+const path = require('path');
+
+const EOL = `\n`;
+
+const destinationDirectory = path.resolve(__dirname, '../data');
+
+function getSourceMapComment(source, sourceFile) {
+  const map = generate({ source, sourceFile });
+
+  return convert.fromJSON(map.toString()).toComment();
+}
+
+function getFileContent(file) {
+  return fs.readFileSync(file).toString();
+}
+
+function generateInvalidSourceMapLine() {
+  const filename = 'invalid-map-line.js';
+
+  const source = getFileContent('./src/invalid-map-line.1.js');
+  const invalidSource = getFileContent('./src/invalid-map-line.2.js');
+
+  const sourceMapComment = getSourceMapComment(source, filename);
+
+  const content = `${invalidSource}${EOL}${sourceMapComment}`;
+
+  fs.writeFileSync(path.join(destinationDirectory, filename), content);
+}
+
+function generateInvalidMapColumn() {
+  const filename = 'invalid-map-column.js';
+
+  const source = getFileContent('./src/invalid-map-column.1.js');
+  const invalidSource = getFileContent('./src/invalid-map-column.2.js');
+
+  const sourceMapComment = getSourceMapComment(source, filename);
+
+  const content = `${invalidSource}${EOL}${sourceMapComment}`;
+
+  fs.writeFileSync(path.join(destinationDirectory, filename), content);
+}
+
+generateInvalidSourceMapLine();
+generateInvalidMapColumn();

tests/generate-data/package.json

@@ -5,6 +5,8 @@
     "@babel/preset-env": "7.7.1",
     "babelify": "10.0.0",
     "browserify": "16.5.0",
+    "convert-source-map": "^1.7.0",
+    "generate-source-map": "0.0.5",
     "npm-run-all": "^4.1.5",
     "terser": "4.4.0",
     "typescript": "3.7.2"
@@ -18,6 +20,7 @@
     "minify:no-comment": "terser dist/foo.js -c --source-map \"content=inline\" -o ../data/no-map.js",
     "minify:one-source": "terser src/bar.js -b \"indent_level=2\"  --source-map \"url=inline\" -o ../data/one-source.js",
     "minify:typescript": "tsc --inlineSourceMap --removeComments src/typescript.ts --outFile ../data/map-reference-eol.js",
+    "minify:other": "node build.js",
     "build-all": "npm run build && npm-run-all minify:*"
   }
 }

tests/generate-data/src/invalid-map-column.1.js

@@ -0,0 +1 @@
+console.log('goodbye cruel world');

tests/generate-data/src/invalid-map-column.2.js

@@ -0,0 +1 @@
+console.log('hello joyful world');

tests/generate-data/src/invalid-map-line.1.js

@@ -0,0 +1,2 @@
+console.log('hello happy world');
+console.log('hello man');

tests/generate-data/src/invalid-map-line.2.js

@@ -0,0 +1 @@
+console.log('hello happy world');