@effect/language-service 0.52.0 → 0.53.0

package/README.md

@@ -129,7 +129,8 @@ Few options can be provided alongside the initialization of the Language Service
         "topLevelNamedReexports": "ignore", // for namespaceImportPackages, how should top level named re-exports (e.g. {pipe} from "effect") be treated? "ignore" will leave them as is, "follow" will rewrite them to the re-exported module (e.g. {pipe} from "effect/Function")
         "importAliases": { "Array": "Arr" }, // allows to chose some different names for import name aliases (only when not chosing to import the whole module) (default: {})
         "noExternal": false, // disables features that provides links to external websites (such as links to mermaidchart.com) (default: false)
-        "keyPatterns": [{ "target": "service", "pattern": "default", "skipLeadingPath": ["src/"] }] // configure the key patterns; recommended reading more on the section "Configuring Key Patterns"
+        "keyPatterns": [{ "target": "service", "pattern": "default", "skipLeadingPath": ["src/"] }], // configure the key patterns; recommended reading more on the section "Configuring Key Patterns"
+        "layerGraphFollowDepth": 0 // controls the depth level that the layer graph will follow when resolving layer dependencies, depth is counted only when exiting the currently hovered/analyzed layer definition (default: 0)
       }
     ]
   }

package/cli.js

@@ -26990,6 +26990,7 @@ var getZshCompletions2 = (self, state = {
 
 // node_modules/.pnpm/@effect+cli@0.71.0_@effect+platform@0.92.1_@effect+printer-ansi@0.46.0_@effect+printer@0.46.0_effect@3.18.4/node_modules/@effect/cli/dist/esm/Options.js
 var all7 = all6;
+var boolean5 = boolean4;
 var choice3 = choice2;
 var directory2 = directory;
 var file3 = file2;
@@ -30956,7 +30957,8 @@ var getModuleFilePath = fn("getModuleFilePath")(
 var getTypeScriptApisUtils = fn("getTypeScriptApisFile")(
   function* (dirPath4) {
     const filePath = yield* getModuleFilePath(dirPath4, "typescript");
-    const sourceFile = yield* getUnpatchedSourceFile(filePath);
+    const sourceText = yield* getSourceFileText(filePath);
+    const sourceFile = yield* getUnpatchedSourceFile(filePath, sourceText);
     const bodyWithoutBundlerComment = yield* omitBundlerSourceFileComment(
       sourceFile.text.split("\n").map((line4) => `    ${line4}`).join("\n")
     );
@@ -31069,27 +31071,31 @@ var applyTextChanges = fn("applyTextChanges")(
     return newSourceText;
   }
 );
-var getUnpatchedSourceFile = fn("getUnpatchedSourceFile")(function* (filePath) {
+var getSourceFileText = fn("getSourceFileText")(function* (filePath) {
   const fs = yield* FileSystem;
-  const ts = yield* getTypeScript;
-  const sourceText = yield* fs.readFileString(filePath);
-  const sourceFile = ts.createSourceFile(
-    filePath,
-    sourceText,
-    ts.ScriptTarget.ES2022,
-    true
-  );
-  const { revertChanges } = yield* extractAppliedEffectLspPatches(sourceFile);
-  if (revertChanges.length === 0) return sourceFile;
-  const newSourceText = yield* applyTextChanges(sourceText, revertChanges);
-  const newSourceFile = ts.createSourceFile(
-    filePath,
-    newSourceText,
-    ts.ScriptTarget.ES2022,
-    true
-  );
-  return newSourceFile;
+  return yield* fs.readFileString(filePath);
 });
+var getUnpatchedSourceFile = fn("getUnpatchedSourceFile")(
+  function* (filePath, sourceText) {
+    const ts = yield* getTypeScript;
+    const sourceFile = ts.createSourceFile(
+      filePath,
+      sourceText,
+      ts.ScriptTarget.ES2022,
+      true
+    );
+    const { revertChanges } = yield* extractAppliedEffectLspPatches(sourceFile);
+    if (revertChanges.length === 0) return sourceFile;
+    const newSourceText = yield* applyTextChanges(sourceText, revertChanges);
+    const newSourceFile = ts.createSourceFile(
+      filePath,
+      newSourceText,
+      ts.ScriptTarget.ES2022,
+      true
+    );
+    return newSourceFile;
+  }
+);
 var omitBundlerSourceFileComment = fn("omitBundlerSourceFileComment")(
   function* (originalSourceText) {
     const ts = yield* getTypeScript;
@@ -31199,7 +31205,8 @@ var defaults = {
     skipLeadingPath: ["src/"]
   }],
   extendedKeyDetection: false,
-  pipeableMinArgCount: 1
+  pipeableMinArgCount: 1,
+  layerGraphFollowDepth: 0
 };
 function parseKeyPatterns(patterns) {
   const result = [];
@@ -31235,7 +31242,8 @@ function parse4(config2) {
     noExternal: isObject(config2) && hasProperty(config2, "noExternal") && isBoolean(config2.noExternal) ? config2.noExternal : defaults.noExternal,
     keyPatterns: isObject(config2) && hasProperty(config2, "keyPatterns") && isArray(config2.keyPatterns) ? parseKeyPatterns(config2.keyPatterns) : defaults.keyPatterns,
     extendedKeyDetection: isObject(config2) && hasProperty(config2, "extendedKeyDetection") && isBoolean(config2.extendedKeyDetection) ? config2.extendedKeyDetection : defaults.extendedKeyDetection,
-    pipeableMinArgCount: isObject(config2) && hasProperty(config2, "pipeableMinArgCount") && isNumber(config2.pipeableMinArgCount) ? config2.pipeableMinArgCount : defaults.pipeableMinArgCount
+    pipeableMinArgCount: isObject(config2) && hasProperty(config2, "pipeableMinArgCount") && isNumber(config2.pipeableMinArgCount) ? config2.pipeableMinArgCount : defaults.pipeableMinArgCount,
+    layerGraphFollowDepth: isObject(config2) && hasProperty(config2, "layerGraphFollowDepth") && isNumber(config2.layerGraphFollowDepth) ? config2.layerGraphFollowDepth : defaults.layerGraphFollowDepth
   };
 }
 
@@ -35665,6 +35673,13 @@ var moduleNames = choice3("module", [
   repeated4,
   withDescription3("The name of the module to patch.")
 );
+var force = boolean5("force").pipe(
+  withDefault3(false),
+  withDescription3("Force patch even if already patched.")
+);
+var getPatchedMarker = (version) => {
+  return `"use effect-lsp-patch-version ${version}";`;
+};
 var getPatchesForModule = fn("getPatchesForModule")(
   function* (moduleName, dirPath4, version, sourceFile) {
     const ts = yield* getTypeScript;
@@ -35827,6 +35842,16 @@ var getPatchesForModule = fn("getPatchesForModule")(
         version
       )
     );
+    patches.push(
+      yield* makeEffectLspPatchChange(
+        sourceFile.text,
+        insertCheckSourceFilePosition.value.position,
+        insertCheckSourceFilePosition.value.position,
+        getPatchedMarker(version) + "\n",
+        "\n",
+        version
+      )
+    );
     return patches;
   }
 );
@@ -35850,8 +35875,8 @@ var printRememberPrepareScript = fn("printRememberPrepareScript")(function* () {
 }, ignore2);
 var patch9 = make58(
   "patch",
-  { dirPath: dirPath2, moduleNames },
-  fn("patch")(function* ({ dirPath: dirPath4, moduleNames: moduleNames3 }) {
+  { dirPath: dirPath2, moduleNames, force },
+  fn("patch")(function* ({ dirPath: dirPath4, force: force2, moduleNames: moduleNames3 }) {
     const fs = yield* FileSystem;
     const { version: effectLspVersion } = yield* getPackageJsonData(__dirname);
     yield* logDebug2(`Searching for typescript in ${dirPath4}...`);
@@ -35862,7 +35887,16 @@ var patch9 = make58(
       yield* logDebug2(`Searching ${moduleName}...`);
       const filePath = yield* getModuleFilePath(dirPath4, moduleName);
       yield* logDebug2(`Reading ${moduleName} from ${filePath}...`);
-      const sourceFile = yield* getUnpatchedSourceFile(filePath);
+      const sourceText = yield* getSourceFileText(filePath);
+      yield* logDebug2(
+        `Checking if ${filePath} is already patched with marker ${getPatchedMarker(effectLspVersion)}...`
+      );
+      if (!force2 && sourceText.indexOf(getPatchedMarker(effectLspVersion)) !== -1) {
+        yield* logInfo2(`${filePath} is already patched with version ${effectLspVersion}, skipped.`);
+        continue;
+      }
+      yield* logDebug2(`Parsing ${moduleName}...`);
+      const sourceFile = yield* getUnpatchedSourceFile(filePath, sourceText);
       yield* logDebug2(`Collecting patches for ${moduleName}...`);
       const patches = yield* getPatchesForModule(moduleName, dirPath4, effectLspVersion, sourceFile);
       const newSourceText = yield* applyTextChanges(sourceFile.text, patches);
@@ -35896,8 +35930,10 @@ var unpatch = make58(
     for (const moduleName of modulesToUnpatch) {
       yield* logDebug2(`Resolving ${moduleName}...`);
       const filePath = yield* getModuleFilePath(dirPath4, moduleName);
+      yield* logDebug2(`Reading ${moduleName} from ${filePath}...`);
+      const sourceText = yield* getSourceFileText(filePath);
       yield* logDebug2(`Unpatching ${filePath}...`);
-      const sourceFile = yield* getUnpatchedSourceFile(filePath);
+      const sourceFile = yield* getUnpatchedSourceFile(filePath, sourceText);
       yield* logDebug2(`Writing ${filePath}...`);
       yield* fs.writeFileString(filePath, sourceFile.text);
       yield* logInfo2(`${filePath} unpatched successfully.`);