@effect/language-service 0.72.1 → 0.73.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/language-service",
-  "version": "0.72.1",
+  "version": "0.73.1",
   "description": "A Language-Service Plugin to Refactor and Diagnostic effect-ts projects",
   "main": "index.cjs",
   "bin": {

package/transform.js

@@ -1967,7 +1967,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
     const lineOverrides = {};
     const sectionOverrides = {};
     const skippedRules = [];
-    const regex = /@effect-diagnostics(-next-line)?((?:\s[a-zA-Z0-9/]+:(?:off|warning|error|message|suggestion|skip-file))+)?/gm;
+    const regex = /@effect-diagnostics(-next-line)?((?:\s(?:[a-zA-Z0-9/]+|\*):(?:off|warning|error|message|suggestion|skip-file))+)?/gm;
     let match2;
     while ((match2 = regex.exec(sourceFile.text)) !== null) {
       const nextLineCaptureGroup = match2[1];
@@ -2016,8 +2016,10 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       const codeFixes = [];
       const ruleNameLowered = rule.name.toLowerCase();
       const defaultLevel = pluginOptions.diagnosticSeverity[ruleNameLowered] || rule.severity;
-      if (skippedRules.indexOf(ruleNameLowered) > -1) return { diagnostics: diagnostics2, codeFixes };
-      if (defaultLevel === "off" && (lineOverrides[ruleNameLowered] || sectionOverrides[ruleNameLowered] || []).length === 0) {
+      if (skippedRules.indexOf(ruleNameLowered) > -1 || skippedRules.indexOf("*") > -1) {
+        return { diagnostics: diagnostics2, codeFixes };
+      }
+      if (defaultLevel === "off" && (lineOverrides[ruleNameLowered] || sectionOverrides[ruleNameLowered] || lineOverrides["*"] || sectionOverrides["*"] || []).length === 0) {
         return { diagnostics: diagnostics2, codeFixes };
       }
       const fixByDisableNextLine = (node) => ({
@@ -2066,14 +2068,22 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       const unusedLineOverrides = new Set(lineOverrides[ruleNameLowered] || []);
       for (const emitted of applicableDiagnostics.slice(0)) {
         let newLevel = defaultLevel;
-        const lineOverride = (lineOverrides[ruleNameLowered] || []).find(
+        const specificLineOverride = (lineOverrides[ruleNameLowered] || []).find(
           (_) => _.pos < emitted.range.pos && _.end >= emitted.range.end
         );
+        const wildcardLineOverride = (lineOverrides["*"] || []).find(
+          (_) => _.pos < emitted.range.pos && _.end >= emitted.range.end
+        );
+        const lineOverride = specificLineOverride && wildcardLineOverride ? specificLineOverride.pos >= wildcardLineOverride.pos ? specificLineOverride : wildcardLineOverride : specificLineOverride || wildcardLineOverride;
         if (lineOverride) {
           newLevel = lineOverride.level;
           unusedLineOverrides.delete(lineOverride);
         } else {
-          const sectionOverride = (sectionOverrides[ruleNameLowered] || []).find((_) => _.pos < emitted.range.pos);
+          const specificSectionOverride = (sectionOverrides[ruleNameLowered] || []).find(
+            (_) => _.pos < emitted.range.pos
+          );
+          const wildcardSectionOverride = (sectionOverrides["*"] || []).find((_) => _.pos < emitted.range.pos);
+          const sectionOverride = specificSectionOverride && wildcardSectionOverride ? specificSectionOverride.pos >= wildcardSectionOverride.pos ? specificSectionOverride : wildcardSectionOverride : specificSectionOverride || wildcardSectionOverride;
           if (sectionOverride) newLevel = sectionOverride.level;
         }
         if (!(newLevel in levelToDiagnosticCategory)) continue;
@@ -2597,7 +2607,9 @@ function make2(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
       const sourceFile = program.getSourceFile(fileName);
       if (!sourceFile) continue;
       const resolvedPackages = getEffectRelatedPackages(sourceFile);
-      for (const version of Object.keys(resolvedPackages["effect"])) {
+      const effectPkgs = resolvedPackages["effect"];
+      if (!effectPkgs) continue;
+      for (const version of Object.keys(effectPkgs)) {
         if (String(version).startsWith("4")) return "v4";
         if (String(version).startsWith("3")) return "v3";
       }
@@ -3004,7 +3016,7 @@ function make2(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     fn("TypeParser.isEffectDataSourceFile")(function* (sourceFile) {
       const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
       if (!moduleSymbol) return yield* typeParserIssue("Node has no symbol", void 0, sourceFile);
-      const taggedEnumSymbol = typeChecker.tryGetMemberInModuleExports("TaggedEnum", moduleSymbol);
+      const taggedEnumSymbol = typeChecker.tryGetMemberInModuleExports("TaggedEnum", moduleSymbol) || typeChecker.tryGetMemberInModuleExports("taggedEnum", moduleSymbol);
       if (!taggedEnumSymbol) return yield* typeParserIssue("TaggedEnum not found", void 0, sourceFile);
       const taggedErrorSymbol = typeChecker.tryGetMemberInModuleExports("TaggedError", moduleSymbol);
       if (!taggedErrorSymbol) return yield* typeParserIssue("TaggedError not found", void 0, sourceFile);