Adjust to tsickle converting the ES5 module processor to a proper TypeScript transformer.
PiperOrigin-RevId: 195789014
diff --git a/internal/tsc_wrapped/compiler_host.ts b/internal/tsc_wrapped/compiler_host.ts
index ea40d55..fa43a74 100644
--- a/internal/tsc_wrapped/compiler_host.ts
+++ b/internal/tsc_wrapped/compiler_host.ts
@@ -106,19 +106,6 @@
}
/**
- * For the given potentially absolute input file path (typically .ts), returns
- * the relative output path. For example, for
- * /path/to/root/blaze-out/k8-fastbuild/genfiles/my/file.ts, will return
- * my/file.js or my/file.closure.js (depending on ES5 mode).
- */
- relativeOutputPath(fileName: string) {
- let result = this.rootDirsRelative(fileName);
- result = result.replace(/(\.d)?\.[jt]sx?$/, '');
- if (!this.bazelOpts.es5Mode) result += '.closure';
- return result + '.js';
- }
-
- /**
* Workaround https://github.com/Microsoft/TypeScript/issues/8245
* We use the `rootDirs` property both for module resolution,
* and *also* to flatten the structure of the output directory
@@ -165,15 +152,8 @@
p => !!filePath.match(new RegExp(p)));
}
- /**
- * fileNameToModuleId gives the module ID for an input source file name.
- * @param fileName an input source file name, e.g.
- * /root/dir/bazel-out/host/bin/my/file.ts.
- * @return the canonical path of a file within blaze, without /genfiles/ or
- * /bin/ path parts, excluding a file extension. For example, "my/file".
- */
fileNameToModuleId(fileName: string): string {
- return this.relativeOutputPath(fileName.substring(0, fileName.lastIndexOf('.')));
+ return this.flattenOutDir(fileName.substring(0, fileName.lastIndexOf('.')));
}
/**
diff --git a/internal/tsc_wrapped/manifest.ts b/internal/tsc_wrapped/manifest.ts
index 4e5b9f6..2e9a8da 100644
--- a/internal/tsc_wrapped/manifest.ts
+++ b/internal/tsc_wrapped/manifest.ts
@@ -42,13 +42,13 @@
*/
export function constructManifest(
modulesManifest: tsickle.ModulesManifest,
- host: {relativeOutputPath: (f: string) => string}): string {
+ host: {flattenOutDir: (f: string) => string}): string {
const result: tsickle.FileMap<boolean> = {};
for (const file of modulesManifest.fileNames) {
topologicalSort(result, file, modulesManifest, {});
}
// NB: The object literal maintains insertion order.
- return Object.keys(result).map(fn => host.relativeOutputPath(fn)).join('\n') +
+ return Object.keys(result).map(fn => host.flattenOutDir(fn)).join('\n') +
'\n';
}
