refactor(service-worker): move common code into method

gkalpak · Apr 12, 2018 · c383b1a · c383b1a
1 parent 080e687
commit c383b1a
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/packages/service-worker/config/src/generator.ts b/packages/service-worker/config/src/generator.ts
@@ -52,15 +52,6 @@ export class Generator {
         hashTable[joinUrls(this.baseHref, file)] = hash;
       }, Promise.resolve());
 
-
-      // Figure out the patterns.
-      const patterns = (group.resources.urls || [])
-                           .map(
-                               glob => glob.startsWith('/') || glob.indexOf('://') !== -1 ?
-                                   glob :
-                                   joinUrls(this.baseHref, glob))
-                           .map(glob => globToRegex(glob));
-
       return {
         name: group.name,
         installMode: group.installMode || 'prefetch',
@@ -69,22 +60,16 @@ export class Generator {
                   .concat(plainFiles)
                   .concat(versionedFiles)
                   .map(url => joinUrls(this.baseHref, url)),
-        patterns,
+        patterns: (group.resources.urls || []).map(url => urlToRegex(url, this.baseHref)),
       };
     }));
   }
 
   private processDataGroups(config: Config): Object[] {
     return (config.dataGroups || []).map(group => {
-      const patterns = group.urls
-                           .map(
-                               glob => glob.startsWith('/') || glob.indexOf('://') !== -1 ?
-                                   glob :
-                                   joinUrls(this.baseHref, glob))
-                           .map(glob => globToRegex(glob));
       return {
         name: group.name,
-        patterns,
+        patterns: group.urls.map(url => urlToRegex(url, this.baseHref)),
         strategy: group.cacheConfig.strategy || 'performance',
         maxSize: group.cacheConfig.maxSize,
         maxAge: parseDurationToMs(group.cacheConfig.maxAge),
@@ -123,11 +108,19 @@ function matches(file: string, patterns: {positive: boolean, regex: RegExp}[]):
   return res;
 }
 
+function urlToRegex(url: string, baseHref: string): string {
+  if (!url.startsWith('/') && url.indexOf('://') === -1) {
+    url = joinUrls(baseHref, url);
+  }
+
+  return globToRegex(url);
+}
+
 function joinUrls(a: string, b: string): string {
   if (a.endsWith('/') && b.startsWith('/')) {
     return a + b.substr(1);
   } else if (!a.endsWith('/') && !b.startsWith('/')) {
     return a + '/' + b;
   }
   return a + b;
-}
+}