Oct 17, 2023 · Apr 8, 2023 · Jul 7, 2023 · Jul 8, 2023 · Oct 17, 2023 · Oct 17, 2023
diff --git a/packages/type-utils/src/TypeOrValueSpecifier.ts b/packages/type-utils/src/TypeOrValueSpecifier.ts
 function typeDeclaredInPackage(
  packageName: string,
  declarationFiles: ts.SourceFile[],
  program: ts.Program,
 ): boolean {
  // Handle scoped packages - if the name starts with @, remove it and replace / with __
  const typesPackageName =
    '@types/' + packageName.replace(/^@([^/]+)\//, '$1__');
  const matcher = new RegExp(
    `node_modules/(?:${packageName}|${typesPackageName})/`,
  );
  return declarationFiles.some(declaration =>
    matcher.test(declaration.fileName),
  );
  const typesPackageName = packageName.replace(/^@([^/]+)\//, '$1__');

  const matcher = new RegExp(`${packageName}|${typesPackageName}`);
  return declarationFiles.some(declaration => {
    const packageIdName = program.sourceFileToPackageName.get(declaration.path);
    return (
      packageIdName !== undefined &&
      matcher.test(packageIdName) &&
      program.isSourceFileFromExternalLibrary(declaration)
    );
  });
 }

 function typeDeclaredInLib(
    case 'lib':
      return typeDeclaredInLib(declarationFiles, program);
    case 'package':
      return typeDeclaredInPackage(specifier.package, declarationFiles);
      return typeDeclaredInPackage(
        specifier.package,
        declarationFiles,
        program,
      );
  }
 }
diff --git a/packages/type-utils/typings/typescript.d.ts b/packages/type-utils/typings/typescript.d.ts
     */
    intrinsicName?: string;
  }

  interface Program {
    /**
     * Maps from a SourceFile's `.path` to the name of the package it was imported with.
     */
    readonly sourceFileToPackageName: ReadonlyMap<Path, string>;
  }

  interface SourceFile extends Declaration, LocalsContainer {
    path: Path;
  }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,16 +155,20 @@ function typeDeclaredInFile(
		function typeDeclaredInPackage(
		packageName: string,
		declarationFiles: ts.SourceFile[],
		program: ts.Program,
		): boolean {
		// Handle scoped packages - if the name starts with @, remove it and replace / with __
		const typesPackageName =
		'@types/' + packageName.replace(/^@([^/]+)\//, '$1__');
		const matcher = new RegExp(
		`node_modules/(?:${packageName}\|${typesPackageName})/`,
		);
		return declarationFiles.some(declaration =>
		matcher.test(declaration.fileName),
		);
		const typesPackageName = packageName.replace(/^@([^/]+)\//, '$1__');

		const matcher = new RegExp(`${packageName}\|${typesPackageName}`);
		return declarationFiles.some(declaration => {
		const packageIdName = program.sourceFileToPackageName.get(declaration.path);
		return (
		packageIdName !== undefined &&
		matcher.test(packageIdName) &&
		program.isSourceFileFromExternalLibrary(declaration)
		);
		});
		}

		function typeDeclaredInLib(
Expand DownExpand Up		@@ -207,6 +211,10 @@ export function typeMatchesSpecifier(
		case 'lib':
		return typeDeclaredInLib(declarationFiles, program);
		case 'package':
		return typeDeclaredInPackage(specifier.package, declarationFiles);
		return typeDeclaredInPackage(
		specifier.package,
		declarationFiles,
		program,
		);
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,15 @@ declare module 'typescript' {
		*/
		intrinsicName?: string;
		}

Copy link Contributor marekdedicJun 17, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Adding our own type declarations for the internal`sourceFileToPackageName` seems fishy to me, but that's a decision the maintainers need to do. I presume you are aware of#6861 - however, there has been no response in the corresponding TS issue.... Copy link Member JoshuaKGoldbergJul 7, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Yeah for now I think it's fine. If they change that API we should see breakages in the TS version upgrade PR.
		interface Program {
		/**
		* Maps from a SourceFile's `.path` to the name of the package it was imported with.
		*/
		readonly sourceFileToPackageName: ReadonlyMap<Path, string>;
		}

		interface SourceFile extends Declaration, LocalsContainer {
		path: Path;
		}
		}