@effect/language-service 0.38.3 → 0.38.4

package/README.md

@@ -79,7 +79,7 @@ And you're done! You'll now be able to use a set of refactors and diagnostics th
 - Transform an async function definition, into an Effect by using Effect.fn.
 - Transform an async function definition, into an Effect by using Effect.fn, and generating a tagged error for each promise call.
 - Transform a function returning an Effect.gen into a Effect.fn
-- Implement Service accessors in an `Effect.Service` or `Context.Tag` declaration
+- Implement Service accessors in an `Effect.Service`, `Context.Tag` or `Effect.Tag` declaration
 - Function calls to pipe: Transform a set of function calls to a pipe() call.
 - Pipe to datafirst: Transform a pipe() call into a series of datafirst function calls (where available).
 - Toggle return type signature: With a single refactor, adds or removes type annotations from the definition.

package/effect-lsp-patch-utils.js

@@ -4525,6 +4525,7 @@ var parse2 = fn("writeTagClassAccessors.parse")(function* (node) {
   const ts = yield* service(TypeScriptApi);
   const typeChecker = yield* service(TypeCheckerApi);
   const typeParser = yield* service(TypeParser);
+  const typeCheckerUtils = yield* service(TypeCheckerUtils);
   if (!ts.isClassDeclaration(node)) return yield* fail("not a class declaration");
   const { Service, accessors: accessors2, className } = yield* pipe(
     typeParser.extendsEffectService(node),
@@ -4533,12 +4534,18 @@ var parse2 = fn("writeTagClassAccessors.parse")(function* (node) {
   );
   if (accessors2 !== true) return yield* fail("accessors are not enabled in the Effect.Service call");
   const involvedMembers = [];
-  for (const property of typeChecker.getPropertiesOfType(Service)) {
-    const propertyType = typeChecker.getTypeOfSymbolAtLocation(property, node);
-    const callSignatures = typeChecker.getSignaturesOfType(propertyType, ts.SignatureKind.Call);
-    if (callSignatures.length > 0) {
-      const withTypeParameters = callSignatures.filter((_) => _.typeParameters && _.typeParameters.length > 0);
-      if (callSignatures.length > 1 || withTypeParameters.length > 0) involvedMembers.push({ property, propertyType });
+  const nonPrimitiveServices = typeCheckerUtils.unrollUnionMembers(Service).filter(
+    (_) => !(_.flags & ts.TypeFlags.Number || _.flags & ts.TypeFlags.String || _.flags & ts.TypeFlags.Boolean || _.flags & ts.TypeFlags.Literal)
+  );
+  if (nonPrimitiveServices.length === 0) return yield* fail("Service type is a primitive type");
+  for (const serviceShape of nonPrimitiveServices) {
+    for (const property of typeChecker.getPropertiesOfType(serviceShape)) {
+      const propertyType = typeChecker.getTypeOfSymbolAtLocation(property, node);
+      const callSignatures = typeChecker.getSignaturesOfType(propertyType, ts.SignatureKind.Call);
+      if (callSignatures.length > 0) {
+        const withTypeParameters = callSignatures.filter((_) => _.typeParameters && _.typeParameters.length > 0);
+        if (callSignatures.length > 1 || withTypeParameters.length > 0) involvedMembers.push({ property, propertyType });
+      }
     }
   }
   const hash2 = involvedMembers.map(({ property, propertyType }) => {
@@ -4584,6 +4591,7 @@ var accessors = createCodegen({
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
     const typeParser = yield* service(TypeParser);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const nodeAndCommentRange = tsUtils.findNodeWithLeadingCommentAtPosition(sourceFile, textRange.pos);
     if (!nodeAndCommentRange) return yield* fail(new CodegenNotApplicableError("no node and comment range"));
     return yield* pipe(
@@ -4597,7 +4605,8 @@ var accessors = createCodegen({
             provideService(TypeScriptApi, ts),
             provideService(TypeScriptUtils, tsUtils),
             provideService(TypeCheckerApi, typeChecker),
-            provideService(TypeParser, typeParser)
+            provideService(TypeParser, typeParser),
+            provideService(TypeCheckerUtils, typeCheckerUtils)
           )
         })
       ),