fix onEmtry hook #72

lib/v8/v8.js

@@ -107,15 +107,6 @@ const initV8ListAndSourcemap = async (mcr, v8list) => {
         // console.log(entry);
     });
 
-    // onEntry hook
-    // after filter but before init, because id depends source and sourcePath
-    const onEntry = options.onEntry;
-    if (typeof onEntry === 'function') {
-        for (const entry of v8list) {
-            await onEntry(entry);
-        }
-    }
-
     const sourcePathReplacer = getSourcePathReplacer(options);
 
     const baseDir = options.baseDir;
@@ -231,6 +222,17 @@ const mergeJsFunctions = (itemList) => {
     });
 };
 
+const onEntryHandler = async (entry, options) => {
+
+    // onEntry hook
+    // after filter but before init, because id depends source and sourcePath
+    const onEntry = options.onEntry;
+    if (typeof onEntry === 'function') {
+        await onEntry(entry);
+    }
+
+};
+
 const mergeV8Coverage = async (dataList, sourceCache, options) => {
 
     let allList = [];
@@ -270,29 +272,39 @@ const mergeV8Coverage = async (dataList, sourceCache, options) => {
         }
     }
 
-    // first time filter for empty, (not for sources)
-    // empty and not in item map
-    const emptyList = allList.filter((it) => it.empty).filter((it) => !itemMap[it.id]);
+    const coverageMergedList = Object.values(itemMap);
+
+    // first time filter for empty (not for sources)
+    // empty and not in itemMap
+    // is empty but not source, means id is not right (without source)
+    // filter with sourcePath
+    const emptyList = allList.filter((it) => it.empty).filter((it) => {
+        return !coverageMergedList.find((m) => m.sourcePath === it.sourcePath);
+    });
+
+    // console.log(emptyList);
 
     // empty list + merged list
-    const mergedList = emptyList.concat(Object.values(itemMap));
+    const mergedList = emptyList.concat(coverageMergedList);
 
     // try to load coverage and source by id
     for (const item of mergedList) {
-        const {
-            id, type, empty
-        } = item;
+        const { id, type } = item;
         const json = sourceCache.get(id);
         if (json) {
             item.source = json.source;
             item.sourceMap = json.sourceMap;
-        } else {
-            Util.logError(`Not found source data: ${Util.relativePath(item.sourcePath)}`);
-            item.source = '';
         }
 
+        // before item.source.length to update source and sourceMap
+        await onEntryHandler(item, options);
+
         // add empty coverage after merged
-        if (empty) {
+        if (item.empty) {
+
+            // update id for empty
+            // item.id = Util.calculateSha1(item.sourcePath + item.source);
+
             if (type === 'js') {
                 item.functions = [{
                     functionName: '',

package.json

@@ -106,7 +106,7 @@
         "stylelint": "^16.9.0",
         "stylelint-config-plus": "^1.1.3",
         "supports-color": "^9.4.0",
-        "tsx": "^4.19.0",
+        "tsx": "^4.19.1",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",
         "ws": "^8.18.0"