@reykjavik/webtools 0.1.23 → 0.1.25

package/CHANGELOG.md

@@ -4,6 +4,22 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.1.25
+
+_2024-05-17_
+
+- `@reykjavik/webtools/http`:
+  - feat: `cacheControl` now also accepts standard `Response` objects
+
+## 0.1.24
+
+_2024-03-22_
+
+- `@reykjavik/webtools/fixIcelandicLocale`:
+  - fix: Add missing patches for `Date.prototype.toLocaleString` and
+    `Date.prototype.toLocaleTimeString`
+  - fix: Correct `Date.prototype.toLocaleDateString` options defaults/handling
+
 ## 0.1.23
 
 _2024-03-21_

package/README.md

@@ -56,7 +56,8 @@ Various framework agnostic helpers for leveraging HTTP magic.
 
 ### HTTP Status Codes
 
-All the web-related HTTP status codes are exported with human-readable names:
+All the web-related HTTP status codes are exported with human-readable names
+and a short JSDoc comment:
 
 - `HTTP_200_OK`
 - `HTTP_303_SeeOther`
@@ -71,34 +72,42 @@ All the web-related HTTP status codes are exported with human-readable names:
 - `HTTP_500_InternalServerError`
 - ...ad nauseum.
 
+These make your code more readable and less prone to accidental mistakes:
+
+```ts
+import { HTTP_200_OK, HTTP_404_NotFound } from '@reykjavik/webtools/http';
+
+console.log(HTTP_200_OK); // 200
+console.log(HTTP_404_NotFound); // 404
+```
+
 ### Types for HTTP Status code groups
 
 These type unions are useful when writing HTTP helper functions and error
-handling, etc.
+handlers, etc.
 
 Union Types for the more commonly occurrring HTTP Status codes:
 
-- `HTTP_STATUS` (all the status-codes!)
-  - `HTTP_INFO` (100, 101)
-  - `HTTP_SUCCESS` (200, 201, 202)
-  - `HTTP_REDIRECTION` (301, 302, 303, 304, 307, 308)
-    - `HTTP_NOTMODIFIED` (304)
-  - `HTTP_ERROR`
-    - `HTTP_CLIENT_ERROR`
-      - `HTTP_NOT_FOUND` (400, 404, 410)
-      - `HTTP_BANNED` (401, 403)
-    - `HTTP_SERVER_ERROR` (500)
-
-More complete union types, including all the esoteric status codes, are also
-available:
-
-- `HTTP_STATUS` (all the status-codes!)
+- `HTTP_INFO` (100, 101)
+- `HTTP_SUCCESS` (200, 201, 202)
+- `HTTP_REDIRECTION` (301, 302, 303, 304, 307, 308)
+  - `HTTP_NOTMODIFIED` (304)
+- `HTTP_ERROR` (400, 404, 410, 401, 403, 500)
+  - `HTTP_CLIENT_ERROR` (400, 404, 410, 401, 403)
+    - `HTTP_NOT_FOUND` (400, 404, 410)
+    - `HTTP_BANNED` (401, 403)
+  - `HTTP_SERVER_ERROR` (500)
+
+It also offers more complete union types, including all the esoteric status
+codes, are also available:
+
+- `HTTP_STATUS` (**all** the status-codes!)
   - `HTTP_INFO_ALL` (1\*\*)
   - `HTTP_SUCCESS_ALL` (2\*\*)
   - `HTTP_REDIRECTION_ALL` (3\*\*)
-  - `HTTP_ERROR_ALL`
+  - `HTTP_ERROR_ALL` (4\*\* and 5\*\*)
     - `HTTP_CLIENT_ERROR_ALL` (4\*\*)
-    - `HTTP_SERVER_ERROR_ALL` (4\*\*)
+    - `HTTP_SERVER_ERROR_ALL` (5\*\*)
 
 ### `cacheControl` helper
 
@@ -259,7 +268,8 @@ values.
 
 - `Intl.Collator` and `String.prototype.localeCompare`
 - `Intl.NumberFormat` and `Number.prototype.toLocaleString`
-- `Intl.DateTimeFormat` and `Date.prototype.toLocaleDateString`
+- `Intl.DateTimeFormat` and `Date.prototype.toLocaleString`,
+  `.toLocaleDateString`, and `.toLocaleTimeString`
 - `Intl.PluralRules`
 - `Intl.ListFormat`
 
@@ -332,28 +342,20 @@ editor), but there's a brief summary:
 - `scriptUrl?: string` — The full SiteImprove analytics script URL.
   (alternative to `accountId` prop).
 - `hasConsented?: boolean` — Manual GDPR 'analytics' consent flag. Allows hard
-  opt-out, but defers to
-  [`CookieHubProvider` values](./README.md#usecookiehubconsent) if they are
-  available.
+  opt-out, but defers to [`CookieHubProvider` values](#usecookiehubconsent) if
+  they are available.
 - `onLoad?: (e: unknown) => void` — Fires when the script has loaded.
 - `onError?: (e: unknown) => void` — Fires if loading the script failed.
 
 Example usage somewhere in your application:
 
-```js
+```jsz
 import { SiteImprove } from '@reykjavik/webtools/SiteImprove';
 
-// ideally emit this from your loader function
 const siteImproveAccountId = '[ACCOUNT_ID]'; // e.g. "7654321"
 
-   const location = useRouter()
-// ...then Inside root.tsx component:
-  <SiteImprove
-    accountId={siteImproveAccountId}
-    onError={(error) =>
-      Logger('error', 'An error occured initializing siteimprove', error)
-    }
-  />;
+// ...then inside your main App component
+<SiteImprove accountId={siteImproveAccountId} />;
 ```
 
 In dev mode it does NOT load the SiteImprove script and merely logs page-view

package/esm/fixIcelandicLocale.js

@@ -1,4 +1,4 @@
-import { _PatchedCollator, _PatchedDateTimeFormat, _PatchedListFormat, _patchedLocaleCompare, _PatchedNumberFormat, _PatchedPluralRules, _patchedToLocaleDateString, _patchedToLocaleString, } from './fixIcelandicLocale.privates.js';
+import { _PatchedCollator, _PatchedDateTimeFormat, _patchedDateToLocaleDateString, _patchedDateToLocaleString, _patchedDateToLocaleTimeString, _PatchedListFormat, _PatchedNumberFormat, _patchedNumberToLocaleString, _PatchedPluralRules, _patchedStringLocaleCompare, } from './fixIcelandicLocale.privates.js';
 /*
   Mantra: Partial Icelandic suppoort is better than none. Partial Icelandic
   suppoort is better than none. Partial Icelandic suppoort is better than
@@ -6,11 +6,13 @@ import { _PatchedCollator, _PatchedDateTimeFormat, _PatchedListFormat, _patchedL
 */
 if (Intl.Collator.supportedLocalesOf(['is']).length < 1) {
     Intl.Collator = _PatchedCollator;
-    String.prototype.localeCompare = _patchedLocaleCompare;
+    String.prototype.localeCompare = _patchedStringLocaleCompare;
     Intl.NumberFormat = _PatchedNumberFormat;
-    Number.prototype.toLocaleString = _patchedToLocaleString;
+    Number.prototype.toLocaleString = _patchedNumberToLocaleString;
     Intl.DateTimeFormat = _PatchedDateTimeFormat;
-    Date.prototype.toLocaleDateString = _patchedToLocaleDateString;
+    Date.prototype.toLocaleString = _patchedDateToLocaleString;
+    Date.prototype.toLocaleDateString = _patchedDateToLocaleDateString;
+    Date.prototype.toLocaleTimeString = _patchedDateToLocaleTimeString;
 }
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */
 if (Intl.ListFormat && Intl.ListFormat.supportedLocalesOf(['is']).length < 1) {

package/esm/fixIcelandicLocale.privates.d.ts

@@ -5,7 +5,7 @@ export declare const _PatchedCollator: {
 } & {
     $original: typeof Intl.Collator;
 };
-export declare const _patchedLocaleCompare: {
+export declare const _patchedStringLocaleCompare: {
     (this: string, that: string, locales?: string | Array<string>, options?: Intl.CollatorOptions): number;
     $original: {
         (that: string): number;
@@ -20,7 +20,7 @@ export declare const _PatchedNumberFormat: {
 } & {
     $original: typeof Intl.NumberFormat;
 };
-export declare const _patchedToLocaleString: {
+export declare const _patchedNumberToLocaleString: {
     (this: number, locales?: string | Array<string>, options?: Intl.NumberFormatOptions): string;
     $original: {
         (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): string;
@@ -35,7 +35,23 @@ export declare const _PatchedDateTimeFormat: {
 } & {
     $original: typeof Intl.DateTimeFormat;
 };
-export declare const _patchedToLocaleDateString: {
+export declare const _patchedDateToLocaleString: {
+    (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
+    $original: {
+        (): string;
+        (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
+    };
+};
+export declare const _patchedDateToLocaleDateString: {
+    (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
+    $original: {
+        (): string;
+        (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
+    };
+};
+export declare const _patchedDateToLocaleTimeString: {
     (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
     $original: {
         (): string;

package/esm/fixIcelandicLocale.privates.js

@@ -50,11 +50,11 @@ PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
 export const _PatchedCollator = PatchedCollator;
 // ---------------------------------------------------------------------------
-const _localeCompare = String.prototype.localeCompare;
-export const _patchedLocaleCompare = function localeCompare(that, locales, options) {
+const _stringLocaleCompare = String.prototype.localeCompare;
+export const _patchedStringLocaleCompare = function localeCompare(that, locales, options) {
     return _PatchedCollator(locales, options).compare(this, that);
 };
-_patchedLocaleCompare.$original = _localeCompare;
+_patchedStringLocaleCompare.$original = _stringLocaleCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
@@ -99,11 +99,11 @@ PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
 export const _PatchedNumberFormat = PatchedNumberFormat;
 // ---------------------------------------------------------------------------
-const _toLocaleString = Number.prototype.toLocaleString;
-export const _patchedToLocaleString = function toLocaleString(locales, options) {
+const _numberToLocaleString = Number.prototype.toLocaleString;
+export const _patchedNumberToLocaleString = function toLocaleString(locales, options) {
     return _PatchedNumberFormat(locales, options).format(this);
 };
-_patchedToLocaleString.$original = _toLocaleString;
+_patchedNumberToLocaleString.$original = _numberToLocaleString;
 // ===========================================================================
 // DateTimeFormat
 // ===========================================================================
@@ -225,11 +225,71 @@ PatchedDateTimeFormat.supportedLocalesOf = _DateTimeFormat.supportedLocalesOf;
 PatchedDateTimeFormat.$original = _DateTimeFormat;
 export const _PatchedDateTimeFormat = PatchedDateTimeFormat;
 // ---------------------------------------------------------------------------
-const _toLocaleDateString = Date.prototype.toLocaleDateString;
-export const _patchedToLocaleDateString = function toLocaleDateString(locales, options) {
+const _dateToLocaleString = Date.prototype.toLocaleString;
+export const _patchedDateToLocaleString = function toLocaleString(locales, options) {
+    options = options || {};
+    if (!options.weekday &&
+        !options.year &&
+        !options.month &&
+        !options.day &&
+        !options.dayPeriod &&
+        !options.hour &&
+        !options.minute &&
+        !options.second &&
+        !options.fractionalSecondDigits) {
+        options = {
+            ...options,
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric',
+            second: 'numeric',
+        };
+    }
+    return _PatchedDateTimeFormat(locales, options).format(this);
+};
+_patchedDateToLocaleString.$original = _dateToLocaleString;
+// ---------------------------------------------------------------------------
+const _dateToLocaleDateString = Date.prototype.toLocaleDateString;
+export const _patchedDateToLocaleDateString = function toLocaleDateString(locales, options) {
+    options = options || {};
+    if (options.timeStyle) {
+        throw new TypeError("can't set option timeStyle in Date.toLocaleDateString()");
+    }
+    if (!options.weekday && !options.year && !options.month && !options.day) {
+        options = {
+            ...options,
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+        };
+    }
+    return _PatchedDateTimeFormat(locales, options).format(this);
+};
+_patchedDateToLocaleDateString.$original = _dateToLocaleDateString;
+// ---------------------------------------------------------------------------
+const _dateToLocaleTimeString = Date.prototype.toLocaleTimeString;
+export const _patchedDateToLocaleTimeString = function toLocaleTimeString(locales, options) {
+    options = options || {};
+    if (options.dateStyle) {
+        throw new TypeError("can't set option dateStyle in Date.toLocaleTimeString()");
+    }
+    if (!options.dayPeriod &&
+        !options.hour &&
+        !options.minute &&
+        !options.second &&
+        !options.fractionalSecondDigits) {
+        options = {
+            ...options,
+            hour: 'numeric',
+            minute: 'numeric',
+            second: 'numeric',
+        };
+    }
     return _PatchedDateTimeFormat(locales, options).format(this);
 };
-_patchedToLocaleDateString.$original = _toLocaleDateString;
+_patchedDateToLocaleTimeString.$original = _dateToLocaleTimeString;
 // ===========================================================================
 // PluralRules
 // ===========================================================================

package/esm/http.d.ts

@@ -1,4 +1,5 @@
-import type { ServerResponse } from 'http';
+/// <reference types="node" resolution-mode="require"/>
+import { ServerResponse } from 'node:http';
 /** The client should continue the request or ignore the response if the request is already finished. */
 export declare const HTTP_100_Continue = 100;
 /** Response to an Upgrade request header from the client and indicates the protocol the server is switching to. */
@@ -163,13 +164,19 @@ export type TTLConfig = TTL | TTLKeywords | TTLObj;
  * @see https://github.com/reykjavikcity/webtools/blob/v0.1/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>>;
+};
+type ResponseStub = {
+    headers: Pick<Headers, 'set' | 'get' | 'delete' | 'append'>;
+};
 /**
  * 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.1/README.md#getcssbundleurl
  */
-export declare const cacheControl: (response: ServerResponse | {
-    res: ServerResponse;
+export declare const cacheControl: (response: ServerResponseStub | ResponseStub | {
+    res: ServerResponseStub | ResponseStub;
 }, ttlCfg: TTLConfig, eTag?: string | number) => void;
 export {};

package/esm/http.js

@@ -146,6 +146,31 @@ export const toSec = (ttl) => {
     }
     return Math.max(0, Math.round(ttl)) || 0;
 };
+const toRespnseStubHeaders = (response) => {
+    if ('headers' in response && !('setHeader' in response)) {
+        return response.headers;
+    }
+    return {
+        get: (name) => {
+            const val = response.getHeader(name);
+            if (Array.isArray(val)) {
+                return val.join(', ');
+            }
+            return val != null ? `${val}` : null;
+        },
+        set: (name, value) => response.setHeader(name, value),
+        append: (name, value) => {
+            const existing = response.getHeader(name);
+            if (existing) {
+                response.setHeader(name, `${existing}, ${value}`);
+            }
+            else {
+                response.setHeader(name, value);
+            }
+        },
+        delete: (name) => response.removeHeader(name),
+    };
+};
 const stabilities = {
     revalidate: ', must-revalidate',
     immutable: ', immutable',
@@ -153,16 +178,17 @@ const stabilities = {
 };
 const setCC = (response, cc) => {
     const devModeHeader = 'X-Cache-Control';
+    const headers = toRespnseStubHeaders(response);
     // Also set `X-Cache-Control` in dev mode, because some frameworks
-    // **cough** **nextjs** **cough** forcefully override the `Cache-Control`
+    // **cough** **Nextjs** **cough** forcefully override the `Cache-Control`
     // header when the server is in dev mode.
     if (!cc) {
-        response.removeHeader('Cache-Control');
-        process.env.NODE_ENV !== 'production' && response.removeHeader(devModeHeader);
+        headers.delete('Cache-Control');
+        process.env.NODE_ENV !== 'production' && headers.delete(devModeHeader);
         return;
     }
-    response.setHeader('Cache-Control', cc);
-    process.env.NODE_ENV !== 'production' && response.setHeader(devModeHeader, cc);
+    headers.set('Cache-Control', cc);
+    process.env.NODE_ENV !== 'production' && headers.set(devModeHeader, cc);
 };
 /**
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
@@ -189,7 +215,7 @@ export const cacheControl = (response, ttlCfg, eTag) => {
         }
     }
     if (maxAge == null) {
-        response.removeHeader('Cache-Control');
+        toRespnseStubHeaders(response).delete('Cache-Control');
         return;
     }
     maxAge = toSec(maxAge);
@@ -204,5 +230,5 @@ export const cacheControl = (response, ttlCfg, eTag) => {
     const scope = opts.publ ? 'public' : 'private';
     const stability = (opts.stability && stabilities[opts.stability]) || stabilities.immutable;
     setCC(response, `${scope}, max-age=${maxAge + sWR + sIE + stability}`);
-    eTag != null && response.setHeader('ETag', eTag);
+    eTag != null && toRespnseStubHeaders(response).set('ETag', String(eTag));
 };

package/esm/remix/Wait.d.ts

@@ -37,7 +37,7 @@ export type WaitComponent<CustomProps extends Record<string, unknown> = Record<n
     displayName?: string;
 };
 /**
- * Wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
+ * A thin wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
  * component, to provide a more ergonomic API.
  *
  * If the awaited promise (`props.for`) resolves to an object with a truthy

package/esm/remix/Wait.js

@@ -1,7 +1,7 @@
 import React, { Suspense } from 'react';
 import { Await } from '@remix-run/react';
 /**
- * Wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
+ * A thin wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
  * component, to provide a more ergonomic API.
  *
  * If the awaited promise (`props.for`) resolves to an object with a truthy

package/fixIcelandicLocale.js

@@ -8,11 +8,13 @@ const fixIcelandicLocale_privates_js_1 = require("./fixIcelandicLocale.privates.
 */
 if (Intl.Collator.supportedLocalesOf(['is']).length < 1) {
     Intl.Collator = fixIcelandicLocale_privates_js_1._PatchedCollator;
-    String.prototype.localeCompare = fixIcelandicLocale_privates_js_1._patchedLocaleCompare;
+    String.prototype.localeCompare = fixIcelandicLocale_privates_js_1._patchedStringLocaleCompare;
     Intl.NumberFormat = fixIcelandicLocale_privates_js_1._PatchedNumberFormat;
-    Number.prototype.toLocaleString = fixIcelandicLocale_privates_js_1._patchedToLocaleString;
+    Number.prototype.toLocaleString = fixIcelandicLocale_privates_js_1._patchedNumberToLocaleString;
     Intl.DateTimeFormat = fixIcelandicLocale_privates_js_1._PatchedDateTimeFormat;
-    Date.prototype.toLocaleDateString = fixIcelandicLocale_privates_js_1._patchedToLocaleDateString;
+    Date.prototype.toLocaleString = fixIcelandicLocale_privates_js_1._patchedDateToLocaleString;
+    Date.prototype.toLocaleDateString = fixIcelandicLocale_privates_js_1._patchedDateToLocaleDateString;
+    Date.prototype.toLocaleTimeString = fixIcelandicLocale_privates_js_1._patchedDateToLocaleTimeString;
 }
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion, @typescript-eslint/no-unnecessary-condition */
 if (Intl.ListFormat && Intl.ListFormat.supportedLocalesOf(['is']).length < 1) {

package/fixIcelandicLocale.privates.d.ts

@@ -5,7 +5,7 @@ export declare const _PatchedCollator: {
 } & {
     $original: typeof Intl.Collator;
 };
-export declare const _patchedLocaleCompare: {
+export declare const _patchedStringLocaleCompare: {
     (this: string, that: string, locales?: string | Array<string>, options?: Intl.CollatorOptions): number;
     $original: {
         (that: string): number;
@@ -20,7 +20,7 @@ export declare const _PatchedNumberFormat: {
 } & {
     $original: typeof Intl.NumberFormat;
 };
-export declare const _patchedToLocaleString: {
+export declare const _patchedNumberToLocaleString: {
     (this: number, locales?: string | Array<string>, options?: Intl.NumberFormatOptions): string;
     $original: {
         (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): string;
@@ -35,7 +35,23 @@ export declare const _PatchedDateTimeFormat: {
 } & {
     $original: typeof Intl.DateTimeFormat;
 };
-export declare const _patchedToLocaleDateString: {
+export declare const _patchedDateToLocaleString: {
+    (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
+    $original: {
+        (): string;
+        (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
+    };
+};
+export declare const _patchedDateToLocaleDateString: {
+    (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
+    $original: {
+        (): string;
+        (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
+    };
+};
+export declare const _patchedDateToLocaleTimeString: {
     (this: Date, locales?: string | Array<string>, options?: Intl.DateTimeFormatOptions): string;
     $original: {
         (): string;

package/fixIcelandicLocale.privates.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._PatchedListFormat = exports._PatchedPluralRules = exports._patchedToLocaleDateString = exports._PatchedDateTimeFormat = exports._patchedToLocaleString = exports._PatchedNumberFormat = exports._patchedLocaleCompare = exports._PatchedCollator = void 0;
+exports._PatchedListFormat = exports._PatchedPluralRules = exports._patchedDateToLocaleTimeString = exports._patchedDateToLocaleDateString = exports._patchedDateToLocaleString = exports._PatchedDateTimeFormat = exports._patchedNumberToLocaleString = exports._PatchedNumberFormat = exports._patchedStringLocaleCompare = exports._PatchedCollator = void 0;
 const _Collator = Intl.Collator;
 const mapLocales = (locales) => {
     locales = typeof locales === 'string' ? [locales] : locales || [];
@@ -53,12 +53,12 @@ PatchedCollator.supportedLocalesOf = _Collator.supportedLocalesOf;
 PatchedCollator.$original = _Collator;
 exports._PatchedCollator = PatchedCollator;
 // ---------------------------------------------------------------------------
-const _localeCompare = String.prototype.localeCompare;
-const _patchedLocaleCompare = function localeCompare(that, locales, options) {
+const _stringLocaleCompare = String.prototype.localeCompare;
+const _patchedStringLocaleCompare = function localeCompare(that, locales, options) {
     return (0, exports._PatchedCollator)(locales, options).compare(this, that);
 };
-exports._patchedLocaleCompare = _patchedLocaleCompare;
-exports._patchedLocaleCompare.$original = _localeCompare;
+exports._patchedStringLocaleCompare = _patchedStringLocaleCompare;
+exports._patchedStringLocaleCompare.$original = _stringLocaleCompare;
 // ===========================================================================
 // NumberFormat
 // ===========================================================================
@@ -103,12 +103,12 @@ PatchedNumberFormat.supportedLocalesOf = _NumberFormat.supportedLocalesOf;
 PatchedNumberFormat.$original = _NumberFormat;
 exports._PatchedNumberFormat = PatchedNumberFormat;
 // ---------------------------------------------------------------------------
-const _toLocaleString = Number.prototype.toLocaleString;
-const _patchedToLocaleString = function toLocaleString(locales, options) {
+const _numberToLocaleString = Number.prototype.toLocaleString;
+const _patchedNumberToLocaleString = function toLocaleString(locales, options) {
     return (0, exports._PatchedNumberFormat)(locales, options).format(this);
 };
-exports._patchedToLocaleString = _patchedToLocaleString;
-exports._patchedToLocaleString.$original = _toLocaleString;
+exports._patchedNumberToLocaleString = _patchedNumberToLocaleString;
+exports._patchedNumberToLocaleString.$original = _numberToLocaleString;
 // ===========================================================================
 // DateTimeFormat
 // ===========================================================================
@@ -230,12 +230,74 @@ PatchedDateTimeFormat.supportedLocalesOf = _DateTimeFormat.supportedLocalesOf;
 PatchedDateTimeFormat.$original = _DateTimeFormat;
 exports._PatchedDateTimeFormat = PatchedDateTimeFormat;
 // ---------------------------------------------------------------------------
-const _toLocaleDateString = Date.prototype.toLocaleDateString;
-const _patchedToLocaleDateString = function toLocaleDateString(locales, options) {
+const _dateToLocaleString = Date.prototype.toLocaleString;
+const _patchedDateToLocaleString = function toLocaleString(locales, options) {
+    options = options || {};
+    if (!options.weekday &&
+        !options.year &&
+        !options.month &&
+        !options.day &&
+        !options.dayPeriod &&
+        !options.hour &&
+        !options.minute &&
+        !options.second &&
+        !options.fractionalSecondDigits) {
+        options = {
+            ...options,
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric',
+            second: 'numeric',
+        };
+    }
+    return (0, exports._PatchedDateTimeFormat)(locales, options).format(this);
+};
+exports._patchedDateToLocaleString = _patchedDateToLocaleString;
+exports._patchedDateToLocaleString.$original = _dateToLocaleString;
+// ---------------------------------------------------------------------------
+const _dateToLocaleDateString = Date.prototype.toLocaleDateString;
+const _patchedDateToLocaleDateString = function toLocaleDateString(locales, options) {
+    options = options || {};
+    if (options.timeStyle) {
+        throw new TypeError("can't set option timeStyle in Date.toLocaleDateString()");
+    }
+    if (!options.weekday && !options.year && !options.month && !options.day) {
+        options = {
+            ...options,
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+        };
+    }
+    return (0, exports._PatchedDateTimeFormat)(locales, options).format(this);
+};
+exports._patchedDateToLocaleDateString = _patchedDateToLocaleDateString;
+exports._patchedDateToLocaleDateString.$original = _dateToLocaleDateString;
+// ---------------------------------------------------------------------------
+const _dateToLocaleTimeString = Date.prototype.toLocaleTimeString;
+const _patchedDateToLocaleTimeString = function toLocaleTimeString(locales, options) {
+    options = options || {};
+    if (options.dateStyle) {
+        throw new TypeError("can't set option dateStyle in Date.toLocaleTimeString()");
+    }
+    if (!options.dayPeriod &&
+        !options.hour &&
+        !options.minute &&
+        !options.second &&
+        !options.fractionalSecondDigits) {
+        options = {
+            ...options,
+            hour: 'numeric',
+            minute: 'numeric',
+            second: 'numeric',
+        };
+    }
     return (0, exports._PatchedDateTimeFormat)(locales, options).format(this);
 };
-exports._patchedToLocaleDateString = _patchedToLocaleDateString;
-exports._patchedToLocaleDateString.$original = _toLocaleDateString;
+exports._patchedDateToLocaleTimeString = _patchedDateToLocaleTimeString;
+exports._patchedDateToLocaleTimeString.$original = _dateToLocaleTimeString;
 // ===========================================================================
 // PluralRules
 // ===========================================================================

package/http.d.ts

@@ -1,4 +1,5 @@
-import type { ServerResponse } from 'http';
+/// <reference types="node" />
+import { ServerResponse } from 'node:http';
 /** The client should continue the request or ignore the response if the request is already finished. */
 export declare const HTTP_100_Continue = 100;
 /** Response to an Upgrade request header from the client and indicates the protocol the server is switching to. */
@@ -163,13 +164,19 @@ export type TTLConfig = TTL | TTLKeywords | TTLObj;
  * @see https://github.com/reykjavikcity/webtools/blob/v0.1/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>>;
+};
+type ResponseStub = {
+    headers: Pick<Headers, 'set' | 'get' | 'delete' | 'append'>;
+};
 /**
  * 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.1/README.md#getcssbundleurl
  */
-export declare const cacheControl: (response: ServerResponse | {
-    res: ServerResponse;
+export declare const cacheControl: (response: ServerResponseStub | ResponseStub | {
+    res: ServerResponseStub | ResponseStub;
 }, ttlCfg: TTLConfig, eTag?: string | number) => void;
 export {};

package/http.js

@@ -151,6 +151,31 @@ const toSec = (ttl) => {
     return Math.max(0, Math.round(ttl)) || 0;
 };
 exports.toSec = toSec;
+const toRespnseStubHeaders = (response) => {
+    if ('headers' in response && !('setHeader' in response)) {
+        return response.headers;
+    }
+    return {
+        get: (name) => {
+            const val = response.getHeader(name);
+            if (Array.isArray(val)) {
+                return val.join(', ');
+            }
+            return val != null ? `${val}` : null;
+        },
+        set: (name, value) => response.setHeader(name, value),
+        append: (name, value) => {
+            const existing = response.getHeader(name);
+            if (existing) {
+                response.setHeader(name, `${existing}, ${value}`);
+            }
+            else {
+                response.setHeader(name, value);
+            }
+        },
+        delete: (name) => response.removeHeader(name),
+    };
+};
 const stabilities = {
     revalidate: ', must-revalidate',
     immutable: ', immutable',
@@ -158,16 +183,17 @@ const stabilities = {
 };
 const setCC = (response, cc) => {
     const devModeHeader = 'X-Cache-Control';
+    const headers = toRespnseStubHeaders(response);
     // Also set `X-Cache-Control` in dev mode, because some frameworks
-    // **cough** **nextjs** **cough** forcefully override the `Cache-Control`
+    // **cough** **Nextjs** **cough** forcefully override the `Cache-Control`
     // header when the server is in dev mode.
     if (!cc) {
-        response.removeHeader('Cache-Control');
-        process.env.NODE_ENV !== 'production' && response.removeHeader(devModeHeader);
+        headers.delete('Cache-Control');
+        process.env.NODE_ENV !== 'production' && headers.delete(devModeHeader);
         return;
     }
-    response.setHeader('Cache-Control', cc);
-    process.env.NODE_ENV !== 'production' && response.setHeader(devModeHeader, cc);
+    headers.set('Cache-Control', cc);
+    process.env.NODE_ENV !== 'production' && headers.set(devModeHeader, cc);
 };
 /**
  * Use this function to quickly set the `Cache-Control` header with a `max-age=`
@@ -194,7 +220,7 @@ const cacheControl = (response, ttlCfg, eTag) => {
         }
     }
     if (maxAge == null) {
-        response.removeHeader('Cache-Control');
+        toRespnseStubHeaders(response).delete('Cache-Control');
         return;
     }
     maxAge = (0, exports.toSec)(maxAge);
@@ -209,6 +235,6 @@ const cacheControl = (response, ttlCfg, eTag) => {
     const scope = opts.publ ? 'public' : 'private';
     const stability = (opts.stability && stabilities[opts.stability]) || stabilities.immutable;
     setCC(response, `${scope}, max-age=${maxAge + sWR + sIE + stability}`);
-    eTag != null && response.setHeader('ETag', eTag);
+    eTag != null && toRespnseStubHeaders(response).set('ETag', String(eTag));
 };
 exports.cacheControl = cacheControl;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.1.23",
+	"version": "0.1.25",
 	"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",

package/remix/Wait.d.ts

@@ -37,7 +37,7 @@ export type WaitComponent<CustomProps extends Record<string, unknown> = Record<n
     displayName?: string;
 };
 /**
- * Wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
+ * A thin wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
  * component, to provide a more ergonomic API.
  *
  * If the awaited promise (`props.for`) resolves to an object with a truthy

package/remix/Wait.js

@@ -27,7 +27,7 @@ exports.Wait = void 0;
 const react_1 = __importStar(require("react"));
 const react_2 = require("@remix-run/react");
 /**
- * Wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
+ * A thin wrapper around [Remix's `Await`](https://remix.run/docs/en/2/components/await)
  * component, to provide a more ergonomic API.
  *
  * If the awaited promise (`props.for`) resolves to an object with a truthy