@effect/language-service 0.72.1 → 0.73.1

package/index.js

@@ -4247,7 +4247,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 match3;
     while ((match3 = regex.exec(sourceFile.text)) !== null) {
       const nextLineCaptureGroup = match3[1];
@@ -4296,8 +4296,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) => ({
@@ -4346,14 +4348,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;
@@ -4943,7 +4953,9 @@ function make7(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";
       }
@@ -5350,7 +5362,7 @@ function make7(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);
@@ -6784,6 +6796,7 @@ var contextSelfInClasses = createCompletion({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -12099,50 +12112,90 @@ var effectSchemaSelfInClasses = createCompletion({
         isSnippet: true
       });
     }
-    const hasTaggedErrorCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedError")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedErrorCompletion) {
-      completions2.push({
-        name: `TaggedError<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}` : `TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedErrorCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedError")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedErrorCompletion) {
+        completions2.push({
+          name: `TaggedError<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}` : `TaggedError<${name}>()("${errorTagKey}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTaggedClassCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedClass")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedClassCompletion) {
-      completions2.push({
-        name: `TaggedClass<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedClass<${name}>()("${name}", {${"${0}"}}){}` : `TaggedClass<${name}>()("${name}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedClass")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedClassCompletion) {
+        completions2.push({
+          name: `TaggedClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedClass<${name}>()("${name}", {${"${0}"}}){}` : `TaggedClass<${name}>()("${name}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTaggedRequestCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedRequest")(accessedObject),
-        option
-      )
-    );
-    if (hasTaggedRequestCompletion) {
-      completions2.push({
-        name: `TaggedRequest<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${schemaIdentifier}.TaggedRequest<${name}>()("${name}", {${"${0}"}}){}` : `TaggedRequest<${name}>()("${name}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTaggedRequestCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("TaggedRequest")(accessedObject),
+          option
+        )
+      );
+      if (hasTaggedRequestCompletion) {
+        completions2.push({
+          name: `TaggedRequest<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.TaggedRequest<${name}>()("${name}", {${"${0}"}}){}` : `TaggedRequest<${name}>()("${name}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
+    }
+    if (typeParser.supportedEffect() === "v4") {
+      const hasErrorClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("ErrorClass")(accessedObject),
+          option
+        )
+      );
+      if (hasErrorClassCompletion) {
+        completions2.push({
+          name: `ErrorClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.ErrorClass<${name}>()({${"${0}"}}){}` : `ErrorClass<${name}>()({${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
+    }
+    if (typeParser.supportedEffect() === "v4") {
+      const hasRequestClassCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectSchemaModuleApi("RequestClass")(accessedObject),
+          option
+        )
+      );
+      if (hasRequestClassCompletion) {
+        completions2.push({
+          name: `RequestClass<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${schemaIdentifier}.RequestClass<${name}>("${name}")({${"${0}"}}){}` : `RequestClass<${name}>("${name}")({${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
     return completions2;
   })
@@ -12167,35 +12220,39 @@ var effectSelfInClasses = createCompletion({
     const name = ts.idText(className);
     const tagKey = (yield* createString(sourceFile, name, "service")) || name;
     const completions2 = [];
-    const hasServiceCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectModuleApi("Service")(accessedObject),
-        option
-      )
-    );
-    if (hasServiceCompletion) {
-      completions2.push({
-        name: `Service<${name}>`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${effectIdentifier}.Service<${name}>()("${tagKey}", {${"${0}"}}){}` : `Service<${name}>()("${tagKey}", {${"${0}"}}){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasServiceCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("Service")(accessedObject),
+          option
+        )
+      );
+      if (hasServiceCompletion) {
+        completions2.push({
+          name: `Service<${name}>`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${effectIdentifier}.Service<${name}>()("${tagKey}", {${"${0}"}}){}` : `Service<${name}>()("${tagKey}", {${"${0}"}}){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
-    const hasTagCompletion = isFullyQualified || isSome2(
-      yield* pipe(
-        typeParser.isNodeReferenceToEffectModuleApi("Tag")(accessedObject),
-        option
-      )
-    );
-    if (hasTagCompletion) {
-      completions2.push({
-        name: `Tag("${name}")`,
-        kind: ts.ScriptElementKind.constElement,
-        insertText: isFullyQualified ? `${effectIdentifier}.Tag("${tagKey}")<${name}, {${"${0}"}}>(){}` : `Tag("${tagKey}")<${name}, {${"${0}"}}>(){}`,
-        replacementSpan,
-        isSnippet: true
-      });
+    if (typeParser.supportedEffect() === "v3") {
+      const hasTagCompletion = isFullyQualified || isSome2(
+        yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("Tag")(accessedObject),
+          option
+        )
+      );
+      if (hasTagCompletion) {
+        completions2.push({
+          name: `Tag("${name}")`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: isFullyQualified ? `${effectIdentifier}.Tag("${tagKey}")<${name}, {${"${0}"}}>(){}` : `Tag("${tagKey}")<${name}, {${"${0}"}}>(){}`,
+          replacementSpan,
+          isSnippet: true
+        });
+      }
     }
     return completions2;
   })
@@ -12208,6 +12265,7 @@ var effectSqlModelSelfInClasses = createCompletion({
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
     const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -12324,6 +12382,8 @@ var rpcMakeClasses = createCompletion({
   apply: fn("rpcMakeClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
+    const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseDataForExtendsClassCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos;
@@ -12350,6 +12410,8 @@ var schemaBrand = createCompletion({
   apply: fn("schemaBrand")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const tsUtils = yield* service(TypeScriptUtils);
+    const typeParser = yield* service(TypeParser);
+    if (typeParser.supportedEffect() === "v4") return [];
     const maybeInfos = tsUtils.parseAccessedExpressionForCompletion(sourceFile, position);
     if (!maybeInfos) return [];
     const { accessedObject } = maybeInfos;