@effect/language-service 0.40.0 → 0.40.1

package/cli.js

@@ -29664,10 +29664,20 @@ var getTypeScriptApisUtils = fn("getTypeScriptApisFile")(
   function* (dirPath4) {
     const filePath = yield* getModuleFilePath(dirPath4, "typescript");
     const sourceFile = yield* getUnpatchedSourceFile(filePath);
-    const patchWithWrappingFunction = `var effectLspTypeScriptApis = (function(module){
-${sourceFile.text}
+    const bodyWithoutBundlerComment = yield* omitBundlerSourceFileComment(
+      sourceFile.text.split("\n").map((line4) => `    ${line4}`).join("\n")
+    );
+    const patchWithWrappingFunction = `
+var _effectLspTypeScriptApis = undefined;
+function effectLspTypeScriptApis(){
+  if(!_effectLspTypeScriptApis){
+    _effectLspTypeScriptApis = (function(module){
+${bodyWithoutBundlerComment}
 return ts
-})(effectLspTypeScriptApis);`;
+})(effectLspTypeScriptApis);
+  }
+  return _effectLspTypeScriptApis;
+}`;
     return patchWithWrappingFunction;
   }
 );
@@ -29676,10 +29686,20 @@ var getEffectLspPatchUtils = fn("getEffectLspPatchUtils")(function* () {
   const fs = yield* FileSystem;
   const effectLspPatchUtilsPath = path2.resolve(__dirname, "effect-lsp-patch-utils.js");
   const effectLspPatchUtilsContent = yield* fs.readFileString(effectLspPatchUtilsPath);
-  const patchWithWrappingFunction = `var effectLspPatchUtils = (function(module){
-${effectLspPatchUtilsContent}
+  const bodyWithoutBundlerComment = yield* omitBundlerSourceFileComment(
+    effectLspPatchUtilsContent.split("\n").map((line4) => `    ${line4}`).join("\n")
+  );
+  const patchWithWrappingFunction = `
+var _effectLspPatchUtils = undefined;
+function effectLspPatchUtils(){
+  if(!_effectLspPatchUtils){
+    _effectLspPatchUtils = (function(module){
+${bodyWithoutBundlerComment}
 return module
-})(effectLspPatchUtils || {});`;
+})({});
+  }
+  return _effectLspPatchUtils.exports;
+}`;
   return patchWithWrappingFunction;
 });
 var AppliedPatchMetadata = compose3(
@@ -29774,6 +29794,30 @@ var getUnpatchedSourceFile = fn("getUnpatchedSourceFile")(function* (filePath) {
   );
   return newSourceFile;
 });
+var omitBundlerSourceFileComment = fn("omitBundlerSourceFileComment")(
+  function* (originalSourceText) {
+    const deleteChanges = [];
+    const sourceFile = ts.createSourceFile(
+      "file.ts",
+      originalSourceText,
+      ts.ScriptTarget.ES2022,
+      true
+    );
+    const lineStarts = sourceFile.getLineStarts();
+    const regex = /^\s*\/\/\s*src\//gmid;
+    for (let i = 0; i < lineStarts.length; i++) {
+      const pos = lineStarts[i];
+      const end5 = i >= lineStarts.length ? sourceFile.text.length : lineStarts[i + 1];
+      if (sourceFile.text.substring(pos, end5).match(regex)) {
+        deleteChanges.push({
+          span: { start: pos, length: end5 - 1 - pos },
+          newText: ""
+        });
+      }
+    }
+    return yield* applyTextChanges(sourceFile.text, deleteChanges);
+  }
+);
 
 // src/cli/check.ts
 var LOCAL_TYPESCRIPT_DIR = "./node_modules/typescript";
@@ -29831,7 +29875,6 @@ var moduleNames = choice3("module", [
 var getPatchesForModule = fn("getPatchesForModule")(
   function* (moduleName, dirPath4, version, sourceFile) {
     const patches = [];
-    const insertUtilsPosition = some2({ position: 0 });
     let insertClearSourceFileEffectMetadataPosition = none2();
     let insertCheckSourceFilePosition = none2();
     let insertSkipPrecedingCommentDirectivePosition = none2();
@@ -29904,31 +29947,6 @@ var getPatchesForModule = fn("getPatchesForModule")(
         return void 0;
       });
     }
-    if (isNone2(insertUtilsPosition)) {
-      return yield* fail7(new UnableToFindPositionToPatchError({ positionToFind: "effect lsp utils insertion" }));
-    }
-    if (moduleName !== "typescript") {
-      patches.push(
-        yield* makeEffectLspPatchChange(
-          sourceFile.text,
-          insertUtilsPosition.value.position,
-          insertUtilsPosition.value.position,
-          "\n" + (yield* getTypeScriptApisUtils(dirPath4)) + "\n",
-          "",
-          version
-        )
-      );
-    }
-    patches.push(
-      yield* makeEffectLspPatchChange(
-        sourceFile.text,
-        insertUtilsPosition.value.position,
-        insertUtilsPosition.value.position,
-        "\n" + (yield* getEffectLspPatchUtils()) + "\n",
-        "",
-        version
-      )
-    );
     if (isNone2(insertClearSourceFileEffectMetadataPosition)) {
       return yield* fail7(
         new UnableToFindPositionToPatchError({ positionToFind: "clearSourceFileEffectMetadata" })
@@ -29939,7 +29957,7 @@ var getPatchesForModule = fn("getPatchesForModule")(
         sourceFile.text,
         insertClearSourceFileEffectMetadataPosition.value.position,
         insertClearSourceFileEffectMetadataPosition.value.position,
-        `effectLspPatchUtils.exports.clearSourceFileEffectMetadata(node)
+        `effectLspPatchUtils().clearSourceFileEffectMetadata(node)
 `,
         "\n",
         version
@@ -29953,7 +29971,7 @@ var getPatchesForModule = fn("getPatchesForModule")(
         sourceFile.text,
         insertCheckSourceFilePosition.value.position,
         insertCheckSourceFilePosition.value.position,
-        `effectLspPatchUtils.exports.checkSourceFileWorker(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis"}, host, node, compilerOptions, diagnostics.add)
+        `effectLspPatchUtils().checkSourceFileWorker(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis()"}, host, node, compilerOptions, diagnostics.add)
 `,
         "\n",
         version
@@ -29970,7 +29988,7 @@ var getPatchesForModule = fn("getPatchesForModule")(
         sourceFile.text,
         insertAppendMetadataRelationErrorPosition.value.position,
         insertAppendMetadataRelationErrorPosition.value.position,
-        `effectLspPatchUtils.exports.appendMetadataRelationError(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis"}, errorNode, ${sourceIdentifier}, ${targetIdentifier})
+        `effectLspPatchUtils().appendMetadataRelationError(${moduleName === "typescript" ? "module.exports" : "effectLspTypeScriptApis()"}, errorNode, ${sourceIdentifier}, ${targetIdentifier})
 `,
         "\n",
         version
@@ -29991,6 +30009,30 @@ var getPatchesForModule = fn("getPatchesForModule")(
         version
       )
     );
+    let eofPos = sourceFile.text.lastIndexOf("// src/") - 1;
+    if (eofPos < 0) eofPos = sourceFile.text.length;
+    if (moduleName !== "typescript") {
+      patches.push(
+        yield* makeEffectLspPatchChange(
+          sourceFile.text,
+          eofPos,
+          eofPos,
+          yield* getTypeScriptApisUtils(dirPath4),
+          "\n\n// src/@effect/language-service/effect-lsp-patch-utils.ts\n",
+          version
+        )
+      );
+    }
+    patches.push(
+      yield* makeEffectLspPatchChange(
+        sourceFile.text,
+        eofPos,
+        eofPos,
+        yield* getEffectLspPatchUtils(),
+        "\n\n// src/@effect/language-service/embedded-typescript-copy.ts\n",
+        version
+      )
+    );
     return patches;
   }
 );