@effect/language-service 0.34.0 → 0.35.0

package/package.json

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

package/transform.js

@@ -142,9 +142,6 @@ 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.1/node_modules/effect/dist/esm/internal/errors.js
-var getBugErrorMessage = (message) => `BUG: ${message} - please report an issue at https://github.com/Effect-TS/effect/issues`;
-
 // node_modules/.pnpm/effect@3.17.1/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var GenKindImpl = class {
@@ -245,12 +242,6 @@ var YieldWrap = class {
     return this.#value;
   }
 };
-function yieldWrapGet(self) {
-  if (typeof self === "object" && self !== null && YieldWrapTypeId in self) {
-    return self[YieldWrapTypeId]();
-  }
-  throw new Error(getBugErrorMessage("yieldWrapGet"));
-}
 var structuralRegionState = /* @__PURE__ */ globalValue("effect/Utils/isStructuralRegion", () => ({
   enabled: false,
   tester: void 0
@@ -834,6 +825,31 @@ var NanoTag = class {
   }
 };
 var Tag = (identifier) => new NanoTag(identifier);
+var SingleShotGen2 = class _SingleShotGen {
+  called = false;
+  self;
+  constructor(self) {
+    this.self = self;
+  }
+  /**
+   * @since 2.0.0
+   */
+  next(a) {
+    return this.called ? {
+      value: a,
+      done: true
+    } : (this.called = true, {
+      value: this.self,
+      done: false
+    });
+  }
+  /**
+   * @since 2.0.0
+   */
+  [Symbol.iterator]() {
+    return new _SingleShotGen(this.self);
+  }
+};
 var evaluate = Symbol.for("Nano.evaluate");
 var contA = Symbol.for("Nano.contA");
 var contE = Symbol.for("Nano.contE");
@@ -848,7 +864,7 @@ var NanoDefectException = class {
 };
 var PrimitiveProto = {
   [Symbol.iterator]() {
-    return new SingleShotGen(new YieldWrap(this));
+    return new SingleShotGen2(this);
   }
 };
 var SucceedProto = {
@@ -971,7 +987,7 @@ var FromIteratorProto = {
     const state = this[args][0].next(value);
     if (state.done) return succeed(state.value);
     fiber._stack.push(this);
-    return yieldWrapGet(state.value);
+    return state.value;
   },
   [evaluate](fiber) {
     return this[contA](this[args][1], fiber);
@@ -1300,7 +1316,7 @@ function makeTypeScriptUtils(ts) {
   function isNodeInRange(textRange) {
     return (node) => node.pos <= textRange.pos && node.end >= textRange.end;
   }
-  function transformAsyncAwaitToEffectGen(node, effectModuleName, onAwait) {
+  function transformAsyncAwaitToEffectGeneratorBody(body, onAwait) {
     function visitor(_) {
       if (ts.isAwaitExpression(_)) {
         const expression = ts.visitEachChild(_.expression, visitor, ts.nullTransformationContext);
@@ -1311,7 +1327,44 @@ function makeTypeScriptUtils(ts) {
       }
       return ts.visitEachChild(_, visitor, ts.nullTransformationContext);
     }
-    const generatorBody = visitor(node.body);
+    return visitor(body);
+  }
+  function transformAsyncAwaitToEffectFn(node, effectModuleName, onAwait) {
+    const generatorBody = transformAsyncAwaitToEffectGeneratorBody(node.body, onAwait);
+    const fnName = node.name && ts.isIdentifier(node.name) ? node.name : ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name) && node.parent.initializer === node ? node.parent.name : void 0;
+    let fnCall = ts.factory.createPropertyAccessExpression(
+      ts.factory.createIdentifier(effectModuleName),
+      "fn"
+    );
+    if (fnName) {
+      fnCall = ts.factory.createCallExpression(
+        fnName,
+        void 0,
+        [ts.factory.createStringLiteral(fnName.text)]
+      );
+    }
+    return tryPreserveDeclarationSemantics(
+      node,
+      ts.factory.createCallExpression(
+        fnCall,
+        void 0,
+        [
+          ts.factory.createFunctionExpression(
+            void 0,
+            ts.factory.createToken(ts.SyntaxKind.AsteriskToken),
+            void 0,
+            node.typeParameters,
+            node.parameters,
+            void 0,
+            ts.isBlock(generatorBody) ? generatorBody : ts.factory.createBlock([ts.factory.createReturnStatement(generatorBody)])
+          )
+        ]
+      ),
+      true
+    );
+  }
+  function transformAsyncAwaitToEffectGen(node, effectModuleName, onAwait) {
+    const generatorBody = transformAsyncAwaitToEffectGeneratorBody(node.body, onAwait);
     const effectGenCallExp = createEffectGenCallExpression(effectModuleName, generatorBody);
     let currentFlags = ts.getCombinedModifierFlags(node);
     currentFlags &= ~ts.ModifierFlags.Async;
@@ -1415,12 +1468,15 @@ function makeTypeScriptUtils(ts) {
     }
     return typeNode;
   }
-  function tryPreserveDeclarationSemantics(nodeToReplace, node) {
+  function tryPreserveDeclarationSemantics(nodeToReplace, node, dropAsync) {
     if (!ts.isExpression(node)) return node;
     if (ts.isFunctionDeclaration(nodeToReplace)) {
       if (!nodeToReplace.name) return node;
+      let currentFlags = ts.getCombinedModifierFlags(nodeToReplace);
+      currentFlags &= ~ts.ModifierFlags.Async;
+      const newModifiers = dropAsync ? ts.factory.createModifiersFromModifierFlags(currentFlags) : nodeToReplace.modifiers;
       return ts.factory.createVariableStatement(
-        nodeToReplace.modifiers,
+        newModifiers,
         ts.factory.createVariableDeclarationList(
           [ts.factory.createVariableDeclaration(
             nodeToReplace.name,
@@ -1432,8 +1488,11 @@ function makeTypeScriptUtils(ts) {
         )
       );
     } else if (ts.isMethodDeclaration(nodeToReplace)) {
+      let currentFlags = ts.getCombinedModifierFlags(nodeToReplace);
+      currentFlags &= ~ts.ModifierFlags.Async;
+      const newModifiers = dropAsync ? ts.factory.createModifiersFromModifierFlags(currentFlags) : nodeToReplace.modifiers;
       return ts.factory.createPropertyDeclaration(
-        nodeToReplace.modifiers,
+        newModifiers,
         nodeToReplace.name,
         void 0,
         void 0,
@@ -1536,6 +1595,7 @@ function makeTypeScriptUtils(ts) {
     getAncestorNodesInRange,
     toTextRange,
     isNodeInRange,
+    transformAsyncAwaitToEffectFn,
     transformAsyncAwaitToEffectGen,
     findImportedModuleIdentifierByPackageAndNameOrBarrel,
     simplifyTypeNode,
@@ -4893,43 +4953,32 @@ var diagnostics = [
 ];
 
 // src/transform.ts
-var programsChecked = /* @__PURE__ */ new WeakMap();
 function transform_default(program, pluginConfig, { addDiagnostic, ts: tsInstance }) {
-  function runDiagnostics(program2, sourceFile) {
-    const checkedFiles = programsChecked.get(program2) ?? /* @__PURE__ */ new Set();
-    programsChecked.set(program2, checkedFiles);
-    if (checkedFiles.has(sourceFile.fileName)) return;
-    checkedFiles.add(sourceFile.fileName);
-    pipe(
-      getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
-      nanoLayer2,
-      nanoLayer,
-      provideService(TypeCheckerApi, program2.getTypeChecker()),
-      provideService(TypeScriptProgram, program2),
-      provideService(TypeScriptApi, tsInstance),
-      provideService(
-        LanguageServicePluginOptions,
-        parse(pluginConfig)
-      ),
-      run,
-      map((_) => _.diagnostics),
-      map(
-        filter(
-          (_) => _.category === tsInstance.DiagnosticCategory.Error || _.category === tsInstance.DiagnosticCategory.Warning
-        )
-      ),
-      getOrElse(() => []),
-      map2(addDiagnostic)
-    );
-  }
-  const rootFileNames = program.getRootFileNames();
-  const sourceFiles = program.getSourceFiles().filter((_) => rootFileNames.indexOf(_.fileName) > -1);
-  for (const sourceFile of sourceFiles) {
-    runDiagnostics(program, sourceFile);
-  }
-  return (_) => (sourceFile) => {
-    runDiagnostics(program, sourceFile);
-    return sourceFile;
+  return (_) => {
+    return (sourceFile) => {
+      pipe(
+        getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
+        nanoLayer2,
+        nanoLayer,
+        provideService(TypeCheckerApi, program.getTypeChecker()),
+        provideService(TypeScriptProgram, program),
+        provideService(TypeScriptApi, tsInstance),
+        provideService(
+          LanguageServicePluginOptions,
+          parse(pluginConfig)
+        ),
+        run,
+        map((_2) => _2.diagnostics),
+        map(
+          filter(
+            (_2) => _2.category === tsInstance.DiagnosticCategory.Error || _2.category === tsInstance.DiagnosticCategory.Warning
+          )
+        ),
+        getOrElse(() => []),
+        map2(addDiagnostic)
+      );
+      return sourceFile;
+    };
   };
 }
 //# sourceMappingURL=transform.js.map