@effect/language-service 0.45.0 → 0.46.0

package/package.json

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

package/transform.js

@@ -24,7 +24,7 @@ __export(transform_exports, {
 });
 module.exports = __toCommonJS(transform_exports);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Function.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Function.js
 var isFunction = (input) => typeof input === "function";
 var dual = function(arity, body) {
   if (typeof arity === "function") {
@@ -118,7 +118,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/GlobalValue.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/GlobalValue.js
 var globalStoreId = `effect/GlobalValue`;
 var globalStore;
 var globalValue = (id, compute) => {
@@ -132,7 +132,7 @@ var globalValue = (id, compute) => {
   return globalStore.get(id);
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Predicate.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Predicate.js
 var isString = (input) => typeof input === "string";
 var isNumber = (input) => typeof input === "number";
 var isBoolean = (input) => typeof input === "boolean";
@@ -142,7 +142,7 @@ var isObject = (input) => isRecordOrArray(input) || isFunction2(input);
 var hasProperty = /* @__PURE__ */ dual(2, (self, property) => isObject(self) && property in self);
 var isRecord = (input) => isRecordOrArray(input) && !Array.isArray(input);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Utils.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var GenKindImpl = class {
   value;
@@ -264,7 +264,7 @@ var internalCall = isNotOptimizedAway ? standard.effect_internal_function : forc
 var genConstructor = function* () {
 }.constructor;
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Hash.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Hash.js
 var randomHashCache = /* @__PURE__ */ globalValue(/* @__PURE__ */ Symbol.for("effect/Hash/randomHashCache"), () => /* @__PURE__ */ new WeakMap());
 var symbol = /* @__PURE__ */ Symbol.for("effect/Hash");
 var hash = (self) => {
@@ -363,7 +363,7 @@ var cached = function() {
   return hash2;
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Equal.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Equal.js
 var symbol2 = /* @__PURE__ */ Symbol.for("effect/Equal");
 function equals() {
   if (arguments.length === 1) {
@@ -417,7 +417,7 @@ function compareBoth(self, that) {
 var isEqual = (u) => hasProperty(u, symbol2);
 var equivalence = () => equals;
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Inspectable.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJSON = (x) => {
   try {
@@ -469,7 +469,7 @@ var redact = (u) => {
   return u;
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Pipeable.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Pipeable.js
 var pipeArguments = (self, args2) => {
   switch (args2.length) {
     case 0:
@@ -502,14 +502,14 @@ var pipeArguments = (self, args2) => {
   }
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/opCodes/effect.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/opCodes/effect.js
 var OP_COMMIT = "Commit";
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/version.js
-var moduleVersion = "3.17.8";
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/version.js
+var moduleVersion = "3.18.4";
 var getCurrentVersion = () => moduleVersion;
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/effectable.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/effectable.js
 var EffectTypeId = /* @__PURE__ */ Symbol.for("effect/Effect");
 var StreamTypeId = /* @__PURE__ */ Symbol.for("effect/Stream");
 var SinkTypeId = /* @__PURE__ */ Symbol.for("effect/Sink");
@@ -596,7 +596,7 @@ var StructuralCommitPrototype = {
   ...StructuralPrototype
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/option.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/option.js
 var TypeId = /* @__PURE__ */ Symbol.for("effect/Option");
 var CommonProto = {
   ...EffectPrototype,
@@ -654,7 +654,7 @@ var some = (value) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/either.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/either.js
 var TypeId2 = /* @__PURE__ */ Symbol.for("effect/Either");
 var CommonProto2 = {
   ...EffectPrototype,
@@ -716,7 +716,7 @@ var right = (right3) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Either.js
 var right2 = right;
 var left2 = left;
 var isLeft2 = isLeft;
@@ -724,14 +724,14 @@ var isRight2 = isRight;
 var map = /* @__PURE__ */ dual(2, (self, f) => isRight2(self) ? right2(f(self.right)) : left2(self.left));
 var getOrElse = /* @__PURE__ */ dual(2, (self, onLeft) => isLeft2(self) ? onLeft(self.left) : self.right);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/array.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Order.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Order.js
 var make = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 var string2 = /* @__PURE__ */ make((self, that) => self < that ? -1 : 1);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Option.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Option.js
 var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
@@ -739,7 +739,7 @@ var isSome2 = isSome;
 var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Record.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Record.js
 var map2 = /* @__PURE__ */ dual(2, (self, f) => {
   const out = {
     ...self
@@ -751,7 +751,7 @@ var map2 = /* @__PURE__ */ dual(2, (self, f) => {
 });
 var keys = (self) => Object.keys(self);
 
-// node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/Array.js
+// node_modules/.pnpm/effect@3.18.4/node_modules/effect/dist/esm/Array.js
 var fromIterable = (collection) => Array.isArray(collection) ? collection : Array.from(collection);
 var append = /* @__PURE__ */ dual(2, (self, last) => [...self, last]);
 var appendAll = /* @__PURE__ */ dual(2, (self, that) => fromIterable(self).concat(fromIterable(that)));
@@ -1160,6 +1160,9 @@ var all = fn("all")(
 
 // src/core/LanguageServicePluginOptions.ts
 var LanguageServicePluginOptions = Tag("PluginOptions");
+function isValidSeverityLevel(value) {
+  return value === "off" || value === "error" || value === "warning" || value === "message" || value === "suggestion";
+}
 function parseDiagnosticSeverity(config) {
   if (!isRecord(config)) return {};
   return Object.fromEntries(
@@ -1167,9 +1170,7 @@ function parseDiagnosticSeverity(config) {
       Object.entries(config),
       filter(([key, value]) => isString(key) && isString(value)),
       map3(([key, value]) => [String(key).toLowerCase(), String(value).toLowerCase()]),
-      filter(
-        ([_, value]) => value === "off" || value === "error" || value === "warning" || value === "message" || value === "suggestion"
-      )
+      filter(([_, value]) => isValidSeverityLevel(value))
     )
   );
 }
@@ -1178,6 +1179,7 @@ var defaults = {
   diagnostics: true,
   diagnosticSeverity: {},
   diagnosticsName: true,
+  missingDiagnosticNextLine: "warning",
   quickinfo: true,
   quickinfoEffectParameters: "whentruncated",
   quickinfoMaximumLength: -1,
@@ -1220,6 +1222,7 @@ function parse(config) {
     diagnostics: isObject(config) && hasProperty(config, "diagnostics") && isBoolean(config.diagnostics) ? config.diagnostics : defaults.diagnostics,
     diagnosticSeverity: isObject(config) && hasProperty(config, "diagnosticSeverity") && isRecord(config.diagnosticSeverity) ? parseDiagnosticSeverity(config.diagnosticSeverity) : defaults.diagnosticSeverity,
     diagnosticsName: isObject(config) && hasProperty(config, "diagnosticsName") && isBoolean(config.diagnosticsName) ? config.diagnosticsName : defaults.diagnosticsName,
+    missingDiagnosticNextLine: isObject(config) && hasProperty(config, "missingDiagnosticNextLine") && isString(config.missingDiagnosticNextLine) && isValidSeverityLevel(config.missingDiagnosticNextLine) ? config.missingDiagnosticNextLine : defaults.missingDiagnosticNextLine,
     quickinfo: isObject(config) && hasProperty(config, "quickinfo") && isBoolean(config.quickinfo) ? config.quickinfo : defaults.quickinfo,
     quickinfoEffectParameters: isObject(config) && hasProperty(config, "quickinfoEffectParameters") && isString(config.quickinfoEffectParameters) && ["always", "never", "whentruncated"].includes(config.quickinfoEffectParameters.toLowerCase()) ? config.quickinfoEffectParameters.toLowerCase() : defaults.quickinfoEffectParameters,
     quickinfoMaximumLength: isObject(config) && hasProperty(config, "quickinfoMaximumLength") && isNumber(config.quickinfoMaximumLength) ? config.quickinfoMaximumLength : defaults.quickinfoMaximumLength,
@@ -1893,7 +1896,8 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
                   lineOverrides[ruleName].unshift({
                     pos: foundNode.node.pos,
                     end: foundNode.node.end,
-                    level: ruleLevel
+                    level: ruleLevel,
+                    commentRange: foundNode.commentRange
                   });
                 }
               } else {
@@ -1966,6 +1970,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
           fixes: entry.fixes.concat(node ? [fixByDisableNextLine(node)] : []).concat([fixByDisableEntireFile])
         });
       });
+      const unusedLineOverrides = new Set(lineOverrides[ruleNameLowered] || []);
       for (const emitted of applicableDiagnostics.slice(0)) {
         let newLevel = defaultLevel;
         const lineOverride = (lineOverrides[ruleNameLowered] || []).find(
@@ -1973,6 +1978,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
         );
         if (lineOverride) {
           newLevel = lineOverride.level;
+          unusedLineOverrides.delete(lineOverride);
         } else {
           const sectionOverride = (sectionOverrides[ruleNameLowered] || []).find((_) => _.pos < emitted.range.pos);
           if (sectionOverride) newLevel = sectionOverride.level;
@@ -1996,6 +2002,19 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
           });
         }
       }
+      if (pluginOptions.missingDiagnosticNextLine !== "off" && unusedLineOverrides.size > 0) {
+        for (const unusedLineOverride of unusedLineOverrides) {
+          diagnostics2.push({
+            file: sourceFile,
+            start: unusedLineOverride.commentRange.pos,
+            length: unusedLineOverride.commentRange.end - unusedLineOverride.commentRange.pos,
+            messageText: `@effect-diagnostics-next-line ${rule.name}:${unusedLineOverride.level} has no effect, make sure you are suppressing the right rule.`,
+            category: levelToDiagnosticCategory[pluginOptions.missingDiagnosticNextLine],
+            code: -1,
+            source: "effect"
+          });
+        }
+      }
       return { diagnostics: diagnostics2, codeFixes };
     });
     return { execute };
@@ -4044,6 +4063,7 @@ var leakingRequirements = createDiagnostic({
     const typeChecker = yield* service(TypeCheckerApi);
     const typeCheckerUtils = yield* service(TypeCheckerUtils);
     const typeParser = yield* service(TypeParser);
+    const tsUtils = yield* service(TypeScriptUtils);
     const parseLeakedRequirements = cachedBy(
       fn("leakingServices.checkServiceLeaking")(
         function* (service2, atLocation) {
@@ -4101,7 +4121,21 @@ var leakingRequirements = createDiagnostic({
             }
           }
           if (sharedRequirementsKeys && sharedRequirementsKeys.length > 0 && effectMembers >= 2) {
-            return sharedRequirementsKeys.map((key) => memory.get(key));
+            return sharedRequirementsKeys.map((key) => memory.get(key)).filter(
+              (type) => {
+                let symbol3 = type.symbol;
+                if (symbol3 && symbol3.flags & ts.SymbolFlags.Alias) {
+                  symbol3 = typeChecker.getAliasedSymbol(symbol3);
+                }
+                return !(symbol3.declarations || []).some((declaration) => {
+                  const declarationSource = tsUtils.getSourceFileOfNode(declaration);
+                  if (!declarationSource) return false;
+                  return declarationSource.text.substring(declaration.pos, declaration.end).toLowerCase().indexOf(
+                    "@effect-leakable-service"
+                  ) > -1;
+                });
+              }
+            );
           }
           return [];
         }
@@ -4114,7 +4148,7 @@ var leakingRequirements = createDiagnostic({
       report({
         location: node,
         messageText: `This Service is leaking the ${requirements.map((_) => typeChecker.typeToString(_)).join(" | ")} requirement.
-If these requirements cannot be cached and are expected to be provided per method invocation (e.g. HttpServerRequest), you can safely disable this diagnostic for this line through quickfixes.
+If these requirements cannot be cached and are expected to be provided per method invocation (e.g. HttpServerRequest), you can either safely disable this diagnostic for this line through quickfixes or mark the service declaration with a JSDoc @effect-leakable-service.
 More info at https://effect.website/docs/requirements-management/layers/#avoiding-requirement-leakage`,
         fixes: []
       });
@@ -5140,17 +5174,67 @@ var overriddenSchemaConstructor = createDiagnostic({
           const members = node.members;
           for (const member of members) {
             if (ts.isConstructorDeclaration(member)) {
+              const fixAsStaticNew = {
+                fixName: "overriddenSchemaConstructor_static",
+                description: "Rewrite using the static 'new' pattern",
+                apply: gen(function* () {
+                  const changeTracker = yield* service(ChangeTracker);
+                  const visitor = (node2) => {
+                    if (ts.isExpressionStatement(node2) && ts.isCallExpression(node2.expression) && ts.isToken(node2.expression.expression) && node2.expression.expression.kind === ts.SyntaxKind.SuperKeyword) {
+                      const constructThis = ts.factory.createNewExpression(
+                        ts.factory.createIdentifier("this"),
+                        void 0,
+                        node2.expression.arguments
+                      );
+                      return ts.factory.createVariableStatement(
+                        void 0,
+                        ts.factory.createVariableDeclarationList(
+                          [ts.factory.createVariableDeclaration(
+                            "_this",
+                            void 0,
+                            void 0,
+                            constructThis
+                          )],
+                          ts.NodeFlags.Const
+                        )
+                      );
+                    }
+                    if (ts.isToken(node2) && node2.kind === ts.SyntaxKind.ThisKeyword) {
+                      return ts.factory.createIdentifier("_this");
+                    }
+                    return ts.visitEachChild(node2, visitor, ts.nullTransformationContext);
+                  };
+                  const newBody = visitor(member.body);
+                  const bodyWithReturn = ts.factory.updateBlock(
+                    newBody,
+                    newBody.statements.concat([
+                      ts.factory.createReturnStatement(ts.factory.createIdentifier("_this"))
+                    ])
+                  );
+                  const newMethod = ts.factory.createMethodDeclaration(
+                    ts.factory.createModifiersFromModifierFlags(ts.ModifierFlags.Public | ts.ModifierFlags.Static),
+                    void 0,
+                    "new",
+                    void 0,
+                    member.typeParameters,
+                    member.parameters,
+                    member.type,
+                    bodyWithReturn
+                  );
+                  changeTracker.replaceNode(sourceFile, member, newMethod);
+                })
+              };
               report({
                 location: member,
-                messageText: "Classes extending Schema must not override the constructor",
-                fixes: [{
+                messageText: "Classes extending Schema must not override the constructor; this is because it silently breaks the schema decoding behaviour. If that's needed, we recommend instead to use a static 'new' method that constructs the instance.",
+                fixes: (member.body ? [fixAsStaticNew] : []).concat([{
                   fixName: "overriddenSchemaConstructor_fix",
                   description: "Remove the constructor override",
                   apply: gen(function* () {
                     const changeTracker = yield* service(ChangeTracker);
                     changeTracker.delete(sourceFile, member);
                   })
-                }]
+                }])
               });
               break;
             }