@effect/language-service 0.38.2 → 0.38.4

package/effect-lsp-patch-utils.js

@@ -1224,10 +1224,10 @@ function makeTypeScriptUtils(ts) {
     if (!hasProperty(packageJsonScope.contents, "packageJsonContent")) return;
     const packageJsonContent = packageJsonScope.contents.packageJsonContent;
     if (!hasProperty(packageJsonContent, "name")) return;
-    if (!hasProperty(packageJsonContent, "version")) return;
     if (!hasProperty(packageJsonScope, "packageDirectory")) return;
     if (!isString(packageJsonScope.packageDirectory)) return;
-    const { name, version } = packageJsonContent;
+    const { name } = packageJsonContent;
+    const version = hasProperty(packageJsonScope, "version") ? packageJsonScope.version : "";
     if (!isString(name)) return;
     if (!isString(version)) return;
     const hasEffectInPeerDependencies = hasProperty(packageJsonContent, "peerDependencies") && isObject(packageJsonContent.peerDependencies) && hasProperty(packageJsonContent.peerDependencies, "effect");
@@ -1249,9 +1249,20 @@ function makeTypeScriptUtils(ts) {
       exportsKeys
     };
   }
-  function resolveModulePattern(sourceFile, pattern) {
+  function resolveModulePattern(program, sourceFile, pattern) {
     if (pattern.indexOf("*") === -1) return [pattern.toLowerCase()];
-    const packageJsonScope = parsePackageContentNameAndVersionFromScope(sourceFile);
+    let packageJsonScope = parsePackageContentNameAndVersionFromScope(sourceFile);
+    if (!packageJsonScope && hasProperty(ts, "getPackageScopeForPath") && isFunction2(ts.getPackageScopeForPath) && hasProperty(ts, "getTemporaryModuleResolutionState") && isFunction2(ts.getTemporaryModuleResolutionState) && hasProperty(ts, "getPackageScopeForPath") && isFunction2(ts.getPackageScopeForPath)) {
+      const temporaryModuleResolutionState = ts.getTemporaryModuleResolutionState(
+        void 0,
+        program,
+        program.getCompilerOptions()
+      );
+      packageJsonScope = parsePackageContentNameAndVersionFromScope({
+        ...sourceFile,
+        packageJsonScope: ts.getPackageScopeForPath(sourceFile.fileName, temporaryModuleResolutionState)
+      });
+    }
     const referencedPackages = [];
     for (const statement of sourceFile.statements) {
       if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
@@ -3554,7 +3565,7 @@ var importFromBarrel = createDiagnostic({
     const program = yield* service(TypeScriptProgram);
     const packageNamesToCheck = flatten(
       languageServicePluginOptions.namespaceImportPackages.map(
-        (packageName) => tsUtils.resolveModulePattern(sourceFile, packageName)
+        (packageName) => tsUtils.resolveModulePattern(program, sourceFile, packageName)
       )
     );
     const isImportedFromBarrelExport = (element) => {
@@ -4514,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),
@@ -4522,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 }) => {
@@ -4573,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(
@@ -4586,7 +4605,8 @@ var accessors = createCodegen({
             provideService(TypeScriptApi, ts),
             provideService(TypeScriptUtils, tsUtils),
             provideService(TypeCheckerApi, typeChecker),
-            provideService(TypeParser, typeParser)
+            provideService(TypeParser, typeParser),
+            provideService(TypeCheckerUtils, typeCheckerUtils)
           )
         })
       ),