Flatten array of items to precache. Fixes GoogleChromeLabs#24

lib/sw-toolbox.js

@@ -25,14 +25,24 @@ helpers.debug('Service Worker Toolbox is loading');
 
 // Install
 
+var flatten = function(items) {
+  return items.reduce(function(a, b) {
+    return a.concat(b);
+  }, []);
+};
+
 self.addEventListener('install', function(event) {
   var inactiveCache = options.cacheName + '$$$inactive$$$';
   helpers.debug('install event fired');
   helpers.debug('creating cache [' + inactiveCache + ']');
-  helpers.debug('preCache list: ' + (options.preCacheItems.join(', ') || '(none)'));
   event.waitUntil(
     helpers.openCache({cacheName: inactiveCache}).then(function(cache) {
-      return Promise.all(options.preCacheItems).then(cache.addAll.bind(cache));
+      return Promise.all(options.preCacheItems)
+        .then(flatten)
+        .then(function(preCacheItems) {
+          helpers.debug('preCache list: ' + (preCacheItems.join(', ') || '(none)'));
+          return cache.addAll(preCacheItems);
+        });
     })
   );
 });

tests/fixtures/a

@@ -0,0 +1 @@
+a

tests/fixtures/b

@@ -0,0 +1 @@
+b

tests/fixtures/c

@@ -0,0 +1 @@
+c

tests/fixtures/d

@@ -0,0 +1 @@
+d

tests/fixtures/e

@@ -0,0 +1 @@
+e

tests/fixtures/f

@@ -0,0 +1 @@
+f

tests/fixtures/g

@@ -0,0 +1 @@
+g

tests/fixtures/h

@@ -0,0 +1 @@
+h

tests/fixtures/i

@@ -0,0 +1 @@
+i

tests/fixtures/j

@@ -0,0 +1 @@
+j

tests/fixtures/k

@@ -0,0 +1 @@
+k

tests/fixtures/l

@@ -0,0 +1 @@
+l

tests/fixtures/m

@@ -0,0 +1 @@
+m

tests/fixtures/n

@@ -0,0 +1 @@
+n

tests/service-worker.js

@@ -70,3 +70,15 @@ toolbox.router.post('cache/:name', function(request) {
 toolbox.router.delete('cache/:name', function(request) {
   return toolbox.uncache(request.url).then(respondOK, respondError);
 });
+
+toolbox.router.get('fixtures/:foo', toolbox.cacheOnly)
+// Single item
+toolbox.precache('fixtures/a');
+// Array of items
+toolbox.precache(['fixtures/b', 'fixtures/c']);
+// Array of Promises
+toolbox.precache([Promise.resolve('fixtures/d'), Promise.resolve('fixtures/e')]);
+// Array of Arrays
+toolbox.precache(['fixtures/f', ['fixtures/g', 'fixtures/h'], ['fixtures/i', 'fixtures/j']]);
+// Array of Promises for Arrays
+toolbox.precache([Promise.resolve(['fixtures/k', 'fixtures/l']), Promise.resolve(['fixtures/m', 'fixtures/n'])]);

tests/tests.js

@@ -87,6 +87,23 @@ navigator.serviceWorker.ready.then(function() {
         // Catch-all error handler
         assert.ok(false, 'Failed: ' + reason);
       }).then(done);;
-    })
+    });
+  });
+
+  QUnit.test('Precaching', function(assert) {
+    checkValue('fixtures/a', 'a', assert);
+    checkValue('fixtures/b', 'b', assert);
+    checkValue('fixtures/c', 'c', assert);
+    checkValue('fixtures/d', 'd', assert);
+    checkValue('fixtures/e', 'e', assert);
+    checkValue('fixtures/f', 'f', assert);
+    checkValue('fixtures/g', 'g', assert);
+    checkValue('fixtures/h', 'h', assert);
+    checkValue('fixtures/i', 'i', assert);
+    checkValue('fixtures/j', 'j', assert);
+    checkValue('fixtures/k', 'k', assert);
+    checkValue('fixtures/l', 'l', assert);
+    checkValue('fixtures/m', 'm', assert);
+    checkValue('fixtures/n', 'n', assert);
   });
 });