@effect/language-service 0.41.0 → 0.41.1

package/index.js

@@ -1064,6 +1064,68 @@ var all = fn("all")(
 var TypeScriptApi = Tag("TypeScriptApi");
 var TypeScriptProgram = Tag("TypeScriptProgram");
 var ChangeTracker = Tag("ChangeTracker");
+function getPackageJsonInfoCache(program) {
+  try {
+    if (hasProperty(program, "getModuleResolutionCache") && isFunction2(program.getModuleResolutionCache)) {
+      const moduleResolutionCache = program.getModuleResolutionCache();
+      if (hasProperty(moduleResolutionCache, "getPackageJsonInfoCache") && isFunction2(moduleResolutionCache.getPackageJsonInfoCache)) {
+        return moduleResolutionCache.getPackageJsonInfoCache();
+      }
+    }
+  } catch (_) {
+    return void 0;
+  }
+  return void 0;
+}
+function getDirectoryPath(ts, path) {
+  try {
+    if (hasProperty(ts, "getDirectoryPath") && isFunction2(ts.getDirectoryPath)) {
+      return ts.getDirectoryPath(path);
+    }
+    return path;
+  } catch (_) {
+    return path;
+  }
+}
+function makeGetModuleSpecifier(ts) {
+  if (!(hasProperty(ts, "moduleSpecifiers") && hasProperty(ts.moduleSpecifiers, "getModuleSpecifier") && isFunction2(ts.moduleSpecifiers.getModuleSpecifier))) return;
+  const _internal = ts.moduleSpecifiers.getModuleSpecifier;
+  return (compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, options) => {
+    return _internal(
+      compilerOptions,
+      importingSourceFile,
+      importingSourceFileName,
+      toFileName,
+      host,
+      options
+    );
+  };
+}
+function makeGetTemporaryModuleResolutionState(ts) {
+  if (hasProperty(ts, "getTemporaryModuleResolutionState") && isFunction2(ts.getTemporaryModuleResolutionState)) {
+    const _internal = ts.getTemporaryModuleResolutionState;
+    return (cache, program, compilerOptions) => _internal(cache, program, compilerOptions);
+  }
+  return void 0;
+}
+function makeGetPackageScopeForPath(ts) {
+  if (hasProperty(ts, "getPackageScopeForPath") && isFunction2(ts.getPackageScopeForPath)) {
+    const _internal = ts.getPackageScopeForPath;
+    return (path, state) => _internal(path, state);
+  }
+}
+function makeResolvePackageNameToPackageJson(ts) {
+  if (hasProperty(ts, "resolvePackageNameToPackageJson") && isFunction2(ts.resolvePackageNameToPackageJson)) {
+    const _internal = ts.resolvePackageNameToPackageJson;
+    return (packageName, fromFileName, compilerOptions, host) => _internal(packageName, fromFileName, compilerOptions, host);
+  }
+}
+function makeGetEntrypointsFromPackageJsonInfo(ts) {
+  if (hasProperty(ts, "getEntrypointsFromPackageJsonInfo") && isFunction2(ts.getEntrypointsFromPackageJsonInfo)) {
+    const _internal = ts.getEntrypointsFromPackageJsonInfo;
+    return (packageJsonInfo, compilerOptions, host) => _internal(packageJsonInfo, compilerOptions, host);
+  }
+}
 
 // node_modules/.pnpm/effect@3.17.8/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
@@ -1185,6 +1247,8 @@ var nanoLayer = (fa) => pipe(
   flatMap((ts) => pipe(fa, provideService(TypeScriptUtils, makeTypeScriptUtils(ts))))
 );
 function makeTypeScriptUtils(ts) {
+  const getTemporaryModuleResolutionState = makeGetTemporaryModuleResolutionState(ts);
+  const getPackageScopeForPath = makeGetPackageScopeForPath(ts);
   function parsePackageContentNameAndVersionFromScope(v) {
     if (!isObject(v)) return;
     if (!hasProperty(v, "packageJsonScope")) return;
@@ -1219,20 +1283,26 @@ function makeTypeScriptUtils(ts) {
       exportsKeys
     };
   }
-  function resolveModulePattern(program, sourceFile, pattern) {
-    if (pattern.indexOf("*") === -1) return [pattern.toLowerCase()];
+  function resolveModuleWithPackageInfoFromSourceFile(program, sourceFile) {
     let packageJsonScope = parsePackageContentNameAndVersionFromScope(sourceFile);
-    if (!packageJsonScope && hasProperty(ts, "getPackageScopeForPath") && isFunction2(ts.getPackageScopeForPath) && hasProperty(ts, "getTemporaryModuleResolutionState") && isFunction2(ts.getTemporaryModuleResolutionState) && hasProperty(ts, "getPackageScopeForPath") && isFunction2(ts.getPackageScopeForPath)) {
-      const temporaryModuleResolutionState = ts.getTemporaryModuleResolutionState(
-        void 0,
+    if (!packageJsonScope && getPackageScopeForPath && getTemporaryModuleResolutionState) {
+      const packageJsonInfoCache = getPackageJsonInfoCache(program);
+      const temporaryModuleResolutionState = getTemporaryModuleResolutionState(
+        packageJsonInfoCache,
         program,
         program.getCompilerOptions()
       );
+      const directoryPath = getDirectoryPath(ts, sourceFile.fileName);
       packageJsonScope = parsePackageContentNameAndVersionFromScope({
         ...sourceFile,
-        packageJsonScope: ts.getPackageScopeForPath(sourceFile.fileName, temporaryModuleResolutionState)
+        packageJsonScope: getPackageScopeForPath(directoryPath, temporaryModuleResolutionState)
       });
     }
+    return packageJsonScope;
+  }
+  function resolveModulePattern(program, sourceFile, pattern) {
+    if (pattern.indexOf("*") === -1) return [pattern.toLowerCase()];
+    const packageJsonScope = resolveModuleWithPackageInfoFromSourceFile(program, sourceFile);
     const referencedPackages = [];
     for (const statement of sourceFile.statements) {
       if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
@@ -1250,20 +1320,6 @@ function makeTypeScriptUtils(ts) {
       )
     );
   }
-  function makeGetModuleSpecifier() {
-    if (!(hasProperty(ts, "moduleSpecifiers") && hasProperty(ts.moduleSpecifiers, "getModuleSpecifier") && isFunction2(ts.moduleSpecifiers.getModuleSpecifier))) return;
-    const _internal = ts.moduleSpecifiers.getModuleSpecifier;
-    return (compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, options) => {
-      return _internal(
-        compilerOptions,
-        importingSourceFile,
-        importingSourceFileName,
-        toFileName,
-        host,
-        options
-      );
-    };
-  }
   function findNodeWithLeadingCommentAtPosition(sourceFile, position) {
     const sourceText = sourceFile.text;
     let result;
@@ -1652,6 +1708,7 @@ function makeTypeScriptUtils(ts) {
     findNodeAtPositionIncludingTrivia,
     parsePackageContentNameAndVersionFromScope,
     resolveModulePattern,
+    resolveModuleWithPackageInfoFromSourceFile,
     findNodeWithLeadingCommentAtPosition,
     getCommentAtPosition,
     getAncestorNodesInRange,
@@ -1666,7 +1723,6 @@ function makeTypeScriptUtils(ts) {
     parseDataForExtendsClassCompletion,
     createEffectGenCallExpressionWithBlock,
     createReturnYieldStarStatement,
-    makeGetModuleSpecifier,
     parseAccessedExpressionForCompletion,
     getSourceFileOfNode
   };
@@ -4143,14 +4199,14 @@ var importFromBarrel = createDiagnostic({
     const tsUtils = yield* service(TypeScriptUtils);
     const typeChecker = yield* service(TypeCheckerApi);
     const program = yield* service(TypeScriptProgram);
+    const getModuleSpecifier = makeGetModuleSpecifier(ts);
+    const resolveExternalModuleName = makeResolveExternalModuleName(typeChecker);
     const packageNamesToCheck = flatten(
       languageServicePluginOptions.namespaceImportPackages.map(
         (packageName) => tsUtils.resolveModulePattern(program, sourceFile, packageName)
       )
     );
     const isImportedFromBarrelExport = (element) => {
-      const getModuleSpecifier = tsUtils.makeGetModuleSpecifier();
-      const resolveExternalModuleName = makeResolveExternalModuleName(typeChecker);
       if (!(getModuleSpecifier && resolveExternalModuleName)) return;
       const importDeclaration = ts.findAncestor(element, (node) => ts.isImportDeclaration(node));
       if (!importDeclaration) return;
@@ -5720,6 +5776,12 @@ var effectSelfInClasses = createCompletion({
       insertText: `${effectIdentifier}.Service<${name}>()("${name}", {${"${0}"}}){}`,
       replacementSpan,
       isSnippet: true
+    }, {
+      name: `Tag("${name}")`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `${effectIdentifier}.Tag("${name}")<${name}, {${"${0}"}}>(){}`,
+      replacementSpan,
+      isSnippet: true
     }];
   })
 });
@@ -5890,7 +5952,9 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
   const program = yield* service(TypeScriptProgram);
   const languageServicePluginOptions = yield* service(LanguageServicePluginOptions);
   const host = program;
-  const getModuleSpecifier = tsUtils.makeGetModuleSpecifier();
+  const getModuleSpecifier = makeGetModuleSpecifier(ts);
+  const resolvePackageNameToPackageJson = makeResolvePackageNameToPackageJson(ts);
+  const getEntrypointsFromPackageJsonInfo = makeGetEntrypointsFromPackageJsonInfo(ts);
   function collectSourceFileReexports(sourceFile) {
     const namespaceExports = [];
     const namedExports = [];
@@ -5928,14 +5992,15 @@ var makeAutoImportProvider = fn("TypeScriptApi")(function* (fromSourceFile) {
   }
   function getPackageInfo(fromFileName, packageName) {
     try {
-      const packageJsonInfo = ts.resolvePackageNameToPackageJson(
+      if (!resolvePackageNameToPackageJson || !getEntrypointsFromPackageJsonInfo) return;
+      const packageJsonInfo = resolvePackageNameToPackageJson(
         packageName,
         fromFileName,
         program.getCompilerOptions(),
         host
       );
       if (!packageJsonInfo) return;
-      const _entrypoints = ts.getEntrypointsFromPackageJsonInfo(
+      const _entrypoints = getEntrypointsFromPackageJsonInfo(
         packageJsonInfo,
         program.getCompilerOptions(),
         host