@reykjavik/webtools 0.2.10 → 0.3.1

package/esm/errorhandling.js

@@ -2,7 +2,7 @@
  * Error subclass for thrown NON-Error values that got turned into an actual
  * Error, with the original thrown value as the `payload` property.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#aserror
  */
 /*#__NO_SIDE_EFFECTS__*/
 export class ErrorFromPayload extends Error {
@@ -24,7 +24,7 @@ export class ErrorFromPayload extends Error {
  * something else it is wrapped in a new `ErrorFromPayload` instance, and the
  * original value is stored in a `payload`
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#aserror
  */
 /*#__NO_SIDE_EFFECTS__*/
 export const asError = (maybeError) => {
@@ -74,29 +74,30 @@ mapFn) => {
  * Singleton object with small methods for creating, mapping or handling
  * `ResultTupleObj` instances.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#result-singleton
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#result-singleton
  */
 export const Result = {
     /**
      * Factory for creating a successful `Result.TupleObj`.
      *
-     * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resultsuccess
+     * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#resultsuccess
      */
     Success,
     /**
      * Factory for creating a failed `Result.TupleObj`.
      *
-     * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resultsfail
+     * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#resultsfail
      */
     Fail,
     // NOTE: The JSDoc must be placed above the `catch_` function above.
     catch: catch_,
+    ify: catch_,
     /**
      * Helper to map a `ResultTuple`-like object to a new `ResultTupleObj`
      * object, applying a transformation function to the result, but retaining
      * the error as-is.
      *
-     * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulmap
+     * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#resulmap
      */
     /*#__NO_SIDE_EFFECTS__*/
     map: (result, mapFn) => {
@@ -110,7 +111,7 @@ export const Result = {
      * Unwraps a discriminated [error, result] `Result.Tuple`-like object
      * and throws if there's an error, but returns the result otherwise.
      *
-     * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulthrow
+     * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#resulthrow
      */
     /*#__NO_SIDE_EFFECTS__*/
     throw: (result) => {

package/esm/hooks.d.ts

@@ -6,7 +6,7 @@
  * **NOTE:** The supplied callback does not need to be memoized. The debouncer
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usedebounced
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usedebounced
  */
 export declare const useDebounced: <A extends Array<unknown>>(
 /** The function to debounce */
@@ -23,7 +23,7 @@ immediate?: boolean) => ((...args: A) => void) & {
  * **NOTE:** The supplied callback does not need to be memoized. The throttler
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usethrottled
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usethrottled
  */
 export declare const useThrottled: <A extends Array<unknown>>(
 /** The function to throttle */

package/esm/hooks.js

@@ -8,7 +8,7 @@ import { debounce, throttle } from './async.js';
  * **NOTE:** The supplied callback does not need to be memoized. The debouncer
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usedebounced
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usedebounced
  */
 export const useDebounced = (
 /** The function to debounce */
@@ -29,7 +29,7 @@ immediate) => {
  * **NOTE:** The supplied callback does not need to be memoized. The throttler
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usethrottled
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usethrottled
  */
 export const useThrottled = (
 /** The function to throttle */

package/esm/http.d.ts

@@ -154,23 +154,23 @@ type TTLObj = {
 /**
  * Configures quick TTL-related settings for a HTTP request object
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#type-ttlconfig
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#type-ttlconfig
  */
 export type TTLConfig = TTL | TTLKeywords | TTLObj;
-/**
- * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
- * negative input values.
- *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
- */
-export declare const toSec: (ttl: TTL) => number;
 /**
  * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
  * and/or negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#toms-duration-helper
  */
 export declare const toMs: (ttl: TTL) => number;
+/**
+ * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
+ * negative input values.
+ *
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#tosec-ttl-helper
+ */
+export declare const toSec: (ttl: TTL) => number;
 type ServerResponseStub = Pick<ServerResponse, 'setHeader' | 'getHeader' | 'removeHeader'> & {
     headers?: Record<string, string | Array<string>>;
 };
@@ -181,7 +181,7 @@ type ResponseStub = {
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
  * on a HTTP response
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrol-helper
  */
 export declare const cacheControl: (response: ServerResponseStub | ResponseStub | Map<string, string> | {
     res: ServerResponseStub | ResponseStub;
@@ -191,7 +191,7 @@ export declare const cacheControl: (response: ServerResponseStub | ResponseStub
  * situations requiring a `HeadersInit` compatible object.
  *
  * Accepts the same arguments as `cacheControl()`.
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrolheaders-helper
  */
 export declare const cacheControlHeaders: (ttlCfg: TTLConfig, eTag?: string | number) => Record<string, string>;
 export {};

package/esm/http.js

@@ -125,36 +125,44 @@ export const HTTP_508_LoopDetected = 508;
 export const HTTP_510_NotExtended = 510;
 /** The client needs to authenticate to gain network access. */
 export const HTTP_511_NetworkAuthenticationRequired = 511;
-const unitToSeconds = {
-    s: 1,
-    m: 60,
-    h: 3600,
-    d: 24 * 3600,
-    w: 7 * 24 * 3600,
+const unitToMilliseconds = {
+    s: 1000,
+    m: 60000,
+    h: 60 * 60000,
+    d: 24 * 60 * 60000,
+    w: 7 * 24 * 60 * 60000,
 };
 /**
- * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
- * negative input values.
+ * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
+ * and/or negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#toms-duration-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
-export const toSec = (ttl) => {
+export const toMs = (ttl) => {
+    if (!ttl) {
+        return 0;
+    }
     if (typeof ttl === 'string') {
         const value = parseFloat(ttl);
-        const factor = unitToSeconds[ttl.slice(-1)] || 1;
+        const factor = unitToMilliseconds[ttl.slice(-1)] || 1;
         ttl = value * factor;
     }
     return Math.max(0, Math.round(ttl)) || 0;
 };
 /**
- * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
- * and/or negative input values.
+ * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
+ * negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#tosec-ttl-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
-export const toMs = (ttl) => toSec(ttl) * 1000;
+export const toSec = (ttl) => {
+    if (typeof ttl === 'number') {
+        ttl = ttl * 1000;
+    }
+    return Math.round(toMs(ttl) / 1000);
+};
 /*#__NO_SIDE_EFFECTS__*/
 const toRespnseStubHeaders = (response) => {
     if (response instanceof Map) {
@@ -199,7 +207,7 @@ const setCC = (response, cc) => {
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
  * on a HTTP response
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrol-helper
  */
 /*#__NO_SIDE_EFFECTS__*/ // eslint-disable-next-line complexity
 export const cacheControl = (response, ttlCfg, eTag) => {
@@ -210,7 +218,7 @@ export const cacheControl = (response, ttlCfg, eTag) => {
     let maxAge = opts.maxAge;
     if (typeof maxAge === 'string') {
         if (maxAge === 'permanent') {
-            maxAge = 365 * unitToSeconds.d;
+            maxAge = 365 * unitToMilliseconds.d;
         }
         else if (maxAge === 'no-cache') {
             maxAge = 0;
@@ -242,7 +250,7 @@ export const cacheControl = (response, ttlCfg, eTag) => {
  * situations requiring a `HeadersInit` compatible object.
  *
  * Accepts the same arguments as `cacheControl()`.
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrolheaders-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 export const cacheControlHeaders = (ttlCfg, eTag) => {

package/esm/next/http.d.ts

@@ -25,7 +25,7 @@ export type InferErrorPageProps<SEP extends ShowErrorPageFn<any>> = Cleanup<Retu
  * cases when `getServerSideProps` returns an `__error` prop with `statusCode`
  * and optional friendly `message`.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#makeerrorizeapphoc
  */
 export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: FunctionComponent<EP>) => {
     <P extends {
@@ -47,7 +47,7 @@ export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorP
  * to return an `HTTP_304_NotModified` response with an empty props object,
  * in a way that doesn't make TypeScript shout at you.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#notmodified304-helper
  */
 export declare const notModified304: (response: ServerResponse | NextContextLike) => {
     readonly props: any;

package/esm/next/http.js

@@ -9,7 +9,7 @@ export * from '../http.js';
  * Use this method inside a `getServerSideProps` method (or API route)
  * to return an error page with proper HTTP status code and all the shit.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#showerrorpage-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#showerrorpage-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 const showErrorPage = (response, error, ttl = '2s') => {
@@ -34,7 +34,7 @@ const showErrorPage = (response, error, ttl = '2s') => {
  * cases when `getServerSideProps` returns an `__error` prop with `statusCode`
  * and optional friendly `message`.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#makeerrorizeapphoc
  */
 /*#__NO_SIDE_EFFECTS__*/
 export const makeErrorizeAppHOC = (ErrorPage) => {
@@ -64,7 +64,7 @@ export const makeErrorizeAppHOC = (ErrorPage) => {
  * to return an `HTTP_304_NotModified` response with an empty props object,
  * in a way that doesn't make TypeScript shout at you.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#notmodified304-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 export const notModified304 = (response) => {

package/esm/react-router/Wait.d.ts

@@ -31,7 +31,7 @@ export type WaitProps<T> = WaitPropsBase<T> & WaitFallbacks;
  * custom properties for `meanwhile` and `error` fallbacks, and/or other
  * behaviors.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#type-waitcomponent
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-rr.md#type-waitcomponent
  */
 export type WaitComponent<CustomProps extends Record<string, unknown> = Record<never, never>> = (<T>(props: WaitPropsBase<T> & CustomProps) => ReactElement) & {
     displayName?: string;
@@ -43,7 +43,7 @@ export type WaitComponent<CustomProps extends Record<string, unknown> = Record<n
  * If the awaited promise (`props.for`) resolves to an object with a truthy
  * `$error` property, the `$error` will be thrown.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#wait-component
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-rr.md#wait-component
  */
 export declare const Wait: WaitComponent<WaitFallbacks>;
 export {};

package/esm/react-router/Wait.js

@@ -7,7 +7,7 @@ import { Await } from 'react-router';
  * If the awaited promise (`props.for`) resolves to an object with a truthy
  * `$error` property, the `$error` will be thrown.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#wait-component
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-rr.md#wait-component
  */
 export const Wait = (props) => (React.createElement(Suspense, { fallback: props.meanwhile || 'Loading...' },
     React.createElement(Await, { resolve: props.for, errorElement: props.error || 'An error occurred.' }, (value) => {

package/esm/react-router/http.d.ts

@@ -2,6 +2,6 @@
  * Detects if the request is a client fetch, or an initial/full-page load.
  * Useful for deciding whether to defer data fetching or not.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#isclientfetch
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-rr.md#isclientfetch
  */
 export declare const isClientFetch: (request: Request) => boolean;

package/esm/react-router/http.js

@@ -2,7 +2,7 @@
  * Detects if the request is a client fetch, or an initial/full-page load.
  * Useful for deciding whether to defer data fetching or not.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#isclientfetch
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-rr.md#isclientfetch
  */
 /*#__NO_SIDE_EFFECTS__*/
 export const isClientFetch = (request) => 

package/esm/vanillaExtract.d.ts

@@ -2,14 +2,14 @@ import { GlobalStyleRule } from '@vanilla-extract/css';
 /**
  * Adds free-form CSS as a globalStyle
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillaglobal
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillaglobal
  */
 export declare const vanillaGlobal: (css: string) => void;
 /**
  * Spreads the return value into a style object, to inject free-form CSS
  * properties (or nested blocks)
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillaprops
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillaprops
  */
 export declare const vanillaProps: (css: string) => GlobalStyleRule;
 type ClassNameCallback = (
@@ -27,7 +27,7 @@ classNameSelector: string) => string;
  *
  * To opt out of the `&&` replacement, use the callback function signature.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillaclass
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillaclass
  */
 export declare function vanillaClass(css: string | ClassNameCallback): string;
 export declare function vanillaClass(debugId: string, css: string | ClassNameCallback): string;
@@ -35,7 +35,7 @@ export declare function vanillaClass(debugId: string, css: string | ClassNameCal
  * Returns an object with privately scoped CSS variables props.
  * Pass them around and use them in your CSS.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillacvars
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillacvars
  */
 export declare const vanillaVars: <T extends string>(...varNames: Array<T>) => Record<`var${Capitalize<T>}`, string> & {
     /** Allows initializing all or some of the variables in CSS, without offending VSCode's CSS syntax parser too much. */

package/esm/vanillaExtract.js

@@ -3,7 +3,7 @@ import { globalStyle, style } from '@vanilla-extract/css';
 /**
  * Adds free-form CSS as a globalStyle
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillaglobal
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillaglobal
  */
 export const vanillaGlobal = (css) => globalStyle('x', { x: `} ${css} x{x:` });
 // ---------------------------------------------------------------------------
@@ -11,7 +11,7 @@ export const vanillaGlobal = (css) => globalStyle('x', { x: `} ${css} x{x:` });
  * Spreads the return value into a style object, to inject free-form CSS
  * properties (or nested blocks)
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillaprops
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillaprops
  */
 export const vanillaProps = (css) => ({ x: `; ${css}` });
 export function vanillaClass(cssOrDebugId, css) {
@@ -31,7 +31,7 @@ export function vanillaClass(cssOrDebugId, css) {
  * Returns an object with privately scoped CSS variables props.
  * Pass them around and use them in your CSS.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#vanillacvars
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#vanillacvars
  */
 export const vanillaVars = (...varNames) => {
     const id = vanillaClass(``);

package/hooks.d.ts

@@ -6,7 +6,7 @@
  * **NOTE:** The supplied callback does not need to be memoized. The debouncer
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usedebounced
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usedebounced
  */
 export declare const useDebounced: <A extends Array<unknown>>(
 /** The function to debounce */
@@ -23,7 +23,7 @@ immediate?: boolean) => ((...args: A) => void) & {
  * **NOTE:** The supplied callback does not need to be memoized. The throttler
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usethrottled
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usethrottled
  */
 export declare const useThrottled: <A extends Array<unknown>>(
 /** The function to throttle */

package/hooks.js

@@ -11,7 +11,7 @@ const async_js_1 = require("./async.js");
  * **NOTE:** The supplied callback does not need to be memoized. The debouncer
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usedebounced
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usedebounced
  */
 const useDebounced = (
 /** The function to debounce */
@@ -33,7 +33,7 @@ exports.useDebounced = useDebounced;
  * **NOTE:** The supplied callback does not need to be memoized. The throttler
  * will always invoke the last supplied version.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usethrottled
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#usethrottled
  */
 const useThrottled = (
 /** The function to throttle */

package/http.d.ts

@@ -154,23 +154,23 @@ type TTLObj = {
 /**
  * Configures quick TTL-related settings for a HTTP request object
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#type-ttlconfig
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#type-ttlconfig
  */
 export type TTLConfig = TTL | TTLKeywords | TTLObj;
-/**
- * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
- * negative input values.
- *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
- */
-export declare const toSec: (ttl: TTL) => number;
 /**
  * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
  * and/or negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#toms-duration-helper
  */
 export declare const toMs: (ttl: TTL) => number;
+/**
+ * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
+ * negative input values.
+ *
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#tosec-ttl-helper
+ */
+export declare const toSec: (ttl: TTL) => number;
 type ServerResponseStub = Pick<ServerResponse, 'setHeader' | 'getHeader' | 'removeHeader'> & {
     headers?: Record<string, string | Array<string>>;
 };
@@ -181,7 +181,7 @@ type ResponseStub = {
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
  * on a HTTP response
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrol-helper
  */
 export declare const cacheControl: (response: ServerResponseStub | ResponseStub | Map<string, string> | {
     res: ServerResponseStub | ResponseStub;
@@ -191,7 +191,7 @@ export declare const cacheControl: (response: ServerResponseStub | ResponseStub
  * situations requiring a `HeadersInit` compatible object.
  *
  * Accepts the same arguments as `cacheControl()`.
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrolheaders-helper
  */
 export declare const cacheControlHeaders: (ttlCfg: TTLConfig, eTag?: string | number) => Record<string, string>;
 export {};

package/http.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTP_502_BadGateway = exports.HTTP_501_NotImplemented = exports.HTTP_500_InternalServerError = exports.HTTP_451_UnavailableForLegalReasons = exports.HTTP_431_RequestHeaderFieldsTooLarge = exports.HTTP_429_TooManyRequests = exports.HTTP_428_PreconditionRequired = exports.HTTP_426_UpgradeRequired = exports.HTTP_424_FailedDependency = exports.HTTP_423_Locked = exports.HTTP_422_UnprocessableContent = exports.HTTP_421_MisdirectedRequest = exports.HTTP_418_ImATeapot = exports.HTTP_417_ExpectationFailed = exports.HTTP_416_RangeNotSatisfiable = exports.HTTP_415_UnsupportedMediaType = exports.HTTP_414_URITooLong = exports.HTTP_413_PayloadTooLarge = exports.HTTP_412_PreconditionFailed = exports.HTTP_411_LengthRequired = exports.HTTP_410_Gone = exports.HTTP_409_Conflict = exports.HTTP_408_RequestTimeout = exports.HTTP_407_ProxyAuthenticationRequired = exports.HTTP_406_NotAcceptable = exports.HTTP_405_MethodNotAllowed = exports.HTTP_404_NotFound = exports.HTTP_403_Forbidden = exports.HTTP_401_Unauthorized = exports.HTTP_400_BadRequest = exports.HTTP_308_PermanentRedirect = exports.HTTP_307_TemporaryRedirect = exports.HTTP_304_NotModified = exports.HTTP_303_SeeOther = exports.HTTP_302_Found = exports.HTTP_301_MovedPermanently = exports.HTTP_226_IMUsed = exports.HTTP_208_AlreadyReported = exports.HTTP_207_MultiStatus = exports.HTTP_206_PartialContent = exports.HTTP_205_ResetContent = exports.HTTP_204_NoContent = exports.HTTP_203_NonAuthoritativeInformation = exports.HTTP_202_Accepted = exports.HTTP_201_Created = exports.HTTP_200_OK = exports.HTTP_103_EarlyHints = exports.HTTP_102_Processing = exports.HTTP_101_SwitchingProtocols = exports.HTTP_100_Continue = void 0;
-exports.cacheControlHeaders = exports.cacheControl = exports.toMs = exports.toSec = exports.HTTP_511_NetworkAuthenticationRequired = exports.HTTP_510_NotExtended = exports.HTTP_508_LoopDetected = exports.HTTP_507_InsufficientStorage = exports.HTTP_506_VariantAlsoNegotiates = exports.HTTP_505_HTTPVersionNotSupported = exports.HTTP_504_GatewayTimeout = exports.HTTP_503_ServiceUnavailable = void 0;
+exports.cacheControlHeaders = exports.cacheControl = exports.toSec = exports.toMs = exports.HTTP_511_NetworkAuthenticationRequired = exports.HTTP_510_NotExtended = exports.HTTP_508_LoopDetected = exports.HTTP_507_InsufficientStorage = exports.HTTP_506_VariantAlsoNegotiates = exports.HTTP_505_HTTPVersionNotSupported = exports.HTTP_504_GatewayTimeout = exports.HTTP_503_ServiceUnavailable = void 0;
 // INFORMATION
 /** The client should continue the request or ignore the response if the request is already finished. */
 exports.HTTP_100_Continue = 100;
@@ -129,38 +129,46 @@ exports.HTTP_508_LoopDetected = 508;
 exports.HTTP_510_NotExtended = 510;
 /** The client needs to authenticate to gain network access. */
 exports.HTTP_511_NetworkAuthenticationRequired = 511;
-const unitToSeconds = {
-    s: 1,
-    m: 60,
-    h: 3600,
-    d: 24 * 3600,
-    w: 7 * 24 * 3600,
+const unitToMilliseconds = {
+    s: 1000,
+    m: 60000,
+    h: 60 * 60000,
+    d: 24 * 60 * 60000,
+    w: 7 * 24 * 60 * 60000,
 };
 /**
- * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
- * negative input values.
+ * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
+ * and/or negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#toms-duration-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
-const toSec = (ttl) => {
+const toMs = (ttl) => {
+    if (!ttl) {
+        return 0;
+    }
     if (typeof ttl === 'string') {
         const value = parseFloat(ttl);
-        const factor = unitToSeconds[ttl.slice(-1)] || 1;
+        const factor = unitToMilliseconds[ttl.slice(-1)] || 1;
         ttl = value * factor;
     }
     return Math.max(0, Math.round(ttl)) || 0;
 };
-exports.toSec = toSec;
+exports.toMs = toMs;
 /**
- * Converts a `TTL` (duration) value into milliseconds. Returns `0` for bad
- * and/or negative input values.
+ * Converts a `TTL` (max-age) value into seconds. Returns `0` for bad and/or
+ * negative input values.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#tosec-ttl-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
-const toMs = (ttl) => (0, exports.toSec)(ttl) * 1000;
-exports.toMs = toMs;
+const toSec = (ttl) => {
+    if (typeof ttl === 'number') {
+        ttl = ttl * 1000;
+    }
+    return Math.round((0, exports.toMs)(ttl) / 1000);
+};
+exports.toSec = toSec;
 /*#__NO_SIDE_EFFECTS__*/
 const toRespnseStubHeaders = (response) => {
     if (response instanceof Map) {
@@ -205,7 +213,7 @@ const setCC = (response, cc) => {
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
  * on a HTTP response
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrol-helper
  */
 /*#__NO_SIDE_EFFECTS__*/ // eslint-disable-next-line complexity
 const cacheControl = (response, ttlCfg, eTag) => {
@@ -216,7 +224,7 @@ const cacheControl = (response, ttlCfg, eTag) => {
     let maxAge = opts.maxAge;
     if (typeof maxAge === 'string') {
         if (maxAge === 'permanent') {
-            maxAge = 365 * unitToSeconds.d;
+            maxAge = 365 * unitToMilliseconds.d;
         }
         else if (maxAge === 'no-cache') {
             maxAge = 0;
@@ -249,7 +257,7 @@ exports.cacheControl = cacheControl;
  * situations requiring a `HeadersInit` compatible object.
  *
  * Accepts the same arguments as `cacheControl()`.
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README.md#cachecontrolheaders-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 const cacheControlHeaders = (ttlCfg, eTag) => {

package/next/http.d.ts

@@ -25,7 +25,7 @@ export type InferErrorPageProps<SEP extends ShowErrorPageFn<any>> = Cleanup<Retu
  * cases when `getServerSideProps` returns an `__error` prop with `statusCode`
  * and optional friendly `message`.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#makeerrorizeapphoc
  */
 export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: FunctionComponent<EP>) => {
     <P extends {
@@ -47,7 +47,7 @@ export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorP
  * to return an `HTTP_304_NotModified` response with an empty props object,
  * in a way that doesn't make TypeScript shout at you.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#notmodified304-helper
  */
 export declare const notModified304: (response: ServerResponse | NextContextLike) => {
     readonly props: any;

package/next/http.js

@@ -29,7 +29,7 @@ __exportStar(require("../http.js"), exports);
  * Use this method inside a `getServerSideProps` method (or API route)
  * to return an error page with proper HTTP status code and all the shit.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#showerrorpage-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#showerrorpage-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 const showErrorPage = (response, error, ttl = '2s') => {
@@ -54,7 +54,7 @@ const showErrorPage = (response, error, ttl = '2s') => {
  * cases when `getServerSideProps` returns an `__error` prop with `statusCode`
  * and optional friendly `message`.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#makeerrorizeapphoc
  */
 /*#__NO_SIDE_EFFECTS__*/
 const makeErrorizeAppHOC = (ErrorPage) => {
@@ -85,7 +85,7 @@ exports.makeErrorizeAppHOC = makeErrorizeAppHOC;
  * to return an `HTTP_304_NotModified` response with an empty props object,
  * in a way that doesn't make TypeScript shout at you.
  *
- * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
+ * @see https://github.com/reykjavikcity/webtools/blob/v0.3/README-nextjs.md#notmodified304-helper
  */
 /*#__NO_SIDE_EFFECTS__*/
 const notModified304 = (response) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.2.10",
+	"version": "0.3.1",
 	"description": "Misc. JS/TS helpers used by Reykjavík City's web dev teams.",
 	"main": "index.js",
 	"repository": "ssh://git@github.com:reykjavikcity/webtools.git",