@jon49/sw 0.15.1 → 0.15.3

package/bin/lib/esbuild-plugins.ts

@@ -25,7 +25,7 @@ async function setPagesToReturn(targetDirectory: string) {
     await Promise.all(files.map(async (file: string) => {
         let filename = path.join(targetDirectory, file)
         let content = await readFile(filename, "utf-8")
-        let matched = content.match(/,(\w*)=(\w*);export/)
+        let matched = content.match(/,(\w*)=([\w|\$]*);export/)
         if (matched) {
             let [, name, value] = matched
             content = content.replace(`,${name}=${value}`, "")

package/lib/routes.middleware.ts

@@ -2,241 +2,246 @@ import { SwResponse } from "./sw-framework.js"
 import { isHtml } from "./utils.js"
 
 let { links, globalDb } =
-    // @ts-ignore
-    self.sw as { links: { file: string, url: string }[], html: Function, db: any, globalDb: any }
+  // @ts-ignore
+  self.sw as { links: { file: string, url: string }[], html: Function, db: any, globalDb: any }
 
 if (!links) {
-    console.error("Expecting links defined with `self.sw.links`, but found none.")
+  console.error("Expecting links defined with `self.sw.links`, but found none.")
 }
 
 function redirect(req: Request) {
-    return Response.redirect(req.referrer, 303)
+  return Response.redirect(req.referrer, 303)
 }
 
 const searchParamsHandler = {
-    get(obj: any, prop: string) {
-        if (prop === "_url") {
-            return obj
-        }
-        return obj.searchParams.get(prop)
+  get(obj: any, prop: string) {
+    if (prop === "_url") {
+      return obj
     }
+    return obj.searchParams.get(prop)
+  }
 }
 
 function searchParams<TReturn>(url: URL): TReturn & { _url: URL } {
-    return new Proxy(url, searchParamsHandler)
+  return new Proxy(url, searchParamsHandler)
 }
 
 interface ResponseOptions {
-    handleErrors?: Function
+  handleErrors?: Function
 }
 
 export let options: ResponseOptions = {}
 
 // @ts-ignore
 export async function useRoutes(req: Request, res: SwResponse, ctx: any): Promise<void> {
-    try {
-        const url = normalizeUrl(req.url)
-        if (!url.pathname.startsWith("/web/")) {
-            res.response = await fetch(req)
-        } else {
-            Object.assign(res, await executeHandler({ url, req, ctx }))
-        }
-    } catch (error) {
-        console.error("Get Response Error", error)
-        res.error = "Oops something happened which shouldn't have!"
+  try {
+    const url = normalizeUrl(req.url)
+    if (!url.pathname.startsWith("/web/")) {
+      res.response = await fetch(req)
+    } else {
+      Object.assign(res, await executeHandler({ url, req, ctx }))
     }
+  } catch (error) {
+    console.error("Get Response Error", error)
+    res.error = "Oops something happened which shouldn't have!"
+  }
 }
 
 function call(fn: Function | undefined, args: any) {
-    return fn instanceof Function && fn(args)
+  return fn instanceof Function && fn(args)
 }
 
 const methodTypes = ['get', 'post'] as const
 type MethodTypes = typeof methodTypes[number] | null
 
 function isMethod(method: unknown) {
-    if (typeof method === "string" && methodTypes.includes(<any>method)) {
-        return method as MethodTypes
-    }
-    return null
+  if (typeof method === "string" && methodTypes.includes(<any>method)) {
+    return method as MethodTypes
+  }
+  return null
 }
 
 let cache = new Map<string, any>()
 export async function findRoute(url: URL, method: unknown) {
-    let validMethod: MethodTypes = isMethod(method)
-    if (validMethod) {
-        // @ts-ignore
-        if (!self.sw?.routes) {
-            console.error("Expecting routes defined with `self.sw.routes`, but found none.")
+  let validMethod: MethodTypes = isMethod(method)
+  if (validMethod) {
+    // @ts-ignore
+    if (!self.sw?.routes) {
+      console.error("Expecting routes defined with `self.sw.routes`, but found none.")
+      return null
+    }
+    // @ts-ignore
+    for (const r of self.sw.routes) {
+      // @ts-ignore
+      if (r.file
+        && (r.route instanceof RegExp && r.route.test(url.pathname)
+          || (r.route instanceof Function && r.route(url)))) {
+        let file = links?.find(x => x.url === r.file)?.file
+        // Load file
+        if (!file) {
+          console.error(`"${r.file}" not found in links!`)
+          return null
+        }
+        if (!cache.has(file)) {
+          let cachedResponse = await cacheResponse(file)
+          if (!cacheResponse) {
+            console.error(`"${file}" not found in cache!`)
             return null
+          }
+          let text = await cachedResponse.text()
+          let func = new Function(text)()
+          cache.set(file, func)
         }
-        // @ts-ignore
-        for (const r of self.sw.routes) {
-            // @ts-ignore
-            if (r.file
-                && (r.route instanceof RegExp && r.route.test(url.pathname)
-                    || (r.route instanceof Function && r.route(url)))) {
-                let file = links?.find(x => x.url === r.file)?.file
-                // Load file
-                if (!file) {
-                    console.error(`"${r.file}" not found in links!`)
-                    return null
-                }
-                if (!cache.has(file)) {
-                    let cachedResponse = await cacheResponse(file)
-                    if (!cacheResponse) {
-                        console.error(`"${file}" not found in cache!`)
-                        return null
-                    }
-                    let text = await cachedResponse.text()
-                    let func = new Function(text)()
-                    cache.set(file, func)
-                }
-
-                let routeDef = cache.get(file)
-                if (routeDef[validMethod]) {
-                    return routeDef[validMethod]
-                }
-            }
-
-            if (r[validMethod]
-                && (r.route instanceof RegExp && r.route.test(url.pathname)
-                    || (r.route instanceof Function && r.route(url)))) {
-                return r[validMethod]
-            }
+
+        let routeDef = cache.get(file)
+        if (routeDef[validMethod]) {
+          return routeDef[validMethod]
         }
+      }
+
+      if (r[validMethod]
+        && (r.route instanceof RegExp && r.route.test(url.pathname)
+          || (r.route instanceof Function && r.route(url)))) {
+        return r[validMethod]
+      }
     }
-    return null
+  }
+  return null
 }
 
 interface ExectuteHandlerOptions {
-    url: URL
-    req: Request
-    ctx: any
+  url: URL
+  req: Request
+  ctx: any
 }
 async function executeHandler({ url, req, ctx }: ExectuteHandlerOptions): Promise<SwResponse> {
-    let method = req.method.toLowerCase()
-    let isPost = method === "post"
-    if (!isPost) {
-        if (!url.pathname.endsWith("/")) {
-            return { response: await cacheResponse(url.pathname, req) }
-        }
+  let method = req.method.toLowerCase()
+  let isPost = method === "post"
+  if (!isPost) {
+    if (!url.pathname.endsWith("/")) {
+      return { response: await cacheResponse(url.pathname, req) }
+    }
 
-        if (url.searchParams.get("login") === "success") {
-            await globalDb.setLoggedIn(true)
-        }
+    if (url.searchParams.get("login") === "success") {
+      await globalDb.setLoggedIn(true)
     }
+  }
 
-    let handlers =
-        <RouteHandler<RouteGetArgs | RoutePostArgs> | null>
-        await findRoute(url, method)
+  let handlers =
+    <RouteHandler<RouteGetArgs | RoutePostArgs> | null>
+    await findRoute(url, method)
 
-    // @ts-ignore
-    if (handlers) {
-        try {
-            let messages: string[] = []
-            const data = await getData(req)
-            let query = searchParams<{ handler?: string }>(url)
-            let args = { req, data, query }
-            let result
-            try {
-                result = await (
-                    handlers instanceof Function
-                        ? handlers(args)
-                        : (call(handlers[query.handler ?? ""], args)
-                            || call(handlers[method], args)
-                            || Promise.reject("I'm sorry, I didn't understand where to route your request.")))
-            } catch (e: any) {
-                if (e.reasons) {
-                    ctx.messages =
-                        e.reasons.map((x: any) => x.reason.reasons).flat().map((x: any) => x.reason).flat()
-                    return {
-                        status: 204,
-                    }
-                } else {
-                    throw e
-                }
-            }
-
-            if (!result) {
-                return isPost
-                    ? { response: redirect(req) }
-                    : { error: "Not found!" }
-            }
-
-            if (isPost && result.message == null) {
-                messages.push("Saved!")
-            }
-
-            if (result.message?.length > 0) {
-                messages.push(result.message)
-            } else if (result.messages?.length > 0) {
-                messages.push(...result.messages)
-            }
-            ctx.messages = result.messages = messages
-            ctx.events = result.events
-
-            if (isHtml(result)) {
-                return {
-                    body: result,
-                }
-            }
-
-            if (isHtml(result.body)) {
-                return { 
-                    ...result,
-                    type: "text/html",
-                }
-            } else {
-                if ("json" in result) {
-                    result.body = JSON.stringify(result.json)
-                    result.headers = {
-                        ...result.headers,
-                    }
-                } else if (result.messages?.length > 0) {
-                    return {
-                        ...result,
-                        status: result.status || 204,
-                    }
-                }
-                return {
-                    ...result,
-                    type: "application/json"
-                }
-            }
-        } catch (error) {
-            console.error(`"${method}" error:`, error, "\nURL:", url);
-            if (isPost) {
-                return { error: "An error occurred while processing your request." }
-            } else {
-                return { error: "Not found!" }
-            }
+  // @ts-ignore
+  if (handlers) {
+    try {
+      let messages: string[] = []
+      const data = await getData(req)
+      let query = searchParams<{ handler?: string }>(url)
+      let args = { req, data, query }
+      let result
+      try {
+        result = await (
+          handlers instanceof Function
+            ? handlers(args)
+            : (call(handlers[query.handler ?? ""], args)
+              || call(handlers[method], args)
+              || Promise.reject("I'm sorry, I didn't understand where to route your request.")))
+      } catch (e: any) {
+        if (typeof e === "string") {
+          e = [e]
+        }
+        if ("message" in e) {
+          e = [e.message]
+        }
+        if (Array.isArray(e)) {
+          ctx.messages = e
+          return {
+            status: 204,
+          }
+        } else {
+          throw e
+        }
+      }
+
+      if (!result) {
+        return isPost
+          ? { response: redirect(req) }
+          : { error: "Not found!" }
+      }
+
+      if (isPost && result.message == null) {
+        messages.push("Saved!")
+      }
+
+      if (result.message?.length > 0) {
+        messages.push(result.message)
+      } else if (result.messages?.length > 0) {
+        messages.push(...result.messages)
+      }
+      ctx.messages = result.messages = messages
+      ctx.events = result.events
+
+      if (isHtml(result)) {
+        return {
+          body: result,
         }
+      }
+
+      if (isHtml(result.body)) {
+        return {
+          ...result,
+          type: "text/html",
+        }
+      } else {
+        if ("json" in result) {
+          result.body = JSON.stringify(result.json)
+          result.headers = {
+            ...result.headers,
+          }
+        } else if (result.messages?.length > 0) {
+          return {
+            ...result,
+            status: result.status || 204,
+          }
+        }
+        return {
+          ...result,
+          type: "application/json"
+        }
+      }
+    } catch (error) {
+      console.error(`"${method}" error:`, error, "\nURL:", url);
+      if (isPost) {
+        return { error: "An error occurred while processing your request." }
+      } else {
+        return { error: "Not found!" }
+      }
     }
+  }
 
-    return { error: "Not Found!" }
+  return { error: "Not Found!" }
 }
 
 async function getData(req: Request) {
-    let o: any = {}
-    if (req.headers.get("content-type")?.includes("application/x-www-form-urlencoded")) {
-        const formData = await req.formData()
-        for (let [key, val] of formData.entries()) {
-            if (key.endsWith("[]")) {
-                key = key.slice(0, -2)
-                if (key in o) {
-                    o[key].push(val)
-                } else {
-                    o[key] = [val]
-                }
-            } else {
-                o[key] = val
-            }
+  let o: any = {}
+  if (req.headers.get("content-type")?.includes("application/x-www-form-urlencoded")) {
+    const formData = await req.formData()
+    for (let [key, val] of formData.entries()) {
+      if (key.endsWith("[]")) {
+        key = key.slice(0, -2)
+        if (key in o) {
+          o[key].push(val)
+        } else {
+          o[key] = [val]
         }
-    } else if (req.headers.get("Content-Type")?.includes("json")) {
-        o = await req.json()
+      } else {
+        o[key] = val
+      }
     }
-    return o
+  } else if (req.headers.get("Content-Type")?.includes("json")) {
+    o = await req.json()
+  }
+  return o
 }
 
 /**
@@ -244,88 +249,88 @@ async function getData(req: Request) {
 *  /my/script.js -> /my/script.js
 */
 function normalizeUrl(url: string): URL {
-    let uri = new URL(url)
-    let path = uri.pathname
-    !uri.pathname.endsWith("/") && (uri.pathname = isFile(path) ? path : path + "/")
-    return uri
+  let uri = new URL(url)
+  let path = uri.pathname
+  !uri.pathname.endsWith("/") && (uri.pathname = isFile(path) ? path : path + "/")
+  return uri
 }
 
 function isFile(s: string) {
-    return s.lastIndexOf("/") < s.lastIndexOf(".")
+  return s.lastIndexOf("/") < s.lastIndexOf(".")
 }
 
 async function cacheResponse(url: string, req?: Request | undefined): Promise<Response> {
-    url = links?.find(x => x.url === url)?.file || url
-    const match = await caches.match(url)
-    if (match) return match
-    const res = await fetch(req || url)
-    if (!res || res.status !== 200 || res.type !== "basic") return res
-    const responseToCache = res.clone()
-    // @ts-ignore
-    let version: string = self.sw?.version
-        ?? (console.warn("The version number is not available, expected glboal value `self.sw.version`."), "")
-    const cache = await caches.open(version)
-    cache.put(url, responseToCache)
-    return res
+  url = links?.find(x => x.url === url)?.file || url
+  const match = await caches.match(url)
+  if (match) return match
+  const res = await fetch(req || url)
+  if (!res || res.status !== 200 || res.type !== "basic") return res
+  const responseToCache = res.clone()
+  // @ts-ignore
+  let version: string = self.sw?.version
+    ?? (console.warn("The version number is not available, expected glboal value `self.sw.version`."), "")
+  const cache = await caches.open(version)
+  cache.put(url, responseToCache)
+  return res
 }
 
 export interface RouteGetArgs {
-    req: Request
-    query: any
+  req: Request
+  query: any
 }
 
 export interface RoutePostArgs {
-    query: any
-    data: any
-    req: Request
+  query: any
+  data: any
+  req: Request
 }
 
 export interface RouteObjectReturn {
-    body?: string | AsyncGenerator | null
-    status?: number
-    headers?: any
-    events?: any
-    message?: string
-    messages?: string[]
-    json?: any
+  body?: string | AsyncGenerator | null
+  status?: number
+  headers?: any
+  events?: any
+  message?: string
+  messages?: string[]
+  json?: any
 }
 
 export type RouteHandler<T> = {
-    (options: T): Promise<
-        AsyncGenerator
-        | Response
-        | RouteObjectReturn
-        | undefined
-        | null
-        | void> | (
-        AsyncGenerator
-        | Response
-        | RouteObjectReturn
-        | undefined
-        | null
-        | void)
+  (options: T): Promise<
+    AsyncGenerator
+    | Response
+    | RouteObjectReturn
+    | undefined
+    | null
+    | void> | (
+      AsyncGenerator
+      | Response
+      | RouteObjectReturn
+      | undefined
+      | null
+      | void)
 }
 
 export interface RoutePostHandler {
-    [handler: string]: RouteHandler<RoutePostArgs>
+  [handler: string]: RouteHandler<RoutePostArgs>
 }
 
 export interface RouteGetHandler {
-    [handler: string]: RouteHandler<RouteGetArgs>
+  [handler: string]: RouteHandler<RouteGetArgs>
 }
 
 interface Route_ {
-    route: RegExp | ((a: URL) => boolean)
-    file?: string
-    get?: RouteHandler<RouteGetArgs> | RouteGetHandler
-    post?: RouteHandler<RoutePostArgs> | RoutePostHandler
+  route: RegExp | ((a: URL) => boolean)
+  file?: string
+  get?: RouteHandler<RouteGetArgs> | RouteGetHandler
+  post?: RouteHandler<RoutePostArgs> | RoutePostHandler
 }
 
 type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
-    Pick<T, Exclude<keyof T, Keys>>
-    & {
-        [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>
-    }[Keys]
+  Pick<T, Exclude<keyof T, Keys>>
+  & {
+    [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>
+  }[Keys]
 
 export type Route = RequireAtLeastOne<Route_, "file" | "get" | "post">
 export type RoutePage = Pick<Route_, "get" | "post">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jon49/sw",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Packages for MVC service workers.",
   "type": "module",
   "files": [