@dreamtree-org/graphify 1.4.0 → 1.6.0

package/dist/{chunk-QEB7A5KB.js → chunk-5Q4BCTMF.js}

@@ -2,12 +2,12 @@ import {
   LocalFileGraphStore,
   affectedBy,
   testsForNode
-} from "./chunk-7LTO76UD.js";
+} from "./chunk-OHN5UO6W.js";
 import {
   escapeHtml,
   sanitizeLabel,
   validateGraphPath
-} from "./chunk-6JLEILYF.js";
+} from "./chunk-N3VOEXK3.js";
 
 // src/detect.ts
 import * as fs from "fs";
@@ -1955,13 +1955,15 @@ var RelationSchema = z.enum([
   "references",
   "contains",
   "method",
-  "re_exports"
+  "re_exports",
+  "follows"
 ]);
 var GraphNodeSchema = z.object({
   id: z.string().min(1, "node id must be non-empty"),
   label: z.string(),
   sourceFile: z.string(),
-  sourceLocation: z.string()
+  sourceLocation: z.string(),
+  kind: z.string().optional()
 });
 var GraphEdgeSchema = z.object({
   source: z.string().min(1, "edge source must be non-empty"),
@@ -2010,16 +2012,27 @@ function buildGraph(extractions) {
   const validated = extractions.map(
     (extraction, index) => validateExtraction(extraction, `extraction #${index}`)
   );
+  mergeExtractionsInto(graph, validated);
+  return graph;
+}
+function mergeExtractionsInto(graph, validated) {
   const allNodes = validated.flatMap((extraction) => extraction.nodes);
   const allEdges = validated.flatMap((extraction) => extraction.edges);
   const sortedNodes = [...allNodes].sort((a, b) => a.id.localeCompare(b.id));
   for (const node of sortedNodes) {
-    if (graph.hasNode(node.id)) continue;
-    graph.addNode(node.id, {
+    const attributes = {
       label: node.label,
       sourceFile: node.sourceFile,
-      sourceLocation: node.sourceLocation
-    });
+      sourceLocation: node.sourceLocation,
+      ...node.kind !== void 0 ? { kind: node.kind } : {}
+    };
+    if (graph.hasNode(node.id)) {
+      if (graph.getNodeAttribute(node.id, "sourceFile") === "<unknown>") {
+        graph.mergeNodeAttributes(node.id, attributes);
+      }
+      continue;
+    }
+    graph.addNode(node.id, attributes);
   }
   const sortedEdges = [...allEdges].sort(
     (a, b) => a.source.localeCompare(b.source) || a.target.localeCompare(b.target) || a.relation.localeCompare(b.relation)
@@ -2038,6 +2051,98 @@ function buildGraph(extractions) {
       confidence: edge.confidence
     });
   }
+}
+
+// src/cluster.ts
+import { createHash } from "crypto";
+import Graph2 from "graphology";
+import leiden from "@aflsolutions/graphology-communities-leiden";
+import louvain from "graphology-communities-louvain";
+var FIXED_SEED = 1592594996;
+function mulberry32(seed) {
+  let a = seed >>> 0;
+  return function next() {
+    a = a + 1831565813 | 0;
+    let t = Math.imul(a ^ a >>> 15, 1 | a);
+    t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
+    return ((t ^ t >>> 14) >>> 0) / 4294967296;
+  };
+}
+function sortedWorkingCopy(graph) {
+  const copy = new Graph2({ type: graph.type, multi: graph.multi, allowSelfLoops: graph.allowSelfLoops });
+  const nodeIds = graph.nodes().sort((a, b) => a.localeCompare(b));
+  for (const id of nodeIds) {
+    copy.addNode(id, { ...graph.getNodeAttributes(id) });
+  }
+  const edgeEntries = [];
+  graph.forEachEdge((edge, attributes, source, target) => {
+    edgeEntries.push({ key: edge, source, target, attributes });
+  });
+  edgeEntries.sort(
+    (a, b) => a.source.localeCompare(b.source) || a.target.localeCompare(b.target) || String(a.attributes.relation).localeCompare(String(b.attributes.relation))
+  );
+  for (const entry of edgeEntries) {
+    copy.addEdgeWithKey(entry.key, entry.source, entry.target, { ...entry.attributes });
+  }
+  return copy;
+}
+function toUndirectedCopy(graph) {
+  const copy = new Graph2({ type: "undirected", multi: true, allowSelfLoops: graph.allowSelfLoops });
+  graph.forEachNode((nodeId, attributes) => copy.addNode(nodeId, { ...attributes }));
+  graph.forEachEdge((edgeKey, attributes, source, target) => {
+    copy.addEdgeWithKey(edgeKey, source, target, { ...attributes });
+  });
+  return copy;
+}
+function runAlgorithm(working, options) {
+  const rng = mulberry32(FIXED_SEED);
+  if (options.algorithm === "leiden") {
+    const undirected = toUndirectedCopy(working);
+    leiden.assign(undirected, { rng, maxIterations: options.maxIterations ?? 0 });
+    undirected.forEachNode((nodeId, attributes) => {
+      working.setNodeAttribute(nodeId, "community", attributes.community);
+    });
+    return;
+  }
+  louvain.assign(working, { rng });
+}
+function cluster(graph, options = {}) {
+  if (graph.order === 0) return graph;
+  const working = sortedWorkingCopy(graph);
+  runAlgorithm(working, options);
+  const hubs = /* @__PURE__ */ new Map();
+  working.forEachNode((nodeId) => {
+    const community = working.getNodeAttribute(nodeId, "community");
+    const degree = working.degree(nodeId);
+    const current = hubs.get(community);
+    if (!current || degree > current.degree) {
+      hubs.set(community, { id: nodeId, degree });
+    }
+  });
+  const membersByCommunity = /* @__PURE__ */ new Map();
+  working.forEachNode((nodeId) => {
+    const community = working.getNodeAttribute(nodeId, "community");
+    const list = membersByCommunity.get(community);
+    if (list) list.push(nodeId);
+    else membersByCommunity.set(community, [nodeId]);
+  });
+  const labelByCommunity = /* @__PURE__ */ new Map();
+  const hashByCommunity = /* @__PURE__ */ new Map();
+  for (const [community, members] of membersByCommunity) {
+    members.sort((a, b) => a.localeCompare(b));
+    hashByCommunity.set(community, createHash("sha256").update(members.join("\n")).digest("hex"));
+    const hub = hubs.get(community);
+    const hubLabel = hub ? working.getNodeAttribute(hub.id, "label") : void 0;
+    labelByCommunity.set(community, hubLabel && hubLabel.length > 0 ? hubLabel : `community-${community}`);
+  }
+  working.forEachNode((nodeId) => {
+    const community = working.getNodeAttribute(nodeId, "community");
+    graph.mergeNodeAttributes(nodeId, {
+      community,
+      communityLabel: labelByCommunity.get(community),
+      communityHash: hashByCommunity.get(community)
+    });
+  });
   return graph;
 }
 
@@ -2235,99 +2340,6 @@ function resolveCrossFileReferences(extractions, options = {}) {
   return { resolvedEndpoints, droppedPlaceholders };
 }
 
-// src/cluster.ts
-import { createHash } from "crypto";
-import Graph2 from "graphology";
-import leiden from "@aflsolutions/graphology-communities-leiden";
-import louvain from "graphology-communities-louvain";
-var FIXED_SEED = 1592594996;
-function mulberry32(seed) {
-  let a = seed >>> 0;
-  return function next() {
-    a = a + 1831565813 | 0;
-    let t = Math.imul(a ^ a >>> 15, 1 | a);
-    t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
-    return ((t ^ t >>> 14) >>> 0) / 4294967296;
-  };
-}
-function sortedWorkingCopy(graph) {
-  const copy = new Graph2({ type: graph.type, multi: graph.multi, allowSelfLoops: graph.allowSelfLoops });
-  const nodeIds = graph.nodes().sort((a, b) => a.localeCompare(b));
-  for (const id of nodeIds) {
-    copy.addNode(id, { ...graph.getNodeAttributes(id) });
-  }
-  const edgeEntries = [];
-  graph.forEachEdge((edge, attributes, source, target) => {
-    edgeEntries.push({ key: edge, source, target, attributes });
-  });
-  edgeEntries.sort(
-    (a, b) => a.source.localeCompare(b.source) || a.target.localeCompare(b.target) || String(a.attributes.relation).localeCompare(String(b.attributes.relation))
-  );
-  for (const entry of edgeEntries) {
-    copy.addEdgeWithKey(entry.key, entry.source, entry.target, { ...entry.attributes });
-  }
-  return copy;
-}
-function toUndirectedCopy(graph) {
-  const copy = new Graph2({ type: "undirected", multi: true, allowSelfLoops: graph.allowSelfLoops });
-  graph.forEachNode((nodeId, attributes) => copy.addNode(nodeId, { ...attributes }));
-  graph.forEachEdge((edgeKey, attributes, source, target) => {
-    copy.addEdgeWithKey(edgeKey, source, target, { ...attributes });
-  });
-  return copy;
-}
-function runAlgorithm(working, options) {
-  const rng = mulberry32(FIXED_SEED);
-  if (options.algorithm === "leiden") {
-    const undirected = toUndirectedCopy(working);
-    leiden.assign(undirected, { rng, maxIterations: options.maxIterations ?? 0 });
-    undirected.forEachNode((nodeId, attributes) => {
-      working.setNodeAttribute(nodeId, "community", attributes.community);
-    });
-    return;
-  }
-  louvain.assign(working, { rng });
-}
-function cluster(graph, options = {}) {
-  if (graph.order === 0) return graph;
-  const working = sortedWorkingCopy(graph);
-  runAlgorithm(working, options);
-  const hubs = /* @__PURE__ */ new Map();
-  working.forEachNode((nodeId) => {
-    const community = working.getNodeAttribute(nodeId, "community");
-    const degree = working.degree(nodeId);
-    const current = hubs.get(community);
-    if (!current || degree > current.degree) {
-      hubs.set(community, { id: nodeId, degree });
-    }
-  });
-  const membersByCommunity = /* @__PURE__ */ new Map();
-  working.forEachNode((nodeId) => {
-    const community = working.getNodeAttribute(nodeId, "community");
-    const list = membersByCommunity.get(community);
-    if (list) list.push(nodeId);
-    else membersByCommunity.set(community, [nodeId]);
-  });
-  const labelByCommunity = /* @__PURE__ */ new Map();
-  const hashByCommunity = /* @__PURE__ */ new Map();
-  for (const [community, members] of membersByCommunity) {
-    members.sort((a, b) => a.localeCompare(b));
-    hashByCommunity.set(community, createHash("sha256").update(members.join("\n")).digest("hex"));
-    const hub = hubs.get(community);
-    const hubLabel = hub ? working.getNodeAttribute(hub.id, "label") : void 0;
-    labelByCommunity.set(community, hubLabel && hubLabel.length > 0 ? hubLabel : `community-${community}`);
-  }
-  working.forEachNode((nodeId) => {
-    const community = working.getNodeAttribute(nodeId, "community");
-    graph.mergeNodeAttributes(nodeId, {
-      community,
-      communityLabel: labelByCommunity.get(community),
-      communityHash: hashByCommunity.get(community)
-    });
-  });
-  return graph;
-}
-
 // src/analyze.ts
 var ABSOLUTE_DEGREE_FLOOR = 10;
 var MEAN_DEGREE_MULTIPLIER = 3;
@@ -3106,8 +3118,9 @@ export {
   ExtractionValidationError,
   validateExtraction,
   buildGraph,
-  resolveCrossFileReferences,
+  mergeExtractionsInto,
   cluster,
+  resolveCrossFileReferences,
   analyze,
   renderReport,
   exportGraph,
@@ -3125,4 +3138,4 @@ export {
   validateRules,
   checkRules
 };
-//# sourceMappingURL=chunk-QEB7A5KB.js.map
+//# sourceMappingURL=chunk-5Q4BCTMF.js.map