ts-service-worker 1.1.1 → 1.2.0

package/README.md

@@ -2,7 +2,7 @@
 
 - provide declarative support for the most common caching strategies
 - supports easy integration of multiple caching strategies
-- produces a `service-worker.js` that requires no additional transpilation
+- produces a `service-worker.js` that requires no additional transcompilation
 - avoids nesting and promise chains
 - is written in Typescript and fully typed
 - can scan your disk for resources to cache

package/dist/cli.mjs

@@ -6449,8 +6449,8 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/fileSpecsToPaths.mts
-function fileSpecsToPaths(files) {
+// src/filesSpecToPaths.mts
+function filesSpecToPaths(files) {
   let prefix = "";
   let dir = "";
   let globs;
@@ -6488,7 +6488,7 @@ function isCachePathOnInstall(s) {
   return s.strategy === "cache-on-install" && "paths" in s;
 }
 function isStaticOfflineBackup(s) {
-  return s.strategy === "staticOfflineBackup";
+  return s.strategy === "staticOfflineBackup" && !!s.paths && !!s.backup;
 }
 var OriginAndBelow = Symbol.for("origin-and-below");
 var ScopeAndBelow = Symbol.for("scope-and-below");
@@ -6496,7 +6496,7 @@ function isRoutableStrategy(x) {
   return x.strategy === "cacheFirst" || x.strategy === "networkFirst" || x.strategy === "networkOnly" || x.strategy === "staleWhileRevalidate" || x.strategy === "staticOfflineBackup";
 }
 function convertPreloadFilesToPaths(strategy) {
-  const paths = fileSpecsToPaths(strategy.files);
+  const paths = filesSpecToPaths(strategy.files);
   return {
     strategy: "cache-on-install",
     paths
@@ -6551,7 +6551,9 @@ self.addEventListener('activate', function (event) {
     }))));
 });
 self.addEventListener('fetch', function (event) {
-    const url = event.request.url;
+    
+    const url = event.request.url.replace(/#.*$/, '');
+    
     // Cache http and https only, skip unsupported chrome-extension:// and file://...
     if (!url.startsWith('http'))
         return;
@@ -6568,7 +6570,7 @@ self.addEventListener('fetch', function (event) {
     function matches(paths) {
         return paths &&
             paths.some(path => path instanceof RegExp ?
-                path.exec(url) : url.endsWith(path));
+                path.exec(url) : url === path);
     }
 });
 // Caching strategies
@@ -6616,11 +6618,12 @@ function fetchRequest(event) {
 function fetchAndCache(event) {
     return fetchRequest(event)
         .then(response => {
-          return toCache(event, response).catch(e => {
-            log(\`  - unable to cache \${event.request.url}  \${e}\`);
-            return response;
-          })
-        });
+          return toCache(event, response)
+        })
+        .catch(e => {
+          log(\`  - unable to fetch \${event.request.url}  \${e}\`);
+          throw e
+       });
 }
 function fromCache(event) {
     return caches.open(CACHE_NAME).then(cache => cache.match(event.request));
@@ -6630,7 +6633,7 @@ function fileFromCache(name) {
 }
 function toCache(event, response) {
     if (!response.ok) {
-        log(\`request for \${event.request.url} failed with status \${response.statusText}\`);
+        log(\`skipping cache of failed request \${event.request.url} with status \${response.status} \${response.statusText}\`);
         return response;
     }
     return caches.open(CACHE_NAME)
@@ -6649,8 +6652,36 @@ function log(s) {
 function regexEscape(s) {
     return s.replace(/([/.])/g, '\\\\$&');
 }
+
+function withOrigin(path) {
+    if (path.match(/https?:\\/\\//)) return path
+    if (path.startsWith('/')) return self.origin + path
+    return self.origin + '/' + path
+}
 `;
 
+// src/utils.mts
+function deDup(paths) {
+  if (!Array.isArray(paths))
+    return paths;
+  return [...new Set(paths)].sort();
+}
+
+// src/organizeStrategies.mts
+function organizeStrategies(inputPlan) {
+  const spec = convertAllFilesToPaths(inputPlan);
+  const preloadPaths = deDup(extractAllPreloadPaths(spec));
+  const specWithoutPreloads = convertPreloadPathsToCacheFirst(spec);
+  const routable = removeDuplicatePaths(specWithoutPreloads);
+  return { preloadPaths, routable };
+}
+function removeDuplicatePaths(specs) {
+  return specs.map((spec) => ({
+    ...spec,
+    paths: deDup(spec.paths)
+  }));
+}
+
 // src/generate.mts
 var defaultOptions = {
   version: "0.0",
@@ -6662,9 +6693,7 @@ function generateServiceWorker(inputSpec, optionsIn = {}) {
     ...defaultOptions,
     ...optionsIn
   };
-  const spec = convertAllFilesToPaths(inputSpec);
-  const preloadPaths = extractAllPreloadPaths(spec);
-  const routable = convertPreloadPathsToCacheFirst(spec);
+  const { preloadPaths, routable } = organizeStrategies(inputSpec);
   const varsBlock = generateFlag("DEBUG", options.debug) + generateFlag("SKIP_WAITING", options.skipWaiting) + generateVersion(options.version) + generatePreloadCode(preloadPaths) + generateRoutes(routable);
   return evalTemplate(varsBlock);
 }
@@ -6690,7 +6719,7 @@ function evalTemplate(variables) {
 }
 function pathsToJS(paths) {
   const asArray = Array.isArray(paths) ? paths : [paths];
-  return `[${asArray.map(pathToJS).join(",")}]`;
+  return `[${asArray.map(pathToJS).join(",")}].map(withOrigin)`;
 }
 function pathToJS(path3) {
   switch (typeof path3) {

package/dist/index.js

@@ -6461,8 +6461,8 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/fileSpecsToPaths.mts
-function fileSpecsToPaths(files) {
+// src/filesSpecToPaths.mts
+function filesSpecToPaths(files) {
   let prefix = "";
   let dir = "";
   let globs;
@@ -6500,7 +6500,7 @@ function isCachePathOnInstall(s) {
   return s.strategy === "cache-on-install" && "paths" in s;
 }
 function isStaticOfflineBackup(s) {
-  return s.strategy === "staticOfflineBackup";
+  return s.strategy === "staticOfflineBackup" && !!s.paths && !!s.backup;
 }
 var OriginAndBelow = Symbol.for("origin-and-below");
 var ScopeAndBelow = Symbol.for("scope-and-below");
@@ -6508,7 +6508,7 @@ function isRoutableStrategy(x) {
   return x.strategy === "cacheFirst" || x.strategy === "networkFirst" || x.strategy === "networkOnly" || x.strategy === "staleWhileRevalidate" || x.strategy === "staticOfflineBackup";
 }
 function convertPreloadFilesToPaths(strategy) {
-  const paths = fileSpecsToPaths(strategy.files);
+  const paths = filesSpecToPaths(strategy.files);
   return {
     strategy: "cache-on-install",
     paths
@@ -6563,7 +6563,9 @@ self.addEventListener('activate', function (event) {
     }))));
 });
 self.addEventListener('fetch', function (event) {
-    const url = event.request.url;
+    
+    const url = event.request.url.replace(/#.*$/, '');
+    
     // Cache http and https only, skip unsupported chrome-extension:// and file://...
     if (!url.startsWith('http'))
         return;
@@ -6580,7 +6582,7 @@ self.addEventListener('fetch', function (event) {
     function matches(paths) {
         return paths &&
             paths.some(path => path instanceof RegExp ?
-                path.exec(url) : url.endsWith(path));
+                path.exec(url) : url === path);
     }
 });
 // Caching strategies
@@ -6628,11 +6630,12 @@ function fetchRequest(event) {
 function fetchAndCache(event) {
     return fetchRequest(event)
         .then(response => {
-          return toCache(event, response).catch(e => {
-            log(\`  - unable to cache \${event.request.url}  \${e}\`);
-            return response;
-          })
-        });
+          return toCache(event, response)
+        })
+        .catch(e => {
+          log(\`  - unable to fetch \${event.request.url}  \${e}\`);
+          throw e
+       });
 }
 function fromCache(event) {
     return caches.open(CACHE_NAME).then(cache => cache.match(event.request));
@@ -6642,7 +6645,7 @@ function fileFromCache(name) {
 }
 function toCache(event, response) {
     if (!response.ok) {
-        log(\`request for \${event.request.url} failed with status \${response.statusText}\`);
+        log(\`skipping cache of failed request \${event.request.url} with status \${response.status} \${response.statusText}\`);
         return response;
     }
     return caches.open(CACHE_NAME)
@@ -6661,8 +6664,36 @@ function log(s) {
 function regexEscape(s) {
     return s.replace(/([/.])/g, '\\\\$&');
 }
+
+function withOrigin(path) {
+    if (path.match(/https?:\\/\\//)) return path
+    if (path.startsWith('/')) return self.origin + path
+    return self.origin + '/' + path
+}
 `;
 
+// src/utils.mts
+function deDup(paths) {
+  if (!Array.isArray(paths))
+    return paths;
+  return [...new Set(paths)].sort();
+}
+
+// src/organizeStrategies.mts
+function organizeStrategies(inputPlan) {
+  const spec = convertAllFilesToPaths(inputPlan);
+  const preloadPaths = deDup(extractAllPreloadPaths(spec));
+  const specWithoutPreloads = convertPreloadPathsToCacheFirst(spec);
+  const routable = removeDuplicatePaths(specWithoutPreloads);
+  return { preloadPaths, routable };
+}
+function removeDuplicatePaths(specs) {
+  return specs.map((spec) => ({
+    ...spec,
+    paths: deDup(spec.paths)
+  }));
+}
+
 // src/generate.mts
 var defaultOptions = {
   version: "0.0",
@@ -6674,9 +6705,7 @@ function generateServiceWorker(inputSpec, optionsIn = {}) {
     ...defaultOptions,
     ...optionsIn
   };
-  const spec = convertAllFilesToPaths(inputSpec);
-  const preloadPaths = extractAllPreloadPaths(spec);
-  const routable = convertPreloadPathsToCacheFirst(spec);
+  const { preloadPaths, routable } = organizeStrategies(inputSpec);
   const varsBlock = generateFlag("DEBUG", options.debug) + generateFlag("SKIP_WAITING", options.skipWaiting) + generateVersion(options.version) + generatePreloadCode(preloadPaths) + generateRoutes(routable);
   return evalTemplate(varsBlock);
 }
@@ -6702,7 +6731,7 @@ function evalTemplate(variables) {
 }
 function pathsToJS(paths) {
   const asArray = Array.isArray(paths) ? paths : [paths];
-  return `[${asArray.map(pathToJS).join(",")}]`;
+  return `[${asArray.map(pathToJS).join(",")}].map(withOrigin)`;
 }
 function pathToJS(path2) {
   switch (typeof path2) {