@effect/language-service 0.44.1 → 0.45.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/language-service",
-  "version": "0.44.1",
+  "version": "0.45.1",
   "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)));
@@ -1195,14 +1195,19 @@ var defaults = {
     target: "service",
     pattern: "default",
     skipLeadingPath: ["src/"]
-  }]
+  }, {
+    target: "custom",
+    pattern: "default",
+    skipLeadingPath: ["src/"]
+  }],
+  extendedKeyDetection: false
 };
 function parseKeyPatterns(patterns) {
   const result = [];
   for (const entry of patterns) {
     if (!isObject(entry)) continue;
     result.push({
-      target: hasProperty(entry, "target") && isString(entry.target) && ["service", "error"].includes(entry.target.toLowerCase()) ? entry.target.toLowerCase() : "service",
+      target: hasProperty(entry, "target") && isString(entry.target) && ["service", "error", "custom"].includes(entry.target.toLowerCase()) ? entry.target.toLowerCase() : "service",
       pattern: hasProperty(entry, "pattern") && isString(entry.pattern) && ["package-identifier", "default"].includes(entry.pattern.toLowerCase()) ? entry.pattern.toLowerCase() : "default",
       skipLeadingPath: hasProperty(entry, "skipLeadingPath") && isArray(entry.skipLeadingPath) && entry.skipLeadingPath.every(isString) ? entry.skipLeadingPath : ["src/"]
     });
@@ -1228,7 +1233,8 @@ function parse(config) {
     topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && ["ignore", "follow"].includes(config.topLevelNamedReexports.toLowerCase()) ? config.topLevelNamedReexports.toLowerCase() : defaults.topLevelNamedReexports,
     renames: isObject(config) && hasProperty(config, "renames") && isBoolean(config.renames) ? config.renames : defaults.renames,
     noExternal: isObject(config) && hasProperty(config, "noExternal") && isBoolean(config.noExternal) ? config.noExternal : defaults.noExternal,
-    keyPatterns: isObject(config) && hasProperty(config, "keyPatterns") && isArray(config.keyPatterns) ? parseKeyPatterns(config.keyPatterns) : defaults.keyPatterns
+    keyPatterns: isObject(config) && hasProperty(config, "keyPatterns") && isArray(config.keyPatterns) ? parseKeyPatterns(config.keyPatterns) : defaults.keyPatterns,
+    extendedKeyDetection: isObject(config) && hasProperty(config, "extendedKeyDetection") && isBoolean(config.extendedKeyDetection) ? config.extendedKeyDetection : defaults.extendedKeyDetection
   };
 }
 
@@ -3551,6 +3557,62 @@ var deterministicKeys = createDiagnostic({
   apply: fn("deterministicKeys.apply")(function* (sourceFile, report) {
     const ts = yield* service(TypeScriptApi);
     const typeParser = yield* service(TypeParser);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const typeScriptUtils = yield* service(TypeScriptUtils);
+    const options = yield* service(LanguageServicePluginOptions);
+    const parseExtendsCustom = cachedBy(
+      fn("parseExtendsCustom")(function* (classDeclaration) {
+        if (!options.extendedKeyDetection) {
+          return yield* typeParserIssue("Extended key detection is disabled", void 0, classDeclaration);
+        }
+        if (!classDeclaration.name) {
+          return yield* typeParserIssue("Class has no name", void 0, classDeclaration);
+        }
+        if (!ts.isIdentifier(classDeclaration.name)) {
+          return yield* typeParserIssue("Class name is not an identifier", void 0, classDeclaration);
+        }
+        const heritageClauses = classDeclaration.heritageClauses;
+        if (!heritageClauses) {
+          return yield* typeParserIssue("Class has no heritage clauses", void 0, classDeclaration);
+        }
+        const nodeToVisit2 = [...classDeclaration.heritageClauses];
+        const appendNodeToVisit2 = (node) => {
+          nodeToVisit2.push(node);
+          return void 0;
+        };
+        while (nodeToVisit2.length > 0) {
+          const node = nodeToVisit2.shift();
+          if (ts.isCallExpression(node)) {
+            for (let i = 0; i < node.arguments.length; i++) {
+              const arg = node.arguments[i];
+              if (!ts.isStringLiteral(arg)) continue;
+              const resolvedSignature = typeChecker.getResolvedSignature(node);
+              if (resolvedSignature) {
+                const parameter = resolvedSignature.parameters[i];
+                if (!parameter) continue;
+                if (parameter.declarations) {
+                  for (const declaration of parameter.declarations) {
+                    const parameterSourceFile = typeScriptUtils.getSourceFileOfNode(declaration);
+                    const paramText = parameterSourceFile.text.substring(declaration.pos, declaration.end);
+                    if (paramText.toLowerCase().includes("@effect-identifier")) {
+                      return { className: classDeclaration.name, keyStringLiteral: arg, target: "custom" };
+                    }
+                  }
+                }
+              }
+            }
+          }
+          ts.forEachChild(node, appendNodeToVisit2);
+        }
+        return yield* typeParserIssue(
+          "Class does not extend any custom pattern",
+          void 0,
+          classDeclaration
+        );
+      }),
+      "deterministicKeys.parseExtendsCustom",
+      (classDeclaration) => classDeclaration
+    );
     const nodeToVisit = [];
     const appendNodeToVisit = (node) => {
       nodeToVisit.push(node);
@@ -3574,12 +3636,13 @@ var deterministicKeys = createDiagnostic({
               map4(({ className, keyStringLiteral }) => ({ keyStringLiteral, className, target: "error" }))
             )
           ),
+          orElse2(() => parseExtendsCustom(node)),
           orElse2(() => void_)
         );
         if (result && result.keyStringLiteral) {
-          const { className, keyStringLiteral } = result;
+          const { className, keyStringLiteral, target } = result;
           const classNameText = ts.idText(className);
-          const expectedKey = yield* createString(sourceFile, classNameText, result.target);
+          const expectedKey = yield* createString(sourceFile, classNameText, target);
           if (!expectedKey) continue;
           const actualIdentifier = keyStringLiteral.text;
           if (actualIdentifier !== expectedKey) {
@@ -5077,17 +5140,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;
             }