@effect/language-service 0.36.0 → 0.38.0

package/README.md

@@ -86,8 +86,10 @@ And you're done! You'll now be able to use a set of refactors and diagnostics th
 - Remove unnecessary `Effect.gen` definitions that contains a single `yield` statement.
 - Wrap an `Effect` expression with `Effect.gen`
 - Toggle between pipe styles `X.pipe(Y)` and `pipe(X, Y)`
+- Layer Magic: Automatically compose and build layers based on service dependencies
 
 ### Miscellaneous
+- Renaming a class name, will rename the identifier as well for TaggedError, TaggedClass, etc...
 - "Go to definition" for RpcClient will resolve to the Rpc definition
 
 ## Options
@@ -113,7 +115,8 @@ Few options can be provided alongside the initialization of the Language Service
         "allowedDuplicatedPackages": [], // list of package names that have effect in peer dependencies and are allowed to be duplicated (default: [])
         "barrelImportPackages": [], // package names that should be preferred as imported from the top level barrel file (default: [])
         "namespaceImportPackages": [], // package names that should be preferred as imported with namespace imports e.g. ["effect", "@effect/*"] (default: [])
-        "topLevelNamedReexports": "ignore" // for namespaceImportPackages, how should top level named re-exports (e.g. {pipe} from "effect") be treated? "ignore" will leave them as is, "follow" will rewrite them to the re-exported module (e.g. {pipe} from "effect/Function")
+        "topLevelNamedReexports": "ignore", // for namespaceImportPackages, how should top level named re-exports (e.g. {pipe} from "effect") be treated? "ignore" will leave them as is, "follow" will rewrite them to the re-exported module (e.g. {pipe} from "effect/Function")
+        "importAliases": { "Array": "Arr" } // allows to chose some different names for import name aliases (only when not chosing to import the whole module) (default: {})
       }
     ]
   }

package/cli.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -28972,6 +28973,34 @@ var suspend11 = (fn3) => {
   nano[args2] = fn3;
   return nano;
 };
+var timings = {};
+var timingsCount = {};
+var WithSpanProto = {
+  ...PrimitiveProto,
+  [evaluate2](fiber) {
+    const [fa, name] = this[args2];
+    if (!fiber._perf) return fa;
+    const start4 = performance.now();
+    timingsCount[name] = (timingsCount[name] || 0) + 1;
+    return match17(fa, {
+      onSuccess: (_) => {
+        const end5 = performance.now();
+        timings[name] = (timings[name] || 0) + (end5 - start4);
+        return succeed17(_);
+      },
+      onFailure: (_) => {
+        const end5 = performance.now();
+        timings[name] = (timings[name] || 0) + (end5 - start4);
+        return fail18(_);
+      }
+    });
+  }
+};
+var withSpan6 = (name) => (fa) => {
+  const nano = Object.create(WithSpanProto);
+  nano[args2] = [fa, name];
+  return nano;
+};
 var OnSuccessProto2 = {
   ...PrimitiveProto,
   [evaluate2](fiber) {
@@ -29012,7 +29041,7 @@ var unsafeFromIterator = (iterator, initial) => {
   nano[args2] = [iterator, initial];
   return nano;
 };
-var fn2 = (_) => (body) => (...args3) => suspend11(() => unsafeFromIterator(body(...args3)));
+var fn2 = (_) => (body) => (...args3) => withSpan6(_)(suspend11(() => unsafeFromIterator(body(...args3))));
 var MatchProto = {
   ...PrimitiveProto,
   [evaluate2](fiber) {
@@ -29264,7 +29293,7 @@ function makeTypeScriptUtils(ts4) {
       fnCall = ts4.factory.createCallExpression(
         fnCall,
         void 0,
-        [ts4.factory.createStringLiteral(fnName.text)]
+        [ts4.factory.createStringLiteral(ts4.idText(fnName))]
       );
     }
     return tryPreserveDeclarationSemantics(
@@ -29336,7 +29365,7 @@ function makeTypeScriptUtils(ts4) {
       if (!namedBindings) continue;
       if (ts4.isNamespaceImport(namedBindings)) {
         if (test(namedBindings.name, statement.moduleSpecifier, none2())) {
-          return namedBindings.name.text;
+          return ts4.idText(namedBindings.name);
         }
       } else if (ts4.isNamedImports(namedBindings)) {
         for (const importSpecifier of namedBindings.elements) {
@@ -29344,7 +29373,7 @@ function makeTypeScriptUtils(ts4) {
             orElse(() => some2(importSpecifier.name))
           );
           if (test(importSpecifier.name, statement.moduleSpecifier, importProperty)) {
-            return importSpecifier.name.text;
+            return ts4.idText(importSpecifier.name);
           }
         }
       }
@@ -29357,7 +29386,7 @@ function makeTypeScriptUtils(ts4) {
         if (isNone2(importProperty) && ts4.isStringLiteral(fromModule) && fromModule.text === packageName + "/" + moduleName) {
           return true;
         }
-        if (isSome2(importProperty) && ts4.isIdentifier(importProperty.value) && importProperty.value.text === moduleName && ts4.isStringLiteral(fromModule) && fromModule.text === packageName) {
+        if (isSome2(importProperty) && ts4.isIdentifier(importProperty.value) && ts4.idText(importProperty.value) === moduleName && ts4.isStringLiteral(fromModule) && fromModule.text === packageName) {
           return true;
         }
         return false;
@@ -29791,9 +29820,11 @@ var moduleNames = choice3("module", [
 var getPatchesForModule = fn("getPatchesForModule")(
   function* (moduleName, dirPath4, version, sourceFile) {
     const patches = [];
-    let insertUtilsPosition = -1;
-    let insertCheckSourceFilePosition = -1;
-    let insertSkipPrecedingCommentDirectivePosition = -1;
+    const insertUtilsPosition = some2({ position: 0 });
+    let insertClearSourceFileEffectMetadataPosition = none2();
+    let insertCheckSourceFilePosition = none2();
+    let insertSkipPrecedingCommentDirectivePosition = none2();
+    let insertAppendMetadataRelationErrorPosition = none2();
     const nodesToCheck = [];
     function findNodeAtPositionIncludingTrivia(sourceFile2, position) {
       function find3(node) {
@@ -29818,8 +29849,11 @@ var getPatchesForModule = fn("getPatchesForModule")(
       }
       return pushed;
     }
-    if (!pushFunctionDeclarationNode("checkSourceFileWorker")) nodesToCheck.push(sourceFile);
-    if (!pushFunctionDeclarationNode("markPrecedingCommentDirectiveLine")) nodesToCheck.push(sourceFile);
+    let requiresFullScan = false;
+    if (!pushFunctionDeclarationNode("checkSourceFileWorker")) requiresFullScan = true;
+    if (!pushFunctionDeclarationNode("markPrecedingCommentDirectiveLine")) requiresFullScan = true;
+    if (!pushFunctionDeclarationNode("reportRelationError")) requiresFullScan = true;
+    if (requiresFullScan) nodesToCheck.push(sourceFile);
     while (nodesToCheck.length > 0) {
       const node = nodesToCheck.shift();
       if (!node) continue;
@@ -29829,12 +29863,29 @@ var getPatchesForModule = fn("getPatchesForModule")(
           const identifier2 = expression.expression;
           if (ts3.isIdentifier(identifier2) && ts3.idText(identifier2) === "checkGrammarSourceFile" && ts3.isBlock(node.parent) && node.parent.statements.length > 0) {
             const block = node.parent;
-            insertCheckSourceFilePosition = block.statements[block.statements.length - 1].end;
+            const parentFunctionDeclaration = ts3.findAncestor(node, ts3.isFunctionDeclaration);
+            if (parentFunctionDeclaration && parentFunctionDeclaration.name && ts3.isIdentifier(parentFunctionDeclaration.name) && ts3.idText(parentFunctionDeclaration.name) === "checkSourceFileWorker") {
+              insertClearSourceFileEffectMetadataPosition = some2({ position: node.pos });
+              insertCheckSourceFilePosition = some2({
+                position: block.statements[block.statements.length - 1].end
+              });
+            }
           }
         }
       } else if (ts3.isFunctionDeclaration(node)) {
         if (node.name && ts3.isIdentifier(node.name) && ts3.idText(node.name) === "markPrecedingCommentDirectiveLine" && node.body && node.body.statements.length > 0) {
-          insertSkipPrecedingCommentDirectivePosition = node.body.statements[0].pos;
+          insertSkipPrecedingCommentDirectivePosition = some2({ position: node.body.statements[0].pos });
+        }
+        if (node.name && ts3.isIdentifier(node.name) && ts3.idText(node.name) === "reportRelationError" && node.body && node.body.statements.length > 0 && node.parameters.length >= 3) {
+          const sourceIdentifier2 = node.parameters[1] && ts3.isParameter(node.parameters[1]) && ts3.isIdentifier(node.parameters[1].name) ? ts3.idText(node.parameters[1].name) : void 0;
+          const targetIdentifier2 = node.parameters[2] && ts3.isParameter(node.parameters[2]) && ts3.isIdentifier(node.parameters[2].name) ? ts3.idText(node.parameters[2].name) : void 0;
+          if (sourceIdentifier2 && targetIdentifier2) {
+            insertAppendMetadataRelationErrorPosition = some2({
+              position: node.body.statements[0].pos,
+              sourceIdentifier: sourceIdentifier2,
+              targetIdentifier: targetIdentifier2
+            });
+          }
         }
       }
       ts3.forEachChild(node, (child) => {
@@ -29842,16 +29893,15 @@ var getPatchesForModule = fn("getPatchesForModule")(
         return void 0;
       });
     }
-    insertUtilsPosition = 0;
-    if (insertUtilsPosition === -1) {
+    if (isNone2(insertUtilsPosition)) {
       return yield* fail7(new UnableToFindPositionToPatchError({ positionToFind: "effect lsp utils insertion" }));
     }
     if (moduleName !== "typescript") {
       patches.push(
         yield* makeEffectLspPatchChange(
           sourceFile.text,
-          insertUtilsPosition,
-          insertUtilsPosition,
+          insertUtilsPosition.value.position,
+          insertUtilsPosition.value.position,
           "\n" + (yield* getTypeScriptApisUtils(dirPath4)) + "\n",
           "",
           version
@@ -29861,28 +29911,61 @@ var getPatchesForModule = fn("getPatchesForModule")(
     patches.push(
       yield* makeEffectLspPatchChange(
         sourceFile.text,
-        insertUtilsPosition,
-        insertUtilsPosition,
+        insertUtilsPosition.value.position,
+        insertUtilsPosition.value.position,
         "\n" + (yield* getEffectLspPatchUtils()) + "\n",
         "",
         version
       )
     );
-    if (insertCheckSourceFilePosition === -1) {
+    if (isNone2(insertClearSourceFileEffectMetadataPosition)) {
+      return yield* fail7(
+        new UnableToFindPositionToPatchError({ positionToFind: "clearSourceFileEffectMetadata" })
+      );
+    }
+    patches.push(
+      yield* makeEffectLspPatchChange(
+        sourceFile.text,
+        insertClearSourceFileEffectMetadataPosition.value.position,
+        insertClearSourceFileEffectMetadataPosition.value.position,
+        `effectLspPatchUtils.exports.clearSourceFileEffectMetadata(node)
+`,
+        "\n",
+        version
+      )
+    );
+    if (isNone2(insertCheckSourceFilePosition)) {
       return yield* fail7(new UnableToFindPositionToPatchError({ positionToFind: "checkSourceFileWorker" }));
     }
     patches.push(
       yield* makeEffectLspPatchChange(
         sourceFile.text,
-        insertCheckSourceFilePosition,
-        insertCheckSourceFilePosition,
+        insertCheckSourceFilePosition.value.position,
+        insertCheckSourceFilePosition.value.position,
         `effectLspPatchUtils.exports.checkSourceFileWorker(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis"}, host, node, compilerOptions, diagnostics.add)
 `,
         "\n",
         version
       )
     );
-    if (insertSkipPrecedingCommentDirectivePosition === -1) {
+    if (isNone2(insertAppendMetadataRelationErrorPosition)) {
+      return yield* fail7(
+        new UnableToFindPositionToPatchError({ positionToFind: "appendMetadataRelationError" })
+      );
+    }
+    const { sourceIdentifier, targetIdentifier } = insertAppendMetadataRelationErrorPosition.value;
+    patches.push(
+      yield* makeEffectLspPatchChange(
+        sourceFile.text,
+        insertAppendMetadataRelationErrorPosition.value.position,
+        insertAppendMetadataRelationErrorPosition.value.position,
+        `effectLspPatchUtils.exports.appendMetadataRelationError(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis"}, errorNode, ${sourceIdentifier}, ${targetIdentifier})
+`,
+        "\n",
+        version
+      )
+    );
+    if (isNone2(insertSkipPrecedingCommentDirectivePosition)) {
       return yield* fail7(
         new UnableToFindPositionToPatchError({ positionToFind: "skip preceding comment directive" })
       );
@@ -29890,8 +29973,8 @@ var getPatchesForModule = fn("getPatchesForModule")(
     patches.push(
       yield* makeEffectLspPatchChange(
         sourceFile.text,
-        insertSkipPrecedingCommentDirectivePosition,
-        insertSkipPrecedingCommentDirectivePosition,
+        insertSkipPrecedingCommentDirectivePosition.value.position,
+        insertSkipPrecedingCommentDirectivePosition.value.position,
         'if(diagnostic && diagnostic.source === "effect"){ return -1; }\n',
         "\n",
         version
@@ -29983,7 +30066,7 @@ var cliCommand = make58(
 ).pipe(withSubcommands3([patch9, unpatch, check2]));
 var main = run8(cliCommand, {
   name: "effect-language-service",
-  version: "0.0.1"
+  version: "0.0.2"
 });
 main(process.argv).pipe(
   provide2(layer11),