From 8e586f32c88b2c665b44f5cf38ed9ac39b3b6cae Mon Sep 17 00:00:00 2001 From: bcoe Date: Thu, 8 Oct 2020 14:23:03 -0700 Subject: [PATCH] fix(v8-to-istanbul): revert off by one that broke TypeScript --- package-lock.json | 6 ++--- package.json | 2 +- test/integration.js.snap | 48 ++++++++++++++++++------------------- test/integration.js_10.snap | 26 ++++++++++---------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index f218edba..09e2ca38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2951,9 +2951,9 @@ "dev": true }, "v8-to-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.0.tgz", - "integrity": "sha512-o01hYXgLQVFfF1QOo7LeSqxC6J2BdnVS+dT6YGrKFMouLtLS7UTrjWVqYgkeef/iTpovP1WHyeDq0lRuLCEyIg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz", + "integrity": "sha512-PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w==", "requires": { "@types/istanbul-lib-coverage": "^2.0.1", "convert-source-map": "^1.6.0", diff --git a/package.json b/package.json index 829a898f..0e20db11 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "istanbul-reports": "^3.0.2", "rimraf": "^3.0.0", "test-exclude": "^6.0.0", - "v8-to-istanbul": "^6.0.0", + "v8-to-istanbul": "^6.0.1", "yargs": "^16.0.0", "yargs-parser": "^20.0.0" }, diff --git a/test/integration.js.snap b/test/integration.js.snap index 65021e7e..57203112 100644 --- a/test/integration.js.snap +++ b/test/integration.js.snap @@ -4,8 +4,8 @@ exports[`c8 /* c8 ignore next */ does not incorrectly mark previous branch as un ",--------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s --------------|---------|----------|---------|---------|------------------- -All files | 100 | 100 | 100 | 100 | - issue-254.js | 100 | 100 | 100 | 100 | +All files | 100 | 66.67 | 100 | 100 | + issue-254.js | 100 | 66.67 | 100 | 100 | 2 --------------|---------|----------|---------|---------|------------------- ," `; @@ -48,9 +48,9 @@ negative -----------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -----------------|---------|----------|---------|---------|------------------- -All files | 64.29 | 57.14 | 50 | 64.29 | - ts-compiled | 78.26 | 66.67 | 100 | 78.26 | - loaded.ts | 73.68 | 66.67 | 100 | 73.68 | 4-5,16-18 +All files | 64.29 | 66.67 | 50 | 64.29 | + ts-compiled | 78.26 | 75 | 100 | 78.26 | + loaded.ts | 73.68 | 71.43 | 100 | 73.68 | 4-5,16-18 main.ts | 100 | 100 | 100 | 100 | ts-compiled/dir | 0 | 0 | 0 | 0 | unloaded.ts | 0 | 0 | 0 | 0 | 1-5 @@ -65,9 +65,9 @@ negative --------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s --------------|---------|----------|---------|---------|------------------- -All files | 64.29 | 57.14 | 50 | 64.29 | - ts-only | 78.26 | 66.67 | 100 | 78.26 | - loaded.ts | 73.68 | 66.67 | 100 | 73.68 | 4-5,16-18 +All files | 64.29 | 66.67 | 50 | 64.29 | + ts-only | 78.26 | 75 | 100 | 78.26 | + loaded.ts | 73.68 | 71.43 | 100 | 73.68 | 4-5,16-18 main.ts | 100 | 100 | 100 | 100 | ts-only/dir | 0 | 0 | 0 | 0 | unloaded.ts | 0 | 0 | 0 | 0 | 1-5 @@ -336,8 +336,8 @@ a = false ------------------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------------------|---------|----------|---------|---------|------------------- -All files | 84 | 50 | 100 | 84 | - branches.typescript.ts | 84 | 50 | 100 | 84 | 7,11-12,18 +All files | 84 | 57.14 | 100 | 84 | + branches.typescript.ts | 84 | 57.14 | 100 | 84 | 7,11-12,18 ------------------------|---------|----------|---------|---------|------------------- ," `; @@ -351,8 +351,8 @@ covered -----------------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -----------------------|---------|----------|---------|---------|------------------- -All files | 81.82 | 85.71 | 60 | 81.82 | - classes.typescript.ts | 81.82 | 85.71 | 60 | 81.82 | 12-13,21-22,27-28 +All files | 81.82 | 87.5 | 60 | 81.82 | + classes.typescript.ts | 81.82 | 87.5 | 60 | 81.82 | 12-13,21-22,27-28 -----------------------|---------|----------|---------|---------|------------------- ," `; @@ -364,8 +364,8 @@ a = false -------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -------------|---------|----------|---------|---------|------------------- -All files | 80 | 40 | 100 | 80 | - branches.js | 80 | 40 | 100 | 80 | 2,5-6,13 +All files | 80 | 50 | 100 | 80 | + branches.js | 80 | 50 | 100 | 80 | 2,5-6,13 -------------|---------|----------|---------|---------|------------------- ," `; @@ -379,8 +379,8 @@ covered ------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------|---------|----------|---------|---------|------------------- -All files | 85.19 | 80 | 60 | 85.19 | - classes.js | 85.19 | 80 | 60 | 85.19 | 6-7,15,21 +All files | 85.19 | 83.33 | 60 | 85.19 | + classes.js | 85.19 | 83.33 | 60 | 85.19 | 6-7,15,21 ------------|---------|----------|---------|---------|------------------- ," `; @@ -402,8 +402,8 @@ a = false -------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -------------|---------|----------|---------|---------|------------------- -All files | 80 | 40 | 100 | 80 | - branches.js | 80 | 40 | 100 | 80 | 2,6-7,13 +All files | 80 | 55.56 | 100 | 80 | + branches.js | 80 | 55.56 | 100 | 80 | 2,6-7,13 -------------|---------|----------|---------|---------|------------------- ," `; @@ -417,8 +417,8 @@ covered ------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------|---------|----------|---------|---------|------------------- -All files | 77.78 | 83.33 | 60 | 77.78 | - classes.js | 77.78 | 83.33 | 60 | 77.78 | 7-8,15-16,21-22 +All files | 77.78 | 80 | 71.43 | 77.78 | + classes.js | 77.78 | 80 | 71.43 | 77.78 | 7-8,15-16,21-22 ------------|---------|----------|---------|---------|------------------- ," `; @@ -446,9 +446,9 @@ covered ------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------|---------|----------|---------|---------|------------------- -All files | 78.57 | 83.33 | 60 | 78.57 | +All files | 78.57 | 85.71 | 60 | 78.57 | class-1.js | 100 | 100 | 100 | 100 | - class-2.js | 73.91 | 83.33 | 60 | 73.91 | 7-8,15-16,21-22 + class-2.js | 73.91 | 85.71 | 60 | 73.91 | 7-8,15-16,21-22 ------------|---------|----------|---------|---------|------------------- ," `; @@ -462,8 +462,8 @@ covered ------------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------------|---------|----------|---------|---------|------------------- -All files | 88.24 | 85.71 | 80 | 88.24 | - ts-node-basic.ts | 88.24 | 85.71 | 80 | 88.24 | 12-13,28-29 +All files | 88.24 | 87.5 | 80 | 88.24 | + ts-node-basic.ts | 88.24 | 87.5 | 80 | 88.24 | 12-13,28-29 ------------------|---------|----------|---------|---------|------------------- ," `; diff --git a/test/integration.js_10.snap b/test/integration.js_10.snap index a8fd4723..c35e9e02 100644 --- a/test/integration.js_10.snap +++ b/test/integration.js_10.snap @@ -4,8 +4,8 @@ exports[`c8 /* c8 ignore next */ does not incorrectly mark previous branch as un ",--------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s --------------|---------|----------|---------|---------|------------------- -All files | 100 | 100 | 100 | 100 | - issue-254.js | 100 | 100 | 100 | 100 | +All files | 100 | 66.67 | 100 | 100 | + issue-254.js | 100 | 66.67 | 100 | 100 | 2 --------------|---------|----------|---------|---------|------------------- ," `; @@ -59,9 +59,9 @@ negative -----------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -----------------|---------|----------|---------|---------|------------------- -All files | 64.29 | 57.14 | 50 | 64.29 | - ts-compiled | 78.26 | 66.67 | 100 | 78.26 | - loaded.ts | 73.68 | 66.67 | 100 | 73.68 | 4-5,16-18 +All files | 64.29 | 66.67 | 50 | 64.29 | + ts-compiled | 78.26 | 75 | 100 | 78.26 | + loaded.ts | 73.68 | 71.43 | 100 | 73.68 | 4-5,16-18 main.ts | 100 | 100 | 100 | 100 | ts-compiled/dir | 0 | 0 | 0 | 0 | unloaded.ts | 0 | 0 | 0 | 0 | 1-5 @@ -404,8 +404,8 @@ covered -----------------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -----------------------|---------|----------|---------|---------|------------------- -All files | 81.82 | 85.71 | 60 | 81.82 | - classes.typescript.ts | 81.82 | 85.71 | 60 | 81.82 | 12-13,21-22,27-28 +All files | 81.82 | 87.5 | 60 | 81.82 | + classes.typescript.ts | 81.82 | 87.5 | 60 | 81.82 | 12-13,21-22,27-28 -----------------------|---------|----------|---------|---------|------------------- ," `; @@ -455,8 +455,8 @@ a = false -------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s -------------|---------|----------|---------|---------|------------------- -All files | 80 | 40 | 100 | 80 | - branches.js | 80 | 40 | 100 | 80 | 2,6-7,13 +All files | 80 | 55.56 | 100 | 80 | + branches.js | 80 | 55.56 | 100 | 80 | 2,6-7,13 -------------|---------|----------|---------|---------|------------------- ," `; @@ -470,8 +470,8 @@ covered ------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------|---------|----------|---------|---------|------------------- -All files | 77.78 | 83.33 | 60 | 77.78 | - classes.js | 77.78 | 83.33 | 60 | 77.78 | 7-8,15-16,21-22 +All files | 77.78 | 80 | 71.43 | 77.78 | + classes.js | 77.78 | 80 | 71.43 | 77.78 | 7-8,15-16,21-22 ------------|---------|----------|---------|---------|------------------- ," `; @@ -499,9 +499,9 @@ covered ------------|---------|----------|---------|---------|------------------- File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s ------------|---------|----------|---------|---------|------------------- -All files | 78.57 | 83.33 | 60 | 78.57 | +All files | 78.57 | 85.71 | 60 | 78.57 | class-1.js | 100 | 100 | 100 | 100 | - class-2.js | 73.91 | 83.33 | 60 | 73.91 | 7-8,15-16,21-22 + class-2.js | 73.91 | 85.71 | 60 | 73.91 | 7-8,15-16,21-22 ------------|---------|----------|---------|---------|------------------- ," `;