@effect/language-service 0.31.1 → 0.32.0

package/index.js

@@ -1528,7 +1528,8 @@ function parse(config) {
     goto: isObject(config) && hasProperty(config, "goto") && isBoolean(config.goto) ? config.goto : true,
     allowedDuplicatedPackages: isObject(config) && hasProperty(config, "allowedDuplicatedPackages") && isArray(config.allowedDuplicatedPackages) && config.allowedDuplicatedPackages.every(isString) ? config.allowedDuplicatedPackages.map((_) => _.toLowerCase()) : [],
     namespaceImportPackages: isObject(config) && hasProperty(config, "namespaceImportPackages") && isArray(config.namespaceImportPackages) && config.namespaceImportPackages.every(isString) ? config.namespaceImportPackages.map((_) => _.toLowerCase()) : [],
-    barrelImportPackages: isObject(config) && hasProperty(config, "barrelImportPackages") && isArray(config.barrelImportPackages) && config.barrelImportPackages.every(isString) ? config.barrelImportPackages.map((_) => _.toLowerCase()) : []
+    barrelImportPackages: isObject(config) && hasProperty(config, "barrelImportPackages") && isArray(config.barrelImportPackages) && config.barrelImportPackages.every(isString) ? config.barrelImportPackages.map((_) => _.toLowerCase()) : [],
+    topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && (config.topLevelNamedReexports.toLowerCase() === "ignore" || config.topLevelNamedReexports.toLowerCase() === "follow") ? config.topLevelNamedReexports.toLowerCase() : "ignore"
   };
 }
 
@@ -2993,6 +2994,7 @@ function make3(ts, tsUtils, typeChecker) {
                       className: atLocation.name,
                       selfTypeNode,
                       args: wholeCall.arguments,
+                      options: wholeCall.arguments[1],
                       accessors: accessors2,
                       dependencies
                     };
@@ -3598,9 +3600,11 @@ var floatingEffect = createDiagnostic({
           option
         );
         if (isNone2(allowedFloatingEffects)) {
+          const isStrictEffect = yield* option(typeParser.strictEffectType(type, node.expression));
+          const name = isSome2(isStrictEffect) ? "Effect" : "Effect-able " + typeChecker.typeToString(type);
           report({
             location: node,
-            messageText: `Effect must be yielded or assigned to a variable.`,
+            messageText: `${name} must be yielded or assigned to a variable.`,
             fixes: []
           });
         }
@@ -4109,7 +4113,7 @@ var missingEffectServiceDependency = createDiagnostic({
           orElse2(() => void_)
         );
         if (serviceResult) {
-          const { className, dependencies } = serviceResult;
+          const { className, options } = serviceResult;
           const classSymbol = typeChecker.getSymbolAtLocation(className);
           if (classSymbol) {
             const classType = typeChecker.getTypeOfSymbol(classSymbol);
@@ -4130,11 +4134,17 @@ var missingEffectServiceDependency = createDiagnostic({
                   excludeNever
                 );
                 const providedIndexes = /* @__PURE__ */ new Set();
-                const dependenciesToProcess = dependencies || [];
-                for (const depExpression of dependenciesToProcess) {
-                  const depType = typeChecker.getTypeAtLocation(depExpression);
+                const optionsType = typeChecker.getTypeAtLocation(options);
+                const dependenciesProperty = typeChecker.getPropertyOfType(optionsType, "dependencies");
+                let types = [];
+                if (dependenciesProperty) {
+                  const dependenciesTypes = typeChecker.getTypeOfSymbolAtLocation(dependenciesProperty, options);
+                  const numberIndexType = dependenciesTypes.getNumberIndexType();
+                  types = numberIndexType ? unrollUnionMembers(numberIndexType) : [];
+                }
+                for (const depType of types) {
                   const depLayerResult = yield* pipe(
-                    typeParser.layerType(depType, depExpression),
+                    typeParser.layerType(depType, options),
                     orElse2(() => void_)
                   );
                   if (depLayerResult) {
@@ -4221,7 +4231,7 @@ var missingReturnYieldStar = createDiagnostic({
                 }] : [];
                 report({
                   location: node,
-                  messageText: `Yielded Effect never succeeds, so it is best to use a 'return yield*' instead.`,
+                  messageText: `It is recommended to use return yield* for Effects that never succeed to signal a definitive exit point for type narrowing and tooling support.`,
                   fixes: fix
                 });
               }
@@ -5300,6 +5310,7 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
     }
   }
   const mapFromBarrelToNamespace = /* @__PURE__ */ new Map();
+  const mapFromBarrelToBarrel = /* @__PURE__ */ new Map();
   const mapFromNamespaceToBarrel = /* @__PURE__ */ new Map();
   const mapFilenameToModuleAlias = /* @__PURE__ */ new Map();
   const mapFilenameToExportExcludes = /* @__PURE__ */ new Map();
@@ -5320,7 +5331,7 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
     mapFilenameToModuleName.set(realPath, absoluteName);
   };
   const collectImportCache = fn("TypeScriptApi")(
-    function* (packagePatterns, kind) {
+    function* (packagePatterns, kind, topLevelNamedReexports) {
       for (const packagePattern of packagePatterns) {
         const packageNames = tsUtils.resolveModulePattern(fromSourceFile, packagePattern);
         for (const packageName of packageNames) {
@@ -5370,11 +5381,28 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
             }
             if (isPackageRoot) {
               for (const namedExport of reExports.namedExports) {
-                mapFilenameToExportExcludes.set(barrelSourceFile.fileName, [
-                  ...mapFilenameToExportExcludes.get(barrelSourceFile.fileName) || [],
-                  namedExport.name
-                ]);
-                break;
+                if (topLevelNamedReexports === "ignore") {
+                  mapFilenameToExportExcludes.set(barrelSourceFile.fileName, [
+                    ...mapFilenameToExportExcludes.get(barrelSourceFile.fileName) || [],
+                    namedExport.name
+                  ]);
+                } else if (topLevelNamedReexports === "follow") {
+                  const reexportedFile = ts.resolveModuleName(
+                    namedExport.moduleSpecifier.text,
+                    barrelSourceFile.fileName,
+                    program.getCompilerOptions(),
+                    host
+                  );
+                  if (!reexportedFile) continue;
+                  if (!reexportedFile.resolvedModule) continue;
+                  mapFromBarrelToBarrel.set(barrelSourceFile.fileName, {
+                    ...mapFromBarrelToBarrel.get(barrelSourceFile.fileName) || {},
+                    [namedExport.name]: {
+                      fileName: reexportedFile.resolvedModule.resolvedFileName,
+                      exportName: namedExport.name
+                    }
+                  });
+                }
               }
             }
           }
@@ -5382,8 +5410,12 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
       }
     }
   );
-  yield* collectImportCache(languageServicePluginOptions.namespaceImportPackages, "namespace");
-  yield* collectImportCache(languageServicePluginOptions.barrelImportPackages, "barrel");
+  yield* collectImportCache(
+    languageServicePluginOptions.namespaceImportPackages,
+    "namespace",
+    languageServicePluginOptions.topLevelNamedReexports
+  );
+  yield* collectImportCache(languageServicePluginOptions.barrelImportPackages, "barrel", "ignore");
   const resolveModuleName = (fileName) => {
     const fixedModuleName = mapFilenameToModuleName.get(fileName);
     if (fixedModuleName) return fixedModuleName;
@@ -5401,6 +5433,18 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
   const resolve = (exportFileName, exportName) => {
     const excludedExports = mapFilenameToExportExcludes.get(exportFileName);
     if (excludedExports && excludedExports.includes(exportName)) return;
+    const mapToBarrelRewritten = mapFromBarrelToBarrel.get(exportFileName);
+    if (mapToBarrelRewritten && exportName in mapToBarrelRewritten) {
+      const reexportedFile = mapToBarrelRewritten[exportName];
+      if (reexportedFile) {
+        return {
+          _tag: "NamedImport",
+          fileName: reexportedFile.fileName,
+          moduleName: resolveModuleName(reexportedFile.fileName),
+          name: exportName
+        };
+      }
+    }
     const mapToNamespace = mapFromBarrelToNamespace.get(exportFileName);
     if (mapToNamespace && exportName in mapToNamespace) {
       const namespacedFileName = mapToNamespace[exportName];