@teamscale/javascript-instrumenter 0.0.1-beta.50 → 0.0.1-beta.51

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/javascript-instrumenter",
-    "version": "0.0.1-beta.50",
+    "version": "0.0.1-beta.51",
     "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",

package/dist/src/instrumenter/Postprocessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Postprocessor.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Postprocessor.ts"],"names":[],"mappings":"AAGA,OAAO,EAQN,cAAc,EAWd,MAAM,cAAc,CAAC;AA0ItB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAaR"}
+{"version":3,"file":"Postprocessor.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/Postprocessor.ts"],"names":[],"mappings":"AAGA,OAAO,EAQN,cAAc,EASd,MAAM,cAAc,CAAC;AAqKtB;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,GAClD,MAAM,CAaR"}

package/dist/src/instrumenter/Postprocessor.js

@@ -10,6 +10,34 @@ const traverse_1 = __importDefault(require("@babel/traverse"));
 const types_1 = require("@babel/types");
 const commons_1 = require("@cqse/commons");
 const COVERAGE_OBJ_FUNCTION_NAME_PREFIX = 'cov_';
+/**
+ * Generator for identifiers that are unique across files to instrument.
+ * Relevant in case no Ecmascript modules are used.
+ *
+ * We assume that the files to be executed in a browser can
+ * stem from different runs of the instrumenter. We have to decrease
+ * the probability of colliding identifiers.
+ */
+const fileIdSeqGenerator = (() => {
+    const instrumenterRunId = process.pid;
+    let fileIdSeq = 0;
+    return {
+        next: () => {
+            fileIdSeq++;
+            let num;
+            if (fileIdSeq < 10000) {
+                num = instrumenterRunId * 10000 + fileIdSeq;
+            }
+            else if (fileIdSeq < 100000) {
+                num = instrumenterRunId * 100000 + fileIdSeq;
+            }
+            else {
+                throw new Error(`Not more that 100k files supported to be instrumented in one run.`);
+            }
+            return num.toString(36);
+        }
+    };
+})();
 function getIstanbulCoverageFunctionDeclarationName(node) {
     var _a;
     if (!(0, types_1.isFunctionDeclaration)(node)) {
@@ -25,7 +53,6 @@ function getIstanbulCoverageFunctionDeclarationName(node) {
 }
 function createFileIdMappingHandler() {
     const fileIdMap = new Map();
-    let fileIdSeq = 0;
     return {
         enterPath(path) {
             var _a;
@@ -40,7 +67,7 @@ function createFileIdMappingHandler() {
                     const declarator = declaration.declarations[0];
                     if ((0, types_1.isIdentifier)(declarator.id) && declarator.id.name === 'hash') {
                         // We take note of the hash that is stored within the `cov_*' function.
-                        const fileIdVarName = `_$fid${fileIdSeq++}`;
+                        const fileIdVarName = `_$f${fileIdSeqGenerator.next()}`;
                         const fileId = declarator.init.value;
                         fileIdMap.set(coverageFunctionName, fileIdVarName);
                         grandParentPath.insertBefore(newStringConstDeclarationNode(fileIdVarName, fileId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/javascript-instrumenter",
-  "version": "0.0.1-beta.50",
+  "version": "0.0.1-beta.51",
   "description": "JavaScript coverage instrumenter with coverage forwarding to a collector process",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",