@effect/language-service 0.16.5 → 0.16.7

package/index.js

@@ -2887,21 +2887,31 @@ var effectGenToFn = createRefactor({
     const parseEffectGenNode = fn("asyncAwaitToGen.apply")(function* (node) {
       const effectGen2 = yield* effectGen(node);
       let pipeArgs2 = ts.factory.createNodeArray([]);
-      let nodeToReplace2 = node.parent;
-      if (ts.isPropertyAccessExpression(node.parent) && node.parent.name.text === "pipe" && ts.isCallExpression(node.parent.parent)) {
-        pipeArgs2 = node.parent.parent.arguments;
-        nodeToReplace2 = node.parent.parent.parent;
-      }
-      while (nodeToReplace2) {
-        if (ts.isArrowFunction(nodeToReplace2) || ts.isFunctionDeclaration(nodeToReplace2) || ts.isMethodDeclaration(nodeToReplace2)) {
-          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: nodeToReplace2 };
+      let nodeToReplace2 = node;
+      while (nodeToReplace2.parent) {
+        const parent = nodeToReplace2.parent;
+        if (ts.isConciseBody(nodeToReplace2) && ts.isArrowFunction(parent) && parent.body === nodeToReplace2) {
+          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: parent };
+        }
+        if ((ts.isFunctionDeclaration(parent) || ts.isMethodDeclaration(parent)) && parent.body === nodeToReplace2) {
+          return { ...effectGen2, pipeArgs: pipeArgs2, nodeToReplace: parent };
+        }
+        if (ts.isBlock(parent) && parent.statements.length === 1 && parent.statements[0] === nodeToReplace2) {
+          nodeToReplace2 = parent;
+          continue;
+        }
+        if (ts.isReturnStatement(parent) && parent.expression === nodeToReplace2) {
+          nodeToReplace2 = parent;
+          continue;
         }
-        if (ts.isConciseBody(nodeToReplace2) || ts.isReturnStatement(nodeToReplace2)) {
-          nodeToReplace2 = nodeToReplace2.parent;
+        if (ts.isPropertyAccessExpression(parent) && parent.expression === nodeToReplace2 && parent.name.text === "pipe" && ts.isCallExpression(parent.parent)) {
+          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.parent.arguments));
+          nodeToReplace2 = parent.parent;
           continue;
         }
-        if (ts.isBlock(nodeToReplace2) && nodeToReplace2.statements.length === 1) {
-          nodeToReplace2 = nodeToReplace2.parent;
+        if (ts.isCallExpression(parent) && ts.isIdentifier(parent.expression) && parent.expression.text === "pipe" && parent.arguments.length > 0 && parent.arguments[0] === nodeToReplace2) {
+          pipeArgs2 = ts.factory.createNodeArray(pipeArgs2.concat(parent.arguments.slice(1)));
+          nodeToReplace2 = parent;
           continue;
         }
         break;
@@ -3697,7 +3707,7 @@ var createUnsupportedNodeComment = (ts, sourceFile, node) => ts.addSyntheticTrai
   ts.SyntaxKind.MultiLineCommentTrivia,
   " Not supported conversion: " + node.getText(sourceFile) + " "
 );
-var processNode = (node) => gen2(function* () {
+var processNode = (node, isVirtualTypeNode) => gen2(function* () {
   const { createApiCall, createApiPropertyAccess, entityNameToDataTypeName, sourceFile, ts } = yield* service(
     SchemaGenContext
   );
@@ -3731,12 +3741,12 @@ var processNode = (node) => gen2(function* () {
   if (ts.isUnionTypeNode(node)) {
     const allLiterals = yield* option(parseAllLiterals(node));
     if (isSome2(allLiterals)) return createApiCall("Literal", allLiterals.value);
-    const members = yield* all2(...node.types.map((_) => processNode(_)));
+    const members = yield* all2(...node.types.map((_) => processNode(_, isVirtualTypeNode)));
     return createApiCall("Union", members);
   }
   if (ts.isIntersectionTypeNode(node)) {
     const [firstSchema, ...otherSchemas] = yield* all2(
-      ...node.types.map((_) => processNode(_))
+      ...node.types.map((_) => processNode(_, isVirtualTypeNode))
     );
     if (otherSchemas.length === 0) return firstSchema;
     return ts.factory.createCallExpression(
@@ -3750,22 +3760,28 @@ var processNode = (node) => gen2(function* () {
   }
   if (ts.isTypeOperatorNode(node)) {
     if (node.operator === ts.SyntaxKind.KeyOfKeyword) {
-      return createApiCall("keyof", [yield* processNode(node.type)]);
+      return createApiCall("keyof", [yield* processNode(node.type, isVirtualTypeNode)]);
     } else if (node.operator === ts.SyntaxKind.ReadonlyKeyword) {
-      return yield* processNode(node.type);
+      return yield* processNode(node.type, isVirtualTypeNode);
     }
   }
   if (ts.isArrayTypeNode(node)) {
-    const typeSchema = yield* processNode(node.elementType);
+    const typeSchema = yield* processNode(node.elementType, isVirtualTypeNode);
     return createApiCall("Array", [typeSchema]);
   }
   if (ts.isTypeLiteralNode(node)) {
-    const { properties, records } = yield* processMembers(node.members);
+    const { properties, records } = yield* processMembers(node.members, isVirtualTypeNode);
     return createApiCall(
       "Struct",
       [ts.factory.createObjectLiteralExpression(properties, true)].concat(records)
     );
   }
+  if (ts.isTypeQueryNode(node)) {
+    const typeChecker = yield* service(TypeCheckerApi);
+    const type = typeChecker.getTypeAtLocation(node.exprName);
+    const typeNode = typeChecker.typeToTypeNode(type, void 0, ts.NodeBuilderFlags.NoTruncation);
+    if (typeNode) return yield* processNode(typeNode, true);
+  }
   if (ts.isTypeReferenceNode(node)) {
     const parsedName = entityNameToDataTypeName(node.typeName);
     if (isSome2(parsedName)) {
@@ -3777,13 +3793,13 @@ var processNode = (node) => gen2(function* () {
         case "Chunk":
         case "Array": {
           const elements = yield* all2(
-            ...node.typeArguments ? node.typeArguments.map(processNode) : []
+            ...node.typeArguments ? node.typeArguments.map((_) => processNode(_, isVirtualTypeNode)) : []
           );
           return createApiCall(parsedName.value, elements);
         }
         case "Record": {
           const elements = yield* all2(
-            ...node.typeArguments ? node.typeArguments.map(processNode) : []
+            ...node.typeArguments ? node.typeArguments.map((_) => processNode(_, isVirtualTypeNode)) : []
           );
           if (elements.length >= 2) {
             return createApiCall(parsedName.value, [
@@ -3797,7 +3813,7 @@ var processNode = (node) => gen2(function* () {
         }
         case "Either": {
           const elements = yield* all2(
-            ...node.typeArguments ? node.typeArguments.map(processNode) : []
+            ...node.typeArguments ? node.typeArguments.map((_) => processNode(_, isVirtualTypeNode)) : []
           );
           if (elements.length >= 2) {
             return createApiCall(parsedName.value, [
@@ -3815,7 +3831,7 @@ var processNode = (node) => gen2(function* () {
           if (typeArguments.length !== 2) {
             return createUnsupportedNodeComment(ts, sourceFile, node);
           }
-          const baseType = yield* processNode(typeArguments[0]);
+          const baseType = yield* processNode(typeArguments[0], isVirtualTypeNode);
           const stringLiteralArguments = yield* option(parseAllLiterals(typeArguments[1]));
           if (isNone2(stringLiteralArguments)) {
             return createUnsupportedNodeComment(ts, sourceFile, node);
@@ -3842,7 +3858,7 @@ var processNode = (node) => gen2(function* () {
 var processMembers = fn(
   "SchemaGen.processMembers"
 )(
-  function* (members) {
+  function* (members, isVirtualTypeNode) {
     const { createApiCall, ts } = yield* service(
       SchemaGenContext
     );
@@ -3856,7 +3872,7 @@ var processMembers = fn(
         return yield* fail(new RequiredExplicitTypesError(propertySignature));
       }
       const propertyAssignment = pipe(
-        yield* processNode(propertySignature.type),
+        yield* processNode(propertySignature.type, isVirtualTypeNode),
         propertySignature.questionToken ? (_) => createApiCall("optional", [_]) : identity,
         (_) => ts.factory.createPropertyAssignment(name, _)
       );
@@ -3870,8 +3886,8 @@ var processMembers = fn(
       const parameter = indexSignature.parameters[0];
       if (!parameter.type) return yield* fail(new RequiredExplicitTypesError(parameter));
       const parameterType = parameter.type;
-      const key = yield* processNode(parameterType);
-      const value = yield* processNode(indexSignature.type);
+      const key = yield* processNode(parameterType, isVirtualTypeNode);
+      const value = yield* processNode(indexSignature.type, isVirtualTypeNode);
       records.push(
         ts.factory.createObjectLiteralExpression([
           ts.factory.createPropertyAssignment("key", key),
@@ -3890,7 +3906,7 @@ var processInterfaceDeclaration = fn("SchemaGen.processInterfaceDeclaration")(
     const { createApiCall, ts } = yield* service(
       SchemaGenContext
     );
-    const { properties, records } = yield* processMembers(node.members);
+    const { properties, records } = yield* processMembers(node.members, false);
     if (preferClass && records.length === 0) {
       return yield* createExportSchemaClassDeclaration(node.name.text, properties);
     }
@@ -3908,12 +3924,12 @@ var processTypeAliasDeclaration = fn("SchemaGen.processInterfaceDeclaration")(
       return yield* fail(new TypeParametersNotSupportedError(node));
     }
     if (preferClass && ts.isTypeLiteralNode(node.type)) {
-      const { properties, records } = yield* processMembers(node.type.members);
+      const { properties, records } = yield* processMembers(node.type.members, false);
       if (records.length === 0) {
         return yield* createExportSchemaClassDeclaration(node.name.text, properties);
       }
     }
-    const effectSchema = yield* processNode(node.type);
+    const effectSchema = yield* processNode(node.type, false);
     return yield* createExportVariableDeclaration(node.name.text, effectSchema);
   }
 );
@@ -4016,6 +4032,7 @@ var typeToEffectSchema = createRefactor({
   description: "Refactor to Schema",
   apply: fn("typeToEffectSchema.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
     const maybeNode = yield* findNodeToProcess(sourceFile, textRange);
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
     const node = maybeNode.value;
@@ -4024,6 +4041,7 @@ var typeToEffectSchema = createRefactor({
       description: "Refactor to Schema",
       apply: pipe(
         applyAtNode(sourceFile, node, false),
+        provideService(TypeCheckerApi, typeChecker),
         provideService(TypeScriptApi, ts)
       )
     };
@@ -4036,6 +4054,7 @@ var typeToEffectSchemaClass = createRefactor({
   description: "Refactor to Schema.Class",
   apply: fn("typeToEffectSchemaClass.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
     const maybeNode = yield* findNodeToProcess(sourceFile, textRange);
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
     const node = maybeNode.value;
@@ -4044,6 +4063,7 @@ var typeToEffectSchemaClass = createRefactor({
       description: "Refactor to Schema.Class",
       apply: pipe(
         applyAtNode(sourceFile, node, true),
+        provideService(TypeCheckerApi, typeChecker),
         provideService(TypeScriptApi, ts)
       )
     };