Reference the same files as the compiler

Author: jablko

src/lib/definition-parser.ts

@@ -212,7 +212,7 @@ function getTypingDataForSingleTypesVersion(
 ): TypingDataFromIndividualTypeScriptVersion {
     const tsconfig = fs.readJson("tsconfig.json") as TsConfig;
     checkFilesFromTsConfig(packageName, tsconfig, fs.debugPath());
-    const { types, tests } = allReferencedFiles(tsconfig.files!, fs, packageName, packageDirectory);
+    const { types, tests, hasNonRelativeReference } = allReferencedFiles(tsconfig.files!, fs, packageName, packageDirectory);
     const usedFiles = new Set([...types.keys(), ...tests.keys(), "tsconfig.json", "tslint.json"]);
     const otherFiles = ls.indexOf(unusedFilesName) > -1 ? (fs.readFile(unusedFilesName)).split(/\r?\n/g).filter(Boolean) : [];
     checkAllFilesUsed(ls, usedFiles, otherFiles, packageName, fs);
@@ -232,6 +232,14 @@ function getTypingDataForSingleTypesVersion(
         ),
     );
 
+    const { paths } = tsconfig.compilerOptions;
+    if (directoryVersion !== undefined && !(paths && `${packageName}/*` in paths) && hasNonRelativeReference) {
+        const mapping = JSON.stringify([`${packageName}/v${formatTypingVersion(directoryVersion)}/*`]);
+        throw new Error(
+            `${packageName}: Older version ${formatTypingVersion(directoryVersion)} must have a "paths" entry of "${packageName}/*": ${mapping}`,
+        );
+    }
+
     const { dependencies, pathMappings } = calculateDependencies(packageName, tsconfig, dependenciesSet, directoryVersion);
     const tsconfigPathsForHash = JSON.stringify(tsconfig.compilerOptions.paths);
     return {

src/lib/module-info.ts

@@ -146,12 +146,13 @@ function withoutExtension(str: string, ext: string): string {
 /** Returns a map from filename (path relative to `directory`) to the SourceFile we parsed for it. */
 export function allReferencedFiles(
     entryFilenames: ReadonlyArray<string>, fs: FS, packageName: string, baseDirectory: string,
-): { types: Map<string, ts.SourceFile>, tests: Map<string, ts.SourceFile> } {
+): { types: Map<string, ts.SourceFile>, tests: Map<string, ts.SourceFile>, hasNonRelativeReference: boolean } {
     const seenReferences = new Set<string>();
     const types = new Map<string, ts.SourceFile>();
     const tests = new Map<string, ts.SourceFile>();
+    let hasNonRelativeReference = false;
     entryFilenames.forEach(text => recur({ text, exact: true }));
-    return { types, tests };
+    return { types, tests, hasNonRelativeReference };
 
     function recur({ text, exact }: Reference): void {
         if (seenReferences.has(text)) {
@@ -168,13 +169,14 @@ export function allReferencedFiles(
                 tests.set(resolvedFilename, src);
             }
 
-            const refs = findReferencedFiles(
+            const { refs, hasNonRelativeReference: result } = findReferencedFiles(
                 src,
                 packageName,
                 path.dirname(resolvedFilename),
                 normalizeSlashes(path.relative(baseDirectory, fs.debugPath())),
             );
             refs.forEach(recur);
+            hasNonRelativeReference = hasNonRelativeReference || result;
         }
     }
 
@@ -210,6 +212,7 @@ interface Reference {
  */
 function findReferencedFiles(src: ts.SourceFile, packageName: string, subDirectory: string, baseDirectory: string) {
     const refs: Reference[] = [];
+    let hasNonRelativeReference = false;
 
     for (const ref of src.referencedFiles) {
         // Any <reference path="foo"> is assumed to be local
@@ -232,7 +235,7 @@ function findReferencedFiles(src: ts.SourceFile, packageName: string, subDirecto
             addReference({ text: convertToRelativeReference(ref), exact: false });
         }
     }
-    return refs;
+    return { refs, hasNonRelativeReference };
 
     function addReference(ref: Reference): void {
         // `path.normalize` may add windows slashes
@@ -256,6 +259,7 @@ function findReferencedFiles(src: ts.SourceFile, packageName: string, subDirecto
 
     /** boring/foo -> ./foo when subDirectory === '.'; ../foo when it's === 'x'; ../../foo when it's 'x/y' */
     function convertToRelativeReference(name: string) {
+        hasNonRelativeReference = true;
         const relative = "." + "/..".repeat(subDirectory === "." ? 0 : subDirectory.split("/").length);
         return relative + name.slice(packageName.length);
     }