Fix electron modules handling

lahmatiy · Feb 21, 2024 · e377b97 · e377b97
1 parent cce59da
commit e377b97
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/app/prepare.js b/app/prepare.js
@@ -123,31 +123,23 @@ function resolveModuleRef(cache, cacheKey, scriptId, url, functionName) {
             entry.name = cache.anonymous.get(scriptId);
         }
     } else {
-        entry.protocol = (url.match(/^([a-z\-]+):/i) || [])[1] || '';
+        if (url.startsWith('node:electron/') || url.startsWith('electron/')) {
+            entry.protocol = 'electron';
+            url = url.slice(url.indexOf('/') + 1);
+        } else {
+            entry.protocol = (url.match(/^([a-z\-]+):/i) || [])[1] || '';
+        }
 
         if (entry.protocol.length === 1 && /[A-Z]/.test(entry.protocol)) {
             entry.protocol = '';
             url = url.slice(2).replace(/\\/g, '/');
         }
 
         switch (entry.protocol) {
-            case '': {
-                const prefix = (url.match(/^[^/]+(?=\/)/) || [])[0];
-
-                switch (url !== prefix && prefix) {
-                    // case 'blink':
-                    // case 'v8':
-                    case 'electron':
-                        entry.type = prefix;
-                        entry.path = url;
-                        break;
-
-                    default:
-                        entry.type = 'script';
-                        entry.path = 'file://' + url;
-                }
+            case '':
+                entry.type = 'script';
+                entry.path = 'file://' + url;
                 break;
-            }
 
             case 'file':
             case 'http':
@@ -169,6 +161,11 @@ function resolveModuleRef(cache, cacheKey, scriptId, url, functionName) {
                 entry.path = url;
                 break;
 
+            case 'electron':
+                entry.type = 'electron';
+                entry.path = url;
+                break;
+
             default:
                 entry.type = `protocol-${entry.protocol}`;
                 entry.name = url;
@@ -756,7 +753,7 @@ export default function(data, { rejectData, defineObjectMarker, addValueAnnotati
     data.functionTree = aggregateNodes(wellKnownNodes.root, functions, node => node.function);
 
     // build segments
-    data.naturalTree = buildSegments(data, nodeById, wellKnownNodes.gc);
+    // data.naturalTree = buildSegments(data, nodeById, wellKnownNodes.gc);
 
     // extend jora's queries with custom methods
     addQueryHelpers({