@effect/language-service 0.51.0 → 0.51.1

package/index.js

@@ -13935,11 +13935,20 @@ var extractLayerGraph = fn("extractLayerGraph")(function* (node, opts) {
 });
 var formatLayerGraph = fn("formatLayerGraph")(function* (layerGraph) {
   const tsUtils = yield* service(TypeScriptUtils);
+  const typeChecker = yield* service(TypeCheckerApi);
+  const ts = yield* service(TypeScriptApi);
   return toMermaid(layerGraph, {
     edgeLabel: (edge) => JSON.stringify(edge),
     nodeLabel: (graphNode) => {
       const sourceFile = tsUtils.getSourceFileOfNode(graphNode.node);
-      return sourceFile.text.substring(graphNode.node.pos, graphNode.node.end).trim();
+      let text = sourceFile.text.substring(graphNode.node.pos, graphNode.node.end).trim();
+      text += "\nprovides: " + graphNode.provides.map((_) => typeChecker.typeToString(_, void 0, ts.TypeFormatFlags.NoTruncation)).join(
+        ", "
+      );
+      text += "\nrequires: " + graphNode.requires.map((_) => typeChecker.typeToString(_, void 0, ts.TypeFormatFlags.NoTruncation)).join(
+        ", "
+      );
+      return text;
     }
   });
 });
@@ -14020,7 +14029,7 @@ var formatNestedLayerGraph = fn("formatNestedLayerGraph")(function* (layerGraph)
 var extractOutlineGraph = fn("extractOutlineGraph")(function* (layerGraph) {
   const typeChecker = yield* service(TypeCheckerApi);
   const mutableGraph = beginMutation3(directed());
-  const providers = /* @__PURE__ */ new WeakMap();
+  const providers = /* @__PURE__ */ new Map();
   const knownSymbols = /* @__PURE__ */ new WeakSet();
   const leafNodes = values2(externals(layerGraph, { direction: "outgoing" }));
   const dedupedLeafNodes = [];
@@ -14047,8 +14056,12 @@ var extractOutlineGraph = fn("extractOutlineGraph")(function* (layerGraph) {
   }
   for (const [nodeIndex, nodeInfo] of entries(nodes(mutableGraph))) {
     for (const requiredType of nodeInfo.requires) {
-      for (const providerNodeIndex of providers.get(requiredType) || []) {
-        addEdge(mutableGraph, nodeIndex, providerNodeIndex, {});
+      for (const [providedType, providerNodeIndexes] of providers.entries()) {
+        if (requiredType === providedType || typeChecker.isTypeAssignableTo(requiredType, providedType)) {
+          for (const providerNodeIndex of providerNodeIndexes) {
+            addEdge(mutableGraph, nodeIndex, providerNodeIndex, {});
+          }
+        }
       }
     }
   }
@@ -14135,7 +14148,8 @@ var walkLeavesMatching = (graph, predicate, config = {}) => {
 var extractProvidersAndRequirers = fn("extractProvidersAndRequirers")(
   function* (layerGraph) {
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
-    const rootWalker = externals(layerGraph, { direction: "outgoing" });
+    const typeChecker = yield* service(TypeCheckerApi);
+    const rootWalker = externals(layerGraph, { direction: "incoming" });
     const rootNodes = fromIterable(values2(rootWalker));
     const rootNodeIndexes = fromIterable(indices(rootWalker));
     const result = [];
@@ -14146,7 +14160,9 @@ var extractProvidersAndRequirers = fn("extractProvidersAndRequirers")(
         for (const layerNode of values2(
           walkLeavesMatching(
             layerGraph,
-            (_) => (kind === "provided" ? _.provides : _.requires).indexOf(layerType) > -1,
+            (_) => (kind === "provided" ? _.provides : _.requires).some(
+              (_2) => _2 === layerType || typeChecker.isTypeAssignableTo(_2, layerType)
+            ),
             { start: rootNodeIndexes }
           )
         )) {