feat(worker): support onlyWithoutExtension in route definition

Author: alxhub

service-worker/worker/src/plugins/routes/index.ts

@@ -13,6 +13,7 @@ interface RouteMap {
 
 interface RouteConfig {
   prefix?: boolean;
+  onlyWithoutExtension?: boolean;
 }
 
 interface RouteRedirectionManifest {
@@ -31,6 +32,11 @@ export class RouteRedirectionImpl implements Plugin<RouteRedirectionImpl> {
     return this.worker.manifest['routing'] as RouteRedirectionManifest;
   }
 
+  private hasExtension(path: string): boolean {
+    const lastSegment = path.substr(path.lastIndexOf('/') + 1);
+    return lastSegment.indexOf('.') !== -1;
+  }
+
   setup(operations: Operation[]): void {
     // No setup needed.
   }
@@ -47,9 +53,12 @@ export class RouteRedirectionImpl implements Plugin<RouteRedirectionImpl> {
     }
     const matchesRoutingTable = Object.keys(manifest.routes).some(route => {
       const config = manifest.routes[route];
-      return config.prefix
+      const matchesPath = config.prefix
         ? path.indexOf(route) === 0
         : path === route;
+      const matchesPathAndExtension = matchesPath &&
+          (!config.onlyWithoutExtension || !this.hasExtension(path));
+      return matchesPathAndExtension;
     });
     if (matchesRoutingTable) {
       ops.unshift(rewriteUrlInstruction(this.worker, req, base + manifest.index));

service-worker/worker/src/test/unit/worker.spec.ts

@@ -34,6 +34,10 @@ const ROUTING_MANIFEST = JSON.stringify({
     routes: {
       '/goodbye.txt': {
         prefix: false
+      },
+      '/prefix': {
+        prefix: true,
+        onlyWithoutExtension: true,
       }
     }
   }
@@ -194,20 +198,26 @@ describe('ngsw', () => {
     beforeAll(done => {
       driver.mockUrl(MANIFEST_URL, ROUTING_MANIFEST);
       driver.mockUrl('/hello.txt', 'Hello world!');
-      driver.mockUrl('/goodbye.txt', 'Should never be fetched!');
       driver.startup();
       driver
         .triggerInstall()
         .then(() => driver.triggerActivate())
         .then(() => driver.waitForReady())
         .then(() => driver.unmockAll())
+        .then(() => driver.mockUrl('/goodbye.txt', 'Should never be fetched!'))
+        .then(() => driver.mockUrl('/prefix/test.json', 'Some json'))
         .then(done, err => errored(err, done));
     });
     it('successfully falls back', done => Promise
       .resolve(null)
       .then(() => expectServed(driver, '/hello.txt', 'Hello world!'))
       .then(() => expectServed(driver, '/goodbye.txt', 'Hello world!'))
       .then(done, err => errored(err, done)))
+    it('successfully falls back prefixed routes', done => Promise
+      .resolve(null)
+      .then(() => expectServed(driver, '/prefix/test', 'Hello world!'))
+      .then(() => expectServed(driver, '/prefix/test.json', 'Some json'))
+      .then(done, err => errored(err, done)));
   });;
   sequence('index fallback', () => {
     let driver: TestWorkerDriver = new TestWorkerDriver(createServiceWorker);