@effect/language-service 0.16.7 → 0.17.1

package/README.md

@@ -45,6 +45,7 @@ And you're done! You'll now be able to use a set of refactor and diagnostics tha
 ### Completions
 
 - Autocomplete 'Self' in Effect.Service, Context.Tag, Schema.TaggedClass, Schema.TaggedRequest and family
+- Autocomplete Effect.gen with `function*(){}`
 
 ### Refactors
 

package/index.js

@@ -159,13 +159,13 @@ var array = (item) => make((self, that) => {
 });
 
 // node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/doNotation.js
-var let_ = (map4) => dual(3, (self, name, f) => map4(self, (a) => Object.assign({}, a, {
+var let_ = (map5) => dual(3, (self, name, f) => map5(self, (a) => Object.assign({}, a, {
   [name]: f(a)
 })));
-var bindTo = (map4) => dual(2, (self, name) => map4(self, (a) => ({
+var bindTo = (map5) => dual(2, (self, name) => map5(self, (a) => ({
   [name]: a
 })));
-var bind = (map4, flatMap4) => dual(3, (self, name, f) => flatMap4(self, (a) => map4(f(a), (b) => Object.assign({}, a, {
+var bind = (map5, flatMap4) => dual(3, (self, name, f) => flatMap4(self, (a) => map5(f(a), (b) => Object.assign({}, a, {
   [name]: b
 }))));
 
@@ -907,6 +907,7 @@ var getOrElse2 = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? onNon
 var orElse2 = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var fromNullable2 = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
 var getOrUndefined2 = /* @__PURE__ */ getOrElse2(constUndefined);
+var map2 = /* @__PURE__ */ dual(2, (self, f) => isNone2(self) ? none2() : some2(f(self.value)));
 
 // node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Array.js
 var fromIterable = (collection) => Array.isArray(collection) ? collection : Array.from(collection);
@@ -936,7 +937,7 @@ var sort = /* @__PURE__ */ dual(2, (self, O) => {
   return out;
 });
 var empty = () => [];
-var map2 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
+var map3 = /* @__PURE__ */ dual(2, (self, f) => self.map(f));
 var flatMap2 = /* @__PURE__ */ dual(2, (self, f) => {
   if (isEmptyReadonlyArray(self)) {
     return [];
@@ -1052,7 +1053,7 @@ var flatMap3 = dual(2, (fa, f) => make3((ctx) => {
   if (result._tag !== "Right") return result;
   return f(result.value).run(ctx);
 }));
-var map3 = dual(2, (fa, f) => make3((ctx) => {
+var map4 = dual(2, (fa, f) => make3((ctx) => {
   const result = fa.run(ctx);
   if (result._tag !== "Right") return result;
   return makeInternalSuccess(f(result.value));
@@ -1372,50 +1373,62 @@ var tryPreserveDeclarationSemantics = fn("AST.tryPreserveDeclarationSemantics")(
     return node;
   }
 );
+var parseAccessedExpressionForCompletion = fn(
+  "AST.parseAccessedExpressionForCompletion"
+)(
+  function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const precedingToken = ts.findPrecedingToken(position, sourceFile, void 0, true);
+    if (!precedingToken) return yield* fail(new NodeNotFoundError());
+    let accessedObject = precedingToken;
+    let replacementSpan = ts.createTextSpan(position, 0);
+    let outerNode = precedingToken;
+    if (ts.isIdentifier(precedingToken) && precedingToken.parent && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.parent.getStart(sourceFile),
+        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+      );
+      accessedObject = precedingToken.parent.expression;
+      outerNode = precedingToken.parent;
+    } else if (ts.isToken(precedingToken) && precedingToken.kind === ts.SyntaxKind.DotToken && ts.isPropertyAccessExpression(precedingToken.parent)) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.parent.getStart(sourceFile),
+        precedingToken.end - precedingToken.parent.getStart(sourceFile)
+      );
+      accessedObject = precedingToken.parent.expression;
+      outerNode = precedingToken.parent;
+    } else if (ts.isIdentifier(precedingToken) && precedingToken.parent) {
+      replacementSpan = ts.createTextSpan(
+        precedingToken.getStart(sourceFile),
+        precedingToken.end - precedingToken.getStart(sourceFile)
+      );
+      accessedObject = precedingToken;
+      outerNode = precedingToken;
+    } else {
+      return yield* fail(new NodeNotFoundError());
+    }
+    return { accessedObject, outerNode, replacementSpan };
+  }
+);
 var parseDataForExtendsClassCompletion = fn(
   "AST.parseDataForExtendsClassCompletion"
 )(function* (sourceFile, position) {
   const ts = yield* service(TypeScriptApi);
-  const precedingToken = ts.findPrecedingToken(position, sourceFile, void 0, true);
-  if (!precedingToken) return none2();
-  let accessedObject = precedingToken;
-  let replacementSpan = ts.createTextSpan(position, 0);
-  let outerNode = precedingToken;
-  if (ts.isIdentifier(precedingToken) && precedingToken.parent && ts.isPropertyAccessExpression(precedingToken.parent)) {
-    replacementSpan = ts.createTextSpan(
-      precedingToken.parent.getStart(sourceFile),
-      precedingToken.end - precedingToken.parent.getStart(sourceFile)
-    );
-    accessedObject = precedingToken.parent.expression;
-    outerNode = precedingToken.parent;
-  } else if (ts.isToken(precedingToken) && precedingToken.kind === ts.SyntaxKind.DotToken && ts.isPropertyAccessExpression(precedingToken.parent)) {
-    replacementSpan = ts.createTextSpan(
-      precedingToken.parent.getStart(sourceFile),
-      precedingToken.end - precedingToken.parent.getStart(sourceFile)
-    );
-    accessedObject = precedingToken.parent.expression;
-    outerNode = precedingToken.parent;
-  } else if (ts.isIdentifier(precedingToken) && precedingToken.parent) {
-    replacementSpan = ts.createTextSpan(
-      precedingToken.getStart(sourceFile),
-      precedingToken.end - precedingToken.getStart(sourceFile)
-    );
-    accessedObject = precedingToken;
-    outerNode = precedingToken;
-  } else {
-    return none2();
-  }
-  if (!ts.isIdentifier(accessedObject)) return none2();
+  const { accessedObject, outerNode, replacementSpan } = yield* parseAccessedExpressionForCompletion(sourceFile, position);
+  if (!ts.isIdentifier(accessedObject)) return yield* fail(new NodeNotFoundError());
   let classDeclaration = outerNode.parent;
   while (ts.isExpressionWithTypeArguments(classDeclaration) || ts.isHeritageClause(classDeclaration)) {
     if (!classDeclaration.parent) break;
     classDeclaration = classDeclaration.parent;
   }
-  if (!ts.isClassDeclaration(classDeclaration)) return none2();
-  if (!classDeclaration.name) return none2();
-  return some2(
-    { accessedObject, classDeclaration, className: classDeclaration.name, replacementSpan }
-  );
+  if (!ts.isClassDeclaration(classDeclaration)) return yield* fail(new NodeNotFoundError());
+  if (!classDeclaration.name) return yield* fail(new NodeNotFoundError());
+  return {
+    accessedObject,
+    classDeclaration,
+    className: classDeclaration.name,
+    replacementSpan
+  };
 });
 var createEffectGenCallExpression = fn("AST.createEffectGenCallExpression")(function* (effectModuleIdentifierName, node) {
   const ts = yield* service(TypeScriptApi);
@@ -1493,7 +1506,7 @@ var getSemanticDiagnosticsWithCodeFixes = fn(
       effectDiagnostics.push(
         ...pipe(
           result.value,
-          map2((_) => ({
+          map3((_) => ({
             file: sourceFile,
             start: _.node.getStart(sourceFile),
             length: _.node.getEnd() - _.node.getStart(sourceFile),
@@ -1507,8 +1520,8 @@ var getSemanticDiagnosticsWithCodeFixes = fn(
       effectCodeFixes.push(
         ...pipe(
           result.value,
-          map2(
-            (_) => map2(
+          map3(
+            (_) => map3(
               _.fixes,
               (fix) => ({
                 ...fix,
@@ -1647,7 +1660,9 @@ var contextSelfInClasses = createCompletion({
   name: "effect/contextSelfInClasses",
   apply: fn("contextSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
-    const maybeInfos = yield* parseDataForExtendsClassCompletion(sourceFile, position);
+    const maybeInfos = yield* option(
+      parseDataForExtendsClassCompletion(sourceFile, position)
+    );
     if (isNone2(maybeInfos)) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos.value;
     const contextName = yield* option(
@@ -1678,7 +1693,9 @@ var effectDataClasses = createCompletion({
   name: "effect/effectDataClasses",
   apply: fn("effectDataClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
-    const maybeInfos = yield* parseDataForExtendsClassCompletion(sourceFile, position);
+    const maybeInfos = yield* option(
+      parseDataForExtendsClassCompletion(sourceFile, position)
+    );
     if (isNone2(maybeInfos)) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos.value;
     const dataName = yield* option(
@@ -1715,7 +1732,9 @@ var effectSchemaSelfInClasses = createCompletion({
   name: "effect/effectSchemaSelfInClasses",
   apply: fn("effectSchemaSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
-    const maybeInfos = yield* parseDataForExtendsClassCompletion(sourceFile, position);
+    const maybeInfos = yield* option(
+      parseDataForExtendsClassCompletion(sourceFile, position)
+    );
     if (isNone2(maybeInfos)) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos.value;
     const effectSchemaName = yield* option(
@@ -1764,7 +1783,9 @@ var effectSelfInClasses = createCompletion({
   name: "effect/effectSelfInClasses",
   apply: fn("effectSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
-    const maybeInfos = yield* parseDataForExtendsClassCompletion(sourceFile, position);
+    const maybeInfos = yield* option(
+      parseDataForExtendsClassCompletion(sourceFile, position)
+    );
     if (isNone2(maybeInfos)) return [];
     const { accessedObject, className, replacementSpan } = maybeInfos.value;
     const effectName = yield* option(
@@ -1790,14 +1811,6 @@ var effectSelfInClasses = createCompletion({
   })
 });
 
-// src/completions.ts
-var completions = [
-  effectSchemaSelfInClasses,
-  effectSelfInClasses,
-  contextSelfInClasses,
-  effectDataClasses
-];
-
 // src/core/TypeCheckerApi.ts
 var TypeCheckerApi = Tag("TypeChecker");
 var TypeCheckerApiCache = Tag("TypeCheckerApiCache");
@@ -2303,6 +2316,95 @@ var effectSchemaType = fn("TypeParser.effectSchemaType")(function* (type, atLoca
   return yield* typeParserIssue("Type has no schema variance struct", type, atLocation);
 });
 
+// src/completions/fnFunctionStar.ts
+var fnFunctionStar = createCompletion({
+  name: "effect/fnFunctionStar",
+  apply: fn("fnFunctionStar")(function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const maybeInfos = yield* option(
+      parseAccessedExpressionForCompletion(sourceFile, position)
+    );
+    if (isNone2(maybeInfos)) return [];
+    const { accessedObject } = maybeInfos.value;
+    const isEffectModule = yield* option(importedEffectModule(accessedObject));
+    if (isNone2(isEffectModule)) return [];
+    const span = ts.createTextSpan(
+      accessedObject.end + 1,
+      Math.max(0, position - accessedObject.end - 1)
+    );
+    const maybeFnName = pipe(
+      yield* getAncestorNodesInRange(sourceFile, toTextRange(accessedObject.pos)),
+      filter(ts.isVariableDeclaration),
+      map3((_) => _.name && ts.isIdentifier(_.name) ? _.name.text : ""),
+      filter((_) => _.length > 0),
+      head,
+      map2((name) => [
+        {
+          name: `fn("${name}")`,
+          kind: ts.ScriptElementKind.constElement,
+          insertText: `fn("${name}")(function*(${"${1}"}){${"${0}"}})`,
+          replacementSpan: span,
+          isSnippet: true
+        }
+      ]),
+      getOrElse2(() => [])
+    );
+    return maybeFnName.concat([{
+      name: `fn(function*(){})`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `fn(function*(${"${1}"}){${"${0}"}})`,
+      replacementSpan: span,
+      isSnippet: true
+    }, {
+      name: `fnUntraced(function*(){})`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `fnUntraced(function*(${"${1}"}){${"${0}"}})`,
+      replacementSpan: span,
+      isSnippet: true
+    }]);
+  })
+});
+
+// src/completions/genFunctionStar.ts
+var genFunctionStar = createCompletion({
+  name: "effect/genFunctionStar",
+  apply: fn("genFunctionStar")(function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const maybeInfos = yield* option(
+      parseAccessedExpressionForCompletion(sourceFile, position)
+    );
+    if (isNone2(maybeInfos)) return [];
+    const { accessedObject } = maybeInfos.value;
+    const type = typeChecker.getTypeAtLocation(accessedObject);
+    const genMemberSymbol = type.getProperty("gen");
+    if (!genMemberSymbol) return [];
+    const genType = typeChecker.getTypeOfSymbolAtLocation(genMemberSymbol, accessedObject);
+    if (genType.getCallSignatures().length === 0) return [];
+    const span = ts.createTextSpan(
+      accessedObject.end + 1,
+      Math.max(0, position - accessedObject.end - 1)
+    );
+    return [{
+      name: `gen(function*(){})`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `gen(function*(){${"${0}"}})`,
+      replacementSpan: span,
+      isSnippet: true
+    }];
+  })
+});
+
+// src/completions.ts
+var completions = [
+  effectSchemaSelfInClasses,
+  effectSelfInClasses,
+  contextSelfInClasses,
+  genFunctionStar,
+  fnFunctionStar,
+  effectDataClasses
+];
+
 // src/diagnostics/floatingEffect.ts
 var floatingEffect = createDiagnostic({
   name: "effect/floatingEffect",
@@ -2737,7 +2839,7 @@ var asyncAwaitToGen = createRefactor({
                 (node2) => pipe(
                   importedEffectModule(node2),
                   option,
-                  map3(isSome2)
+                  map4(isSome2)
                 )
               )
             ),
@@ -2809,7 +2911,7 @@ var asyncAwaitToGenTryPromise = createRefactor({
                 (node2) => pipe(
                   importedEffectModule(node2),
                   option,
-                  map3(isSome2)
+                  map4(isSome2)
                 )
               )
             ),
@@ -2920,7 +3022,7 @@ var effectGenToFn = createRefactor({
     });
     const maybeNode = yield* pipe(
       yield* getAncestorNodesInRange(sourceFile, textRange),
-      map2(parseEffectGenNode),
+      map3(parseEffectGenNode),
       firstSuccessOf,
       option
     );
@@ -3055,7 +3157,7 @@ var _findSchemaVariableDeclaration = fn(
     );
     return yield* pipe(
       yield* getAncestorNodesInRange(sourceFile, textRange),
-      map2(findSchema),
+      map3(findSchema),
       firstSuccessOf,
       option
     );
@@ -3348,7 +3450,7 @@ var pipeableToDatafirst = createRefactor({
       filter(
         (node2) => node2.arguments.length > 0
       ),
-      map2((node2) => {
+      map3((node2) => {
         let newNode2 = node2.arguments[0];
         let didSomething = false;
         for (let i = 1; i < node2.arguments.length; i++) {
@@ -3375,7 +3477,7 @@ var pipeableToDatafirst = createRefactor({
         return didSomething ? some2([node2, newNode2]) : none2();
       }),
       filter(isSome2),
-      map2((_) => _.value),
+      map3((_) => _.value),
       head
     );
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
@@ -4089,7 +4191,7 @@ var wrapWithEffectGen = createRefactor({
     );
     const maybeNode = yield* pipe(
       yield* getAncestorNodesInRange(sourceFile, textRange),
-      map2(findEffectToWrap),
+      map3(findEffectToWrap),
       firstSuccessOf,
       option
     );
@@ -4123,7 +4225,7 @@ var getEffectModuleIdentifierName = fn("getEffectModuleIdentifierName")(
           (node) => pipe(
             importedEffectModule(node),
             option,
-            map3(isSome2)
+            map4(isSome2)
           )
         )
       ),