fix(compiler-cli): ensure LogicalProjectPaths always start with a slash (#29627)

petebacondarwin · IgorMinar · commit e02684e609f1 · 2019-04-08T09:46:16.000-07:00
Previously, if a matching rootDir ended with a slash then the path returned from `logicalPathOfFile()` would not start with a slash, which is inconsistent. PR Close #29627
diff --git a/packages/compiler-cli/src/ngtsc/path/src/logical.ts b/packages/compiler-cli/src/ngtsc/path/src/logical.ts
@@ -81,7 +81,7 @@ export class LogicalFileSystem {
       let logicalFile: LogicalProjectPath|null = null;
       for (const rootDir of this.rootDirs) {
         if (physicalFile.startsWith(rootDir)) {
-          logicalFile = stripExtension(physicalFile.substr(rootDir.length)) as LogicalProjectPath;
+          logicalFile = this.createLogicalProjectPath(physicalFile, rootDir);
           // The logical project does not include any special "node_modules" nested directories.
           if (logicalFile.indexOf('/node_modules/') !== -1) {
             logicalFile = null;
@@ -94,4 +94,10 @@ export class LogicalFileSystem {
     }
     return this.cache.get(physicalFile) !;
   }
+
+  private createLogicalProjectPath(file: AbsoluteFsPath, rootDir: AbsoluteFsPath):
+      LogicalProjectPath {
+    const logicalPath = stripExtension(file.substr(rootDir.length));
+    return (logicalPath.startsWith('/') ? logicalPath : '/' + logicalPath) as LogicalProjectPath;
+  }
 }
diff --git a/packages/compiler-cli/src/ngtsc/path/test/logical_spec.ts b/packages/compiler-cli/src/ngtsc/path/test/logical_spec.ts
@@ -31,6 +31,16 @@ describe('logical paths', () => {
       expect(fs.logicalPathOfFile(abs('/test/foo.ts'))).toEqual('/foo' as LogicalProjectPath);
       expect(fs.logicalPathOfFile(abs('/test/dist/foo.ts'))).toEqual('/foo' as LogicalProjectPath);
     });
+
+    it('should always return `/` prefixed logical paths', () => {
+      const rootFs = new LogicalFileSystem([abs('/')]);
+      expect(rootFs.logicalPathOfFile(abs('/foo/foo.ts')))
+          .toEqual('/foo/foo' as LogicalProjectPath);
+
+      const nonRootFs = new LogicalFileSystem([abs('/test/')]);
+      expect(nonRootFs.logicalPathOfFile(abs('/test/foo/foo.ts')))
+          .toEqual('/foo/foo' as LogicalProjectPath);
+    });
   });
 
   describe('utilities', () => {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export class LogicalFileSystem {`
`81`	`81`	`let logicalFile: LogicalProjectPath\|null = null;`
`82`	`82`	`for (const rootDir of this.rootDirs) {`
`83`	`83`	`if (physicalFile.startsWith(rootDir)) {`
`84`		`- logicalFile = stripExtension(physicalFile.substr(rootDir.length)) as LogicalProjectPath;`
	`84`	`+ logicalFile = this.createLogicalProjectPath(physicalFile, rootDir);`
`85`	`85`	`// The logical project does not include any special "node_modules" nested directories.`
`86`	`86`	`if (logicalFile.indexOf('/node_modules/') !== -1) {`
`87`	`87`	`logicalFile = null;`
`@@ -94,4 +94,10 @@ export class LogicalFileSystem {`
`94`	`94`	`}`
`95`	`95`	`return this.cache.get(physicalFile) !;`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+ private createLogicalProjectPath(file: AbsoluteFsPath, rootDir: AbsoluteFsPath):`
	`99`	`+ LogicalProjectPath {`
	`100`	`+ const logicalPath = stripExtension(file.substr(rootDir.length));`
	`101`	`+ return (logicalPath.startsWith('/') ? logicalPath : '/' + logicalPath) as LogicalProjectPath;`
	`102`	`+ }`
`97`	`103`	`}`