up

src/Scanner/__Libraries/StellaOps.Scanner.Analyzers.Lang.Node/Internal/NodeImportWalker.cs

@@ -1,5 +1,3 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
 using Esprima;
 using Esprima.Ast;
 using EsprimaNode = Esprima.Ast.Node;
@@ -19,12 +17,8 @@ internal static class NodeImportWalker
         Script script;
         try
         {
-            script = new JavaScriptParser(content, new ParserOptions
-            {
-                Tolerant = true,
-                AdaptRegexp = true,
-                Source = sourcePath
-            }).ParseScript();
+            var parser = new JavaScriptParser();
+            script = parser.ParseScript(content, sourcePath, true);
         }
         catch (ParserException)
         {
@@ -43,13 +37,13 @@ internal static class NodeImportWalker
         switch (node)
         {
             case ImportDeclaration importDecl when !string.IsNullOrWhiteSpace(importDecl.Source?.StringValue):
-                edges.Add(new NodeImportEdge(sourcePath, importDecl.Source.StringValue!, "import", BuildEvidence(importDecl.Loc)));
+                edges.Add(new NodeImportEdge(sourcePath, importDecl.Source.StringValue!, "import", string.Empty));
                 break;
             case CallExpression call when IsRequire(call) && call.Arguments.FirstOrDefault() is Literal { Value: string target }:
-                edges.Add(new NodeImportEdge(sourcePath, target, "require", BuildEvidence(call.Loc)));
+                edges.Add(new NodeImportEdge(sourcePath, target, "require", string.Empty));
                 break;
             case ImportExpression importExp when importExp.Source is Literal { Value: string importTarget }:
-                edges.Add(new NodeImportEdge(sourcePath, importTarget, "import()", BuildEvidence(importExp.Loc)));
+                edges.Add(new NodeImportEdge(sourcePath, importTarget, "import()", string.Empty));
                 break;
         }
 
@@ -64,29 +58,4 @@ internal static class NodeImportWalker
         return call.Callee is Identifier id && string.Equals(id.Name, "require", StringComparison.Ordinal)
             && call.Arguments.Count == 1 && call.Arguments[0] is Literal { Value: string };
     }
-
-    private static string BuildEvidence(Location? loc)
-    {
-        if (loc is null)
-        {
-            return string.Empty;
-        }
-
-        var json = new JsonObject
-        {
-            ["start"] = BuildPosition(loc.Start),
-            ["end"] = BuildPosition(loc.End)
-        };
-
-        return json.ToJsonString(new JsonSerializerOptions { WriteIndented = false });
-    }
-
-    private static JsonObject BuildPosition(Position pos)
-    {
-        return new JsonObject
-        {
-            ["line"] = pos.Line,
-            ["column"] = pos.Column
-        };
-    }
 }

src/Scanner/__Libraries/StellaOps.Scanner.Analyzers.Lang.Node/Internal/NodePackage.cs

@@ -145,17 +145,17 @@ internal sealed class NodePackage
                 "package.json:entrypoint",
                 locator,
                 content,
-                sha256: null));
+                null));
         }
 
         foreach (var importEdge in _imports.OrderBy(static e => e.ComparisonKey, StringComparer.Ordinal))
         {
             evidence.Add(new LanguageComponentEvidence(
-                LanguageEvidenceKind.Source,
+                LanguageEvidenceKind.File,
                 "node.import",
                 importEdge.SourceFile,
                 importEdge.TargetSpecifier,
-                sha256: null));
+                null));
         }
 
         return evidence

src/Scanner/__Libraries/StellaOps.Scanner.Analyzers.Lang.Node/Internal/NodePackageCollector.cs

@@ -509,7 +509,8 @@ internal static class NodePackageCollector
         var lockLocator = BuildLockLocator(lockEntry);
         var lockSource = lockEntry?.Source;
 
-        var isWorkspaceMember = workspaceIndex?.TryGetMember(relativeDirectory, out var workspaceRoot) == true;
+        string? workspaceRoot = null;
+        var isWorkspaceMember = workspaceIndex?.TryGetMember(relativeDirectory, out workspaceRoot) == true;
         var workspaceRootValue = isWorkspaceMember && workspaceIndex is not null ? workspaceRoot : null;
         var workspaceTargets = workspaceIndex is null ? Array.Empty<string>() : ExtractWorkspaceTargets(relativeDirectory, root, workspaceIndex);
         var workspaceLink = workspaceIndex is not null && !isWorkspaceMember && workspaceIndex.TryGetWorkspacePathByName(name, out var workspacePathByName)