@effect/language-service 0.53.0 → 0.53.1

package/index.js

@@ -13903,6 +13903,20 @@ var { Inflate, inflate, inflateRaw, ungzip } = inflate_1$1;
 var deflate_1 = deflate;
 
 // src/core/LayerGraph.ts
+var formatSourceFileName = (sourceFile) => {
+  let fileName = sourceFile.fileName;
+  if (fileName.indexOf("/") > -1) {
+    fileName = fileName.split("/").pop();
+  }
+  return fileName;
+};
+var formatSourceFileNameLineAndColumn = (ts, tsUtils, node, fromSourceFile) => {
+  const nodeSourceFile = tsUtils.getSourceFileOfNode(node);
+  const nodePosition = ts.getTokenPosOfNode(node, nodeSourceFile);
+  const { character, line } = ts.getLineAndCharacterOfPosition(nodeSourceFile, nodePosition);
+  if (!fromSourceFile || nodeSourceFile === fromSourceFile) return `ln ${line + 1} col ${character}`;
+  return `in ${formatSourceFileName(nodeSourceFile)} at ln ${line + 1} col ${character}`;
+};
 var UnableToProduceLayerGraphError = class {
   constructor(message, node) {
     this.message = message;
@@ -13956,7 +13970,11 @@ var extractLayerGraph = fn("extractLayerGraph")(function* (node, opts) {
       provides = typeCheckerUtils.unrollUnionMembers(layerTypes.ROut).filter((_) => !(_.flags & ts.TypeFlags.Never));
       requires = typeCheckerUtils.unrollUnionMembers(layerTypes.RIn).filter((_) => !(_.flags & ts.TypeFlags.Never));
     }
-    return { node: node2, layerType, layerTypes, provides, requires };
+    let displayNode = node2;
+    if (node2.parent && ts.isVariableDeclaration(node2.parent) && node2.parent.initializer === node2) {
+      displayNode = node2.parent.name;
+    }
+    return { node: node2, displayNode, layerType, layerTypes, provides, requires };
   });
   const addNode2 = fn("addNode")(function* (node2, nodeInfo) {
     const graphNode = addNode(mutableGraph, nodeInfo ? nodeInfo : yield* extractNodeInfo(node2));
@@ -14085,20 +14103,6 @@ var extractLayerGraph = fn("extractLayerGraph")(function* (node, opts) {
   }
   return endMutation2(mutableGraph);
 });
-var formatSourceFileName = (sourceFile) => {
-  let fileName = sourceFile.fileName;
-  if (fileName.indexOf("/") > -1) {
-    fileName = fileName.split("/").pop();
-  }
-  return fileName;
-};
-var formatSourceFileNameLineAndColumn = (ts, tsUtils, node, fromSourceFile) => {
-  const nodeSourceFile = tsUtils.getSourceFileOfNode(node);
-  const nodePosition = ts.getTokenPosOfNode(node, nodeSourceFile);
-  const { character, line } = ts.getLineAndCharacterOfPosition(nodeSourceFile, nodePosition);
-  if (!fromSourceFile || nodeSourceFile === fromSourceFile) return `ln ${line + 1} col ${character}`;
-  return `in ${formatSourceFileName(nodeSourceFile)} at ln ${line + 1} col ${character}`;
-};
 var formatLayerGraph = fn("formatLayerGraph")(
   function* (layerGraph, _fromSourceFile) {
     const tsUtils = yield* service(TypeScriptUtils);
@@ -14161,12 +14165,12 @@ var formatNestedLayerGraph = fn("formatNestedLayerGraph")(
         `style ${graphNodeIndex}_wrap fill:transparent`,
         `style ${graphNodeIndex}_wrap stroke:none`
       ];
-      const sourceFile = tsUtils.getSourceFileOfNode(graphNode.node);
-      const nodeText = sourceFile.text.substring(graphNode.node.pos, graphNode.node.end).trim();
+      const tsNode = graphNode.displayNode;
+      const sourceFile = tsUtils.getSourceFileOfNode(tsNode);
+      const nodeText = sourceFile.text.substring(tsNode.pos, tsNode.end).trim();
       result = [
         ...result,
-        `subgraph ${graphNodeIndex} ["\`${mermaidSafe(nodeText)}
-<small>_${mermaidSafe(formatSourceFileNameLineAndColumn(ts, tsUtils, graphNode.node, fromSourceFile))}_</small>\`"]`,
+        `subgraph ${graphNodeIndex} ["\`${mermaidSafe(nodeText)}<br/><small>_${mermaidSafe(formatSourceFileNameLineAndColumn(ts, tsUtils, tsNode, fromSourceFile))}_</small>\`"]`,
         ...subgraphDefs.map((_) => `  ${_}`),
         `end`,
         `style ${graphNodeIndex} fill:transparent`
@@ -14215,6 +14219,7 @@ var extractOutlineGraph = fn("extractOutlineGraph")(function* (layerGraph) {
   for (const leafNode of dedupedLeafNodes) {
     const nodeIndex = addNode(mutableGraph, {
       node: leafNode.node,
+      displayNode: leafNode.displayNode,
       requires: leafNode.requires,
       provides: leafNode.provides
     });
@@ -14240,13 +14245,16 @@ var extractOutlineGraph = fn("extractOutlineGraph")(function* (layerGraph) {
 var formatLayerOutlineGraph = fn("formatLayerOutlineGraph")(
   function* (layerOutlineGraph, fromSourceFile) {
     const tsUtils = yield* service(TypeScriptUtils);
+    const ts = yield* service(TypeScriptApi);
     return toMermaid(layerOutlineGraph, {
       edgeLabel: () => "",
       nodeLabel: (graphNode) => {
-        const sourceFile = tsUtils.getSourceFileOfNode(graphNode.node);
-        const nodeText = sourceFile.text.substring(graphNode.node.pos, graphNode.node.end).trim();
+        const tsNode = graphNode.displayNode;
+        const sourceFile = tsUtils.getSourceFileOfNode(tsNode);
+        const nodeText = sourceFile.text.substring(tsNode.pos, tsNode.end).trim();
         if (sourceFile === fromSourceFile) return nodeText;
-        return nodeText + "\n_in " + formatSourceFileName(sourceFile) + "_";
+        return `${nodeText}
+_${formatSourceFileNameLineAndColumn(ts, tsUtils, tsNode, fromSourceFile)}_`;
       }
     });
   }
@@ -14329,6 +14337,7 @@ var extractProvidersAndRequirers = fn("extractProvidersAndRequirers")(
       const sortedTypes = pipe(fromIterable(rootTypes), sort(typeCheckerUtils.deterministicTypeOrder));
       for (const layerType of sortedTypes) {
         const tsNodes = [];
+        const tsDisplayNodes = [];
         for (const layerNode of values2(
           walkLeavesMatching(
             layerGraph,
@@ -14339,11 +14348,13 @@ var extractProvidersAndRequirers = fn("extractProvidersAndRequirers")(
           )
         )) {
           tsNodes.push(layerNode.node);
+          tsDisplayNodes.push(layerNode.displayNode);
         }
         result.push({
           kind,
           type: layerType,
-          nodes: tsNodes
+          nodes: tsNodes,
+          displayNodes: tsDisplayNodes
         });
       }
     };
@@ -14365,7 +14376,7 @@ var formatLayerProvidersAndRequirersInfo = fn("formatLayerProvidersAndRequirersI
         void 0,
         ts.TypeFormatFlags.NoTruncation
       );
-      const positions = infoNode.nodes.map((_) => {
+      const positions = infoNode.displayNodes.map((_) => {
         const sourceFile = tsUtils.getSourceFileOfNode(_);
         const nodeText = sourceFile.text.substring(_.pos, _.end).trim().replace(/\n/g, " ").substr(0, 50);
         return `${formatSourceFileNameLineAndColumn(ts, tsUtils, _, fromSourceFile)} by \`${nodeText}\``;