@effect/language-service 0.40.0 → 0.41.0

package/index.js

@@ -3499,7 +3499,10 @@ var generate = fn("writeTagClassAccessors.generate")(function* (sourceFile, serv
       ]
     );
     return ts.factory.createPropertyDeclaration(
-      [ts.factory.createModifier(ts.SyntaxKind.StaticKeyword)],
+      [
+        ts.factory.createModifier(ts.SyntaxKind.StaticKeyword),
+        ts.factory.createModifier(ts.SyntaxKind.OverrideKeyword)
+      ],
       propertyName,
       void 0,
       type,
@@ -3865,7 +3868,7 @@ var classSelfMismatch = createDiagnostic({
         );
         if (result) {
           const { className, selfTypeNode } = result;
-          let actualName = "";
+          let actualName = sourceFile.text.substring(selfTypeNode.pos, selfTypeNode.end);
           if (ts.isTypeReferenceNode(selfTypeNode)) {
             if (ts.isIdentifier(selfTypeNode.typeName)) {
               actualName = ts.idText(selfTypeNode.typeName);
@@ -4582,7 +4585,7 @@ var missingEffectError = createDiagnostic({
 // src/diagnostics/missingEffectServiceDependency.ts
 var missingEffectServiceDependency = createDiagnostic({
   name: "missingEffectServiceDependency",
-  code: 21,
+  code: 22,
   severity: "off",
   apply: fn("missingEffectServiceDependency.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
@@ -4904,6 +4907,96 @@ var multipleEffectProvide = createDiagnostic({
   })
 });
 
+// src/diagnostics/nonObjectEffectServiceType.ts
+var nonObjectEffectServiceType = createDiagnostic({
+  name: "nonObjectEffectServiceType",
+  code: 24,
+  severity: "error",
+  apply: fn("nonObjectEffectServiceType.apply")(function* (sourceFile, report) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const typeCheckerUtils = yield* service(TypeCheckerUtils);
+    const typeParser = yield* service(TypeParser);
+    function isPrimitiveType(type) {
+      return typeCheckerUtils.unrollUnionMembers(type).some(
+        (type2) => !!(type2.flags & ts.TypeFlags.String || type2.flags & ts.TypeFlags.Number || type2.flags & ts.TypeFlags.Boolean || type2.flags & ts.TypeFlags.StringLiteral || type2.flags & ts.TypeFlags.NumberLiteral || type2.flags & ts.TypeFlags.BooleanLiteral || type2.flags & ts.TypeFlags.Undefined || type2.flags & ts.TypeFlags.Null)
+      );
+    }
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      if (ts.isClassDeclaration(node) && node.name && node.heritageClauses) {
+        const serviceResult = yield* pipe(
+          typeParser.extendsEffectService(node),
+          orElse2(() => void_)
+        );
+        if (serviceResult && serviceResult.options && ts.isObjectLiteralExpression(serviceResult.options)) {
+          const options = serviceResult.options;
+          for (const property of options.properties) {
+            if (!ts.isPropertyAssignment(property) || !ts.isIdentifier(property.name)) {
+              continue;
+            }
+            const propertyName = ts.idText(property.name);
+            const propertyValue = property.initializer;
+            const errorToReport = {
+              location: property.name,
+              messageText: "Effect.Service requires the service type to be an object {} and not a primitive type. \nConsider wrapping the value in an object, or manually using Context.Tag or Effect.Tag if you want to use a primitive instead.",
+              fixes: []
+            };
+            if (propertyName === "succeed") {
+              const valueType = typeChecker.getTypeAtLocation(propertyValue);
+              if (isPrimitiveType(valueType)) {
+                report(errorToReport);
+              }
+            } else if (propertyName === "sync") {
+              const valueType = typeChecker.getTypeAtLocation(propertyValue);
+              const signatures = typeChecker.getSignaturesOfType(valueType, ts.SignatureKind.Call);
+              for (const signature of signatures) {
+                const returnType = typeChecker.getReturnTypeOfSignature(signature);
+                if (isPrimitiveType(returnType)) {
+                  report(errorToReport);
+                  break;
+                }
+              }
+            } else if (propertyName === "effect" || propertyName === "scoped") {
+              const valueType = typeChecker.getTypeAtLocation(propertyValue);
+              const effectResult = yield* pipe(
+                typeParser.effectType(valueType, propertyValue),
+                orElse2(() => void_)
+              );
+              if (effectResult) {
+                if (isPrimitiveType(effectResult.A)) {
+                  report(errorToReport);
+                  continue;
+                }
+              } else {
+                const signatures = typeChecker.getSignaturesOfType(valueType, ts.SignatureKind.Call);
+                for (const signature of signatures) {
+                  const returnType = typeChecker.getReturnTypeOfSignature(signature);
+                  const effectReturnResult = yield* pipe(
+                    typeParser.effectType(returnType, propertyValue),
+                    orElse2(() => void_)
+                  );
+                  if (effectReturnResult && isPrimitiveType(effectReturnResult.A)) {
+                    report(errorToReport);
+                    break;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      ts.forEachChild(node, appendNodeToVisit);
+    }
+  })
+});
+
 // src/diagnostics/outdatedEffectCodegen.ts
 var outdatedEffectCodegen = createDiagnostic({
   name: "outdatedEffectCodegen",
@@ -5524,7 +5617,8 @@ var diagnostics = [
   multipleEffectProvide,
   outdatedEffectCodegen,
   overriddenSchemaConstructor,
-  unsupportedServiceAccessors
+  unsupportedServiceAccessors,
+  nonObjectEffectServiceType
 ];
 
 // src/completions/effectDiagnosticsComment.ts
@@ -13694,45 +13788,56 @@ var init = (modules) => {
       }
       return applicableRenameInfo;
     };
-    info.session?.addProtocolHandler("_effectGetLayerMermaid", (arg) => {
-      const { character, line, path } = arg.arguments;
-      const normalizedPath = modules.typescript.server.toNormalizedPath(path);
-      const projectService = info.project.projectService;
-      const scriptInfo = projectService.getScriptInfoForNormalizedPath(normalizedPath);
-      if (scriptInfo) {
-        const targetProject = scriptInfo.getDefaultProject();
-        if (targetProject) {
-          const program = targetProject.getLanguageService().getProgram();
-          if (program) {
-            const sourceFile = targetProject.getSourceFile(scriptInfo.path);
-            if (sourceFile) {
-              return pipe(
-                effectApiGetLayerGraph(sourceFile, line, character),
-                map3((response) => ({
-                  response: {
-                    success: true,
-                    ...response
-                  }
-                })),
-                runNano(program),
-                getOrElse((e) => ({
-                  response: {
-                    success: false,
-                    error: e.message
-                  }
-                }))
-              );
+    const additionalProtocolHandlers = {
+      "_effectGetLayerMermaid": (arg) => {
+        const { character, line, path } = arg.arguments;
+        const normalizedPath = modules.typescript.server.toNormalizedPath(path);
+        const projectService = info.project.projectService;
+        const scriptInfo = projectService.getScriptInfoForNormalizedPath(normalizedPath);
+        if (scriptInfo) {
+          const targetProject = scriptInfo.getDefaultProject();
+          if (targetProject) {
+            const program = targetProject.getLanguageService().getProgram();
+            if (program) {
+              const sourceFile = targetProject.getSourceFile(scriptInfo.path);
+              if (sourceFile) {
+                return pipe(
+                  effectApiGetLayerGraph(sourceFile, line, character),
+                  map3((response) => ({
+                    response: {
+                      success: true,
+                      ...response
+                    }
+                  })),
+                  runNano(program),
+                  getOrElse((e) => ({
+                    response: {
+                      success: false,
+                      error: e.message
+                    }
+                  }))
+                );
+              }
             }
           }
         }
+        return {
+          response: {
+            success: false,
+            error: "No source file found"
+          }
+        };
       }
-      return {
-        response: {
-          success: false,
-          error: "No source file found"
+    };
+    if (info.session) {
+      for (const [key, value] of Object.entries(additionalProtocolHandlers)) {
+        try {
+          info.session.addProtocolHandler(key, value);
+        } catch (e) {
+          info.project.log("[@effect/language-service] Skipped adding " + key + " protocol handler due to error: " + e);
         }
-      };
-    });
+      }
+    }
     return proxy;
   }
   return { create, onConfigurationChanged };