@reykjavik/webtools 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -4,6 +4,21 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.2.4
+
+_2025-05-09_
+
+- perf: Add `#__NO_SIDE_EFFECTS__` compiler notation to selected functions
+
+## 0.2.3
+
+_2025-03-31_
+
+- `@reykjavik/webtools/errorhandling`:
+  - feat: Add a `.mapTo(fn)` method to `ResultTupleObj`s
+  - fix: `Result.map` does not catch errors thrown by the mapping function
+  - docs: Fix minor error in README code example
+
 ## 0.2.2
 
 _2024-12-19_

package/CookieHubConsent.d.ts

@@ -229,5 +229,5 @@ export declare const CookieHubProvider: (props: CookieHubProviderProps) => React
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usecookiehubconsent
  */
-export declare const useCookieHubConsent: () => Partial<CookieHubContextState['consent']>;
+export declare const useCookieHubConsent: () => Partial<CookieHubContextState["consent"]>;
 export {};

package/CookieHubConsent.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useCookieHubConsent = exports.CookieHubProvider = void 0;
 const react_1 = __importStar(require("react"));

package/README.md

@@ -34,6 +34,7 @@ bun add @reykjavik/webtools
   - [`Result` Singleton](#result-singleton)
   - [Type `ResultTuple`](#type-resulttuple)
   - [Type `ResultTupleObj`](#type-resulttupleobj)
+    - [Type `ResultTupleObj.mapTo`](#type-resulttupleobjmapto)
   - [`Result.catch`](#resultcatch)
   - [`Result.map`](#resultmap)
   - [`Result.Success`](#resultsuccess)
@@ -456,10 +457,12 @@ if (error) {
 Discriminated tuple type for a `[error, result]` pair (same as `ResultTuple`)
 but with named properties `error` and `result` attached for dev convenience.
 
+It also has a `.mapTo` method ([see below](#type-resulttupleobjmapto)).
+
 ```ts
-import { type ResultTuple } from '@reykjavik/webtools/errorhandling';
+import { type ResultTupleObj } from '@reykjavik/webtools/errorhandling';
 
-declare const myResult: ResultTuple<string, Error>;
+declare const myResult: ResultTupleObj<string, Error>;
 
 const [error, result] = myResult;
 // (One of these two is always `undefined`)
@@ -482,6 +485,39 @@ if (myResult.error) {
 }
 ```
 
+#### Type `ResultTupleObj.mapTo`
+
+**Syntax:**
+`ResultTupleObj.mapTo<T2, E>(mapResult: (resultValue: T) => T2): ResultTuple<T2, E>`
+
+This convenience method allows quick mapping of the `ResultTubleOBj`'s result
+value to a new type. The returned value is also a `ResultTubleOBj`.
+
+(Internally this method calls [`Result.map`](#resultmap).)
+
+```ts
+import { type ResultTuple } from '@reykjavik/webtools/errorhandling';
+
+declare const myResult: ResultTuple<string, Error>;
+
+const mappedResult: ResultTupleObj<number, Error> = myResult.mapTo(
+  (result: string) => result.length
+);
+
+if (mappedRes.error) {
+  console.error(myResult.error.message);
+} else {
+  // Here `myResult.result` is a number
+  console.log(myResult.result);
+}
+```
+
+If the original `ResultTupleObj` is in a failed state, the mapping function is
+not called.
+
+If the mapping function throws an error it gets caught and turned into a
+failed `ResultTupleObj`.
+
 ### `Result.catch`
 
 **Syntax:**

package/async.js

@@ -1,18 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseAllObject = exports.maxWait = exports.addLag = exports.sleep = void 0;
+exports.promiseAllObject = exports.addLag = exports.sleep = void 0;
+exports.maxWait = maxWait;
 /**
  * Simple sleep function. Returns a promise that resolves after `length`
  * milliseconds.
  */
+/*#__NO_SIDE_EFFECTS__*/
 const sleep = (length) => new Promise((resolve) => setTimeout(resolve, length));
 exports.sleep = sleep;
 /**
  * Returns a function that adds lag/delay to a promise chain,
  * passing the promise payload through.
  */
+/*#__NO_SIDE_EFFECTS__*/
 const addLag = (length) => (res) => (0, exports.sleep)(length).then(() => res);
 exports.addLag = addLag;
+/*#__NO_SIDE_EFFECTS__*/
 function maxWait(timeout, promises) {
     if (Array.isArray(promises)) {
         return Promise.race([
@@ -38,7 +42,6 @@ function maxWait(timeout, promises) {
         return Promise.resolve().then(() => ({ ...retObj }));
     });
 }
-exports.maxWait = maxWait;
 // ---------------------------------------------------------------------------
 // Adapted from https://github.com/marcelowa/promise-all-properties
 /**
@@ -47,6 +50,7 @@ exports.maxWait = maxWait;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#promiseallobject
  */
+/*#__NO_SIDE_EFFECTS__*/
 const promiseAllObject = (promisesMap) => Promise.all(Object.values(promisesMap)).then((results) => {
     const keys = Object.keys(promisesMap);
     const resolvedMap = {};

package/errorhandling.d.ts

@@ -23,10 +23,12 @@ export declare const asError: (maybeError: unknown) => ErrorFromPayload;
 type SuccessResult<T> = [error: undefined, result: T] & {
     error?: undefined;
     result: T;
+    mapTo: <T2, E extends Error = Error>(fn: (result: T) => T2) => ResultTupleObj<T2, E>;
 };
 type FailResult<E extends Error> = [error: E, result?: undefined] & {
     error: E;
     result?: undefined;
+    mapTo: () => FailResult<E>;
 };
 /**
  * Simple bare-bones discriminated tuple type for a [error, result] pair.
@@ -81,14 +83,14 @@ export declare const Result: {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulmap
      */
-    map: <T_1, T2, E_1 extends Error>(result: ResultTuple<T_1, E_1>, mapFn: (resultValue: T_1) => T2) => ResultTupleObj<T2, E_1>;
+    map: <T, T2, E extends Error>(result: ResultTuple<T, E>, mapFn: (resultValue: T) => T2) => ResultTupleObj<T2, E>;
     /**
      * 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
      */
-    throw: <T_2>(result: ResultTuple<T_2, Error>) => T_2;
+    throw: <T>(result: ResultTuple<T>) => T;
 };
 export declare namespace Result {
     type Tuple<T, E extends Error = Error> = ResultTuple<T, E>;

package/errorhandling.js

@@ -7,6 +7,7 @@ exports.Result = exports.asError = exports.ErrorFromPayload = void 0;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
  */
+/*#__NO_SIDE_EFFECTS__*/
 class ErrorFromPayload extends Error {
     constructor(payload) {
         if (process.env.NODE_ENV !== 'production' && payload instanceof Error) {
@@ -29,6 +30,7 @@ exports.ErrorFromPayload = ErrorFromPayload;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
  */
+/*#__NO_SIDE_EFFECTS__*/
 const asError = (maybeError) => {
     if (maybeError instanceof Error) {
         return maybeError;
@@ -36,16 +38,23 @@ const asError = (maybeError) => {
     return new ErrorFromPayload(maybeError);
 };
 exports.asError = asError;
+/*#__NO_SIDE_EFFECTS__*/
 const Success = (result) => {
     const tuple = [undefined, result];
     tuple.result = result;
+    tuple.mapTo = (fn) => 
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    map(tuple, fn);
     return tuple;
 };
+/*#__NO_SIDE_EFFECTS__*/
 const Fail = (e) => {
     const tuple = [(0, exports.asError)(e)];
     tuple.error = tuple[0];
+    tuple.mapTo = () => tuple;
     return tuple;
 };
+/*#__NO_SIDE_EFFECTS__*/
 function catch_(something) {
     if (something instanceof Promise) {
         return something.then(Success, (e) => Fail(e));
@@ -57,6 +66,15 @@ function catch_(something) {
         return Fail(e);
     }
 }
+const map = (result, 
+/*#__NO_SIDE_EFFECTS__*/
+mapFn) => {
+    const [error, resultValue] = result;
+    if (error) {
+        return Fail(error);
+    }
+    return catch_(() => mapFn(resultValue));
+};
 /**
  * Singleton object with small methods for creating, mapping or handling
  * `ResultTupleObj` instances.
@@ -85,12 +103,13 @@ exports.Result = {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulmap
      */
+    /*#__NO_SIDE_EFFECTS__*/
     map: (result, mapFn) => {
         const [error, resultValue] = result;
         if (error) {
             return Fail(error);
         }
-        return Success(mapFn(resultValue));
+        return catch_(() => mapFn(resultValue));
     },
     /**
      * Unwraps a discriminated [error, result] `Result.Tuple`-like object
@@ -98,6 +117,7 @@ exports.Result = {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulthrow
      */
+    /*#__NO_SIDE_EFFECTS__*/
     throw: (result) => {
         if (result[0]) {
             throw result[0];

package/esm/CookieHubConsent.d.ts

@@ -229,5 +229,5 @@ export declare const CookieHubProvider: (props: CookieHubProviderProps) => React
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#usecookiehubconsent
  */
-export declare const useCookieHubConsent: () => Partial<CookieHubContextState['consent']>;
+export declare const useCookieHubConsent: () => Partial<CookieHubContextState["consent"]>;
 export {};

package/esm/async.js

@@ -2,12 +2,15 @@
  * Simple sleep function. Returns a promise that resolves after `length`
  * milliseconds.
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const sleep = (length) => new Promise((resolve) => setTimeout(resolve, length));
 /**
  * Returns a function that adds lag/delay to a promise chain,
  * passing the promise payload through.
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const addLag = (length) => (res) => sleep(length).then(() => res);
+/*#__NO_SIDE_EFFECTS__*/
 export function maxWait(timeout, promises) {
     if (Array.isArray(promises)) {
         return Promise.race([
@@ -41,6 +44,7 @@ export function maxWait(timeout, promises) {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#promiseallobject
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const promiseAllObject = (promisesMap) => Promise.all(Object.values(promisesMap)).then((results) => {
     const keys = Object.keys(promisesMap);
     const resolvedMap = {};

package/esm/errorhandling.d.ts

@@ -23,10 +23,12 @@ export declare const asError: (maybeError: unknown) => ErrorFromPayload;
 type SuccessResult<T> = [error: undefined, result: T] & {
     error?: undefined;
     result: T;
+    mapTo: <T2, E extends Error = Error>(fn: (result: T) => T2) => ResultTupleObj<T2, E>;
 };
 type FailResult<E extends Error> = [error: E, result?: undefined] & {
     error: E;
     result?: undefined;
+    mapTo: () => FailResult<E>;
 };
 /**
  * Simple bare-bones discriminated tuple type for a [error, result] pair.
@@ -81,14 +83,14 @@ export declare const Result: {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulmap
      */
-    map: <T_1, T2, E_1 extends Error>(result: ResultTuple<T_1, E_1>, mapFn: (resultValue: T_1) => T2) => ResultTupleObj<T2, E_1>;
+    map: <T, T2, E extends Error>(result: ResultTuple<T, E>, mapFn: (resultValue: T) => T2) => ResultTupleObj<T2, E>;
     /**
      * 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
      */
-    throw: <T_2>(result: ResultTuple<T_2, Error>) => T_2;
+    throw: <T>(result: ResultTuple<T>) => T;
 };
 export declare namespace Result {
     type Tuple<T, E extends Error = Error> = ResultTuple<T, E>;

package/esm/errorhandling.js

@@ -4,6 +4,7 @@
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
  */
+/*#__NO_SIDE_EFFECTS__*/
 export class ErrorFromPayload extends Error {
     constructor(payload) {
         if (process.env.NODE_ENV !== 'production' && payload instanceof Error) {
@@ -25,22 +26,30 @@ export class ErrorFromPayload extends Error {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#aserror
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const asError = (maybeError) => {
     if (maybeError instanceof Error) {
         return maybeError;
     }
     return new ErrorFromPayload(maybeError);
 };
+/*#__NO_SIDE_EFFECTS__*/
 const Success = (result) => {
     const tuple = [undefined, result];
     tuple.result = result;
+    tuple.mapTo = (fn) => 
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    map(tuple, fn);
     return tuple;
 };
+/*#__NO_SIDE_EFFECTS__*/
 const Fail = (e) => {
     const tuple = [asError(e)];
     tuple.error = tuple[0];
+    tuple.mapTo = () => tuple;
     return tuple;
 };
+/*#__NO_SIDE_EFFECTS__*/
 function catch_(something) {
     if (something instanceof Promise) {
         return something.then(Success, (e) => Fail(e));
@@ -52,6 +61,15 @@ function catch_(something) {
         return Fail(e);
     }
 }
+const map = (result, 
+/*#__NO_SIDE_EFFECTS__*/
+mapFn) => {
+    const [error, resultValue] = result;
+    if (error) {
+        return Fail(error);
+    }
+    return catch_(() => mapFn(resultValue));
+};
 /**
  * Singleton object with small methods for creating, mapping or handling
  * `ResultTupleObj` instances.
@@ -80,12 +98,13 @@ export const Result = {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulmap
      */
+    /*#__NO_SIDE_EFFECTS__*/
     map: (result, mapFn) => {
         const [error, resultValue] = result;
         if (error) {
             return Fail(error);
         }
-        return Success(mapFn(resultValue));
+        return catch_(() => mapFn(resultValue));
     },
     /**
      * Unwraps a discriminated [error, result] `Result.Tuple`-like object
@@ -93,6 +112,7 @@ export const Result = {
      *
      * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#resulthrow
      */
+    /*#__NO_SIDE_EFFECTS__*/
     throw: (result) => {
         if (result[0]) {
             throw result[0];

package/esm/fixIcelandicLocale.privates.d.ts

@@ -1,83 +1,57 @@
-export declare const _PatchedCollator: {
-    (locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): Intl.Collator;
-    new (locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): Intl.Collator;
-    supportedLocalesOf(locales: string | string[], options?: Intl.CollatorOptions | undefined): string[];
-} & {
+export declare const _PatchedCollator: typeof Intl.Collator & {
     $original: typeof Intl.Collator;
 };
 export declare const _patchedStringLocaleCompare: {
     (this: string, that: string, locales?: string | Array<string>, options?: Intl.CollatorOptions): number;
     $original: {
         (that: string): number;
-        (that: string, locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): number;
+        (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number;
+        (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number;
     };
 };
-export declare const _PatchedNumberFormat: {
-    (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat;
-    new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat;
-    supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[];
-    readonly prototype: Intl.NumberFormat;
-} & {
+export declare const _PatchedNumberFormat: typeof Intl.NumberFormat & {
     $original: typeof Intl.NumberFormat;
 };
 export declare const _patchedNumberToLocaleString: {
     (this: number, locales?: string | Array<string>, options?: Intl.NumberFormatOptions): string;
     $original: {
-        (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): string;
-        (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions | undefined): string;
+        (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
     };
 };
-export declare const _PatchedDateTimeFormat: {
-    (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): Intl.DateTimeFormat;
-    new (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): Intl.DateTimeFormat;
-    supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions | undefined): string[];
-    readonly prototype: Intl.DateTimeFormat;
-} & {
+export declare const _PatchedDateTimeFormat: typeof Intl.DateTimeFormat & {
     $original: typeof Intl.DateTimeFormat;
 };
 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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): 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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
     };
 };
 export declare const _patchedDateToLocaleTimeString: {
     (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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
     };
 };
-export declare const _PatchedPluralRules: {
-    (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
-    new (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
-    supportedLocalesOf(locales: string | string[], options?: {
-        localeMatcher?: "best fit" | "lookup" | undefined;
-    } | undefined): string[];
-} & {
+export declare const _PatchedPluralRules: typeof Intl.PluralRules & {
     $original: typeof Intl.PluralRules;
 };
-export declare const _PatchedListFormat: {
-    new (locales?: string | string[] | undefined, options?: Intl.ListFormatOptions | undefined): Intl.ListFormat;
-    prototype: Intl.ListFormat;
-    supportedLocalesOf(locales: string | string[], options?: Pick<Intl.ListFormatOptions, "localeMatcher"> | undefined): string[];
-} & {
+export declare const _PatchedListFormat: typeof Intl.ListFormat & {
     $original: typeof Intl.ListFormat;
 };
-export declare const _PatchedRelativeTimeFormat: {
-    new (locales?: string | string[] | undefined, options?: Intl.RelativeTimeFormatOptions | undefined): Intl.RelativeTimeFormat;
-    supportedLocalesOf(locales?: string | string[] | undefined, options?: Intl.RelativeTimeFormatOptions | undefined): string[];
-} & {
+export declare const _PatchedRelativeTimeFormat: typeof Intl.RelativeTimeFormat & {
     $original: typeof Intl.RelativeTimeFormat;
 };

package/esm/fixIcelandicLocale.privates.js

@@ -210,9 +210,9 @@ const partMappers = {
 const reformatDateTimeParts = function (parent, parts) {
     const options = parent.resolvedOptions();
     parts.forEach((part, idx) => {
-        var _a;
+        var _d;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
+        const newValue = mapper && mapper(part.value, (_d = parts[idx - 1]) === null || _d === void 0 ? void 0 : _d.type, options);
         if (newValue != null) {
             part.value = newValue;
         }
@@ -436,7 +436,7 @@ if (_RelativeTimeFormat) {
         'i går': 'í gær',
         'i dag': 'í dag',
         'i morgen': 'á morgun',
-        'i overmorgen': 'eftir tvo daga',
+        'i overmorgen': 'eftir tvo daga', // 'á hinn daginn',
         'denne time': 'þessa stundina',
         'dette minut': 'á þessari mínútu',
     };

package/esm/http.d.ts

@@ -1,4 +1,3 @@
-/// <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;

package/esm/http.js

@@ -138,6 +138,7 @@ const unitToSeconds = {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const toSec = (ttl) => {
     if (typeof ttl === 'string') {
         const value = parseFloat(ttl);
@@ -152,7 +153,9 @@ export const toSec = (ttl) => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const toMs = (ttl) => toSec(ttl) * 1000;
+/*#__NO_SIDE_EFFECTS__*/
 const toRespnseStubHeaders = (response) => {
     if (response instanceof Map) {
         return response;
@@ -177,6 +180,7 @@ const stabilities = {
     immutable: ', immutable',
     normal: '',
 };
+/*#__NO_SIDE_EFFECTS__*/
 const setCC = (response, cc) => {
     const devModeHeader = 'X-Cache-Control';
     const headers = toRespnseStubHeaders(response);
@@ -197,7 +201,7 @@ const setCC = (response, cc) => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
  */
-// eslint-disable-next-line complexity
+/*#__NO_SIDE_EFFECTS__*/ // eslint-disable-next-line complexity
 export const cacheControl = (response, ttlCfg, eTag) => {
     response = 'res' in response ? response.res : response;
     const opts = typeof ttlCfg === 'number' || typeof ttlCfg === 'string'
@@ -240,6 +244,7 @@ export const cacheControl = (response, ttlCfg, eTag) => {
  * Accepts the same arguments as `cacheControl()`.
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const cacheControlHeaders = (ttlCfg, eTag) => {
     const headers = new Map();
     cacheControl(headers, ttlCfg, eTag);

package/esm/next/http.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import React, { FunctionComponent } from 'react';
 import type { Cleanup } from '@reykjavik/hanna-utils';
 import type { AppType } from 'next/app.js';
@@ -28,10 +27,10 @@ export type InferErrorPageProps<SEP extends ShowErrorPageFn<any>> = Cleanup<Retu
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
  */
-export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: React.FunctionComponent<EP>) => {
+export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: FunctionComponent<EP>) => {
     <P extends {
         [key: string]: unknown;
-        __error?: undefined;
+        __error?: never;
     }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils.js").AppPropsType<any, P | ({
         __error: ErrorProps;
     } & Omit<ErrorProps & EP, keyof ErrorProps>)>> & {

package/esm/next/http.js

@@ -11,6 +11,7 @@ export * from '../http.js';
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#showerrorpage-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const showErrorPage = (response, error, ttl = '2s') => {
     error =
         typeof error === 'number'
@@ -35,6 +36,7 @@ const showErrorPage = (response, error, ttl = '2s') => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const makeErrorizeAppHOC = (ErrorPage) => {
     // the HOC
     const withErrorHandling = (App) => {
@@ -64,6 +66,7 @@ export const makeErrorizeAppHOC = (ErrorPage) => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const notModified304 = (response) => {
     response = 'res' in response ? response.res : response;
     response.statusCode = HTTP_304_NotModified;

package/esm/react-router/http.js

@@ -4,6 +4,7 @@
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#isclientfetch
  */
+/*#__NO_SIDE_EFFECTS__*/
 export const isClientFetch = (request) => 
 // For info about this detection method:
 // - https://github.com/remix-run/remix/discussions/5583

package/fixIcelandicLocale.privates.d.ts

@@ -1,83 +1,57 @@
-export declare const _PatchedCollator: {
-    (locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): Intl.Collator;
-    new (locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): Intl.Collator;
-    supportedLocalesOf(locales: string | string[], options?: Intl.CollatorOptions | undefined): string[];
-} & {
+export declare const _PatchedCollator: typeof Intl.Collator & {
     $original: typeof Intl.Collator;
 };
 export declare const _patchedStringLocaleCompare: {
     (this: string, that: string, locales?: string | Array<string>, options?: Intl.CollatorOptions): number;
     $original: {
         (that: string): number;
-        (that: string, locales?: string | string[] | undefined, options?: Intl.CollatorOptions | undefined): number;
+        (that: string, locales?: string | string[], options?: Intl.CollatorOptions): number;
+        (that: string, locales?: Intl.LocalesArgument, options?: Intl.CollatorOptions): number;
     };
 };
-export declare const _PatchedNumberFormat: {
-    (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat;
-    new (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): Intl.NumberFormat;
-    supportedLocalesOf(locales: string | string[], options?: Intl.NumberFormatOptions | undefined): string[];
-    readonly prototype: Intl.NumberFormat;
-} & {
+export declare const _PatchedNumberFormat: typeof Intl.NumberFormat & {
     $original: typeof Intl.NumberFormat;
 };
 export declare const _patchedNumberToLocaleString: {
     (this: number, locales?: string | Array<string>, options?: Intl.NumberFormatOptions): string;
     $original: {
-        (locales?: string | string[] | undefined, options?: Intl.NumberFormatOptions | undefined): string;
-        (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions | undefined): string;
+        (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
     };
 };
-export declare const _PatchedDateTimeFormat: {
-    (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): Intl.DateTimeFormat;
-    new (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): Intl.DateTimeFormat;
-    supportedLocalesOf(locales: string | string[], options?: Intl.DateTimeFormatOptions | undefined): string[];
-    readonly prototype: Intl.DateTimeFormat;
-} & {
+export declare const _PatchedDateTimeFormat: typeof Intl.DateTimeFormat & {
     $original: typeof Intl.DateTimeFormat;
 };
 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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): 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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
     };
 };
 export declare const _patchedDateToLocaleTimeString: {
     (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;
+        (locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
+        (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
     };
 };
-export declare const _PatchedPluralRules: {
-    (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
-    new (locales?: string | string[] | undefined, options?: Intl.PluralRulesOptions | undefined): Intl.PluralRules;
-    supportedLocalesOf(locales: string | string[], options?: {
-        localeMatcher?: "best fit" | "lookup" | undefined;
-    } | undefined): string[];
-} & {
+export declare const _PatchedPluralRules: typeof Intl.PluralRules & {
     $original: typeof Intl.PluralRules;
 };
-export declare const _PatchedListFormat: {
-    new (locales?: string | string[] | undefined, options?: Intl.ListFormatOptions | undefined): Intl.ListFormat;
-    prototype: Intl.ListFormat;
-    supportedLocalesOf(locales: string | string[], options?: Pick<Intl.ListFormatOptions, "localeMatcher"> | undefined): string[];
-} & {
+export declare const _PatchedListFormat: typeof Intl.ListFormat & {
     $original: typeof Intl.ListFormat;
 };
-export declare const _PatchedRelativeTimeFormat: {
-    new (locales?: string | string[] | undefined, options?: Intl.RelativeTimeFormatOptions | undefined): Intl.RelativeTimeFormat;
-    supportedLocalesOf(locales?: string | string[] | undefined, options?: Intl.RelativeTimeFormatOptions | undefined): string[];
-} & {
+export declare const _PatchedRelativeTimeFormat: typeof Intl.RelativeTimeFormat & {
     $original: typeof Intl.RelativeTimeFormat;
 };

package/fixIcelandicLocale.privates.js

@@ -215,9 +215,9 @@ const partMappers = {
 const reformatDateTimeParts = function (parent, parts) {
     const options = parent.resolvedOptions();
     parts.forEach((part, idx) => {
-        var _a;
+        var _d;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
+        const newValue = mapper && mapper(part.value, (_d = parts[idx - 1]) === null || _d === void 0 ? void 0 : _d.type, options);
         if (newValue != null) {
             part.value = newValue;
         }
@@ -444,7 +444,7 @@ if (_RelativeTimeFormat) {
         'i går': 'í gær',
         'i dag': 'í dag',
         'i morgen': 'á morgun',
-        'i overmorgen': 'eftir tvo daga',
+        'i overmorgen': 'eftir tvo daga', // 'á hinn daginn',
         'denne time': 'þessa stundina',
         'dette minut': 'á þessari mínútu',
     };

package/http.d.ts

@@ -1,4 +1,3 @@
-/// <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;

package/http.js

@@ -142,6 +142,7 @@ const unitToSeconds = {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#tosec-ttl-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const toSec = (ttl) => {
     if (typeof ttl === 'string') {
         const value = parseFloat(ttl);
@@ -157,8 +158,10 @@ exports.toSec = toSec;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#toms-duration-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const toMs = (ttl) => (0, exports.toSec)(ttl) * 1000;
 exports.toMs = toMs;
+/*#__NO_SIDE_EFFECTS__*/
 const toRespnseStubHeaders = (response) => {
     if (response instanceof Map) {
         return response;
@@ -183,6 +186,7 @@ const stabilities = {
     immutable: ', immutable',
     normal: '',
 };
+/*#__NO_SIDE_EFFECTS__*/
 const setCC = (response, cc) => {
     const devModeHeader = 'X-Cache-Control';
     const headers = toRespnseStubHeaders(response);
@@ -203,7 +207,7 @@ const setCC = (response, cc) => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrol-helper
  */
-// eslint-disable-next-line complexity
+/*#__NO_SIDE_EFFECTS__*/ // eslint-disable-next-line complexity
 const cacheControl = (response, ttlCfg, eTag) => {
     response = 'res' in response ? response.res : response;
     const opts = typeof ttlCfg === 'number' || typeof ttlCfg === 'string'
@@ -247,6 +251,7 @@ exports.cacheControl = cacheControl;
  * Accepts the same arguments as `cacheControl()`.
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README.md#cachecontrolheaders-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const cacheControlHeaders = (ttlCfg, eTag) => {
     const headers = new Map();
     (0, exports.cacheControl)(headers, ttlCfg, eTag);

package/next/http.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import React, { FunctionComponent } from 'react';
 import type { Cleanup } from '@reykjavik/hanna-utils';
 import type { AppType } from 'next/app.js';
@@ -28,10 +27,10 @@ export type InferErrorPageProps<SEP extends ShowErrorPageFn<any>> = Cleanup<Retu
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
  */
-export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: React.FunctionComponent<EP>) => {
+export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorPage: FunctionComponent<EP>) => {
     <P extends {
         [key: string]: unknown;
-        __error?: undefined;
+        __error?: never;
     }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils.js").AppPropsType<any, P | ({
         __error: ErrorProps;
     } & Omit<ErrorProps & EP, keyof ErrorProps>)>> & {

package/next/http.js

@@ -31,6 +31,7 @@ __exportStar(require("../http.js"), exports);
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#showerrorpage-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const showErrorPage = (response, error, ttl = '2s') => {
     error =
         typeof error === 'number'
@@ -55,6 +56,7 @@ const showErrorPage = (response, error, ttl = '2s') => {
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#makeerrorizeapphoc
  */
+/*#__NO_SIDE_EFFECTS__*/
 const makeErrorizeAppHOC = (ErrorPage) => {
     // the HOC
     const withErrorHandling = (App) => {
@@ -85,6 +87,7 @@ exports.makeErrorizeAppHOC = makeErrorizeAppHOC;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-nextjs.md#notmodified304-helper
  */
+/*#__NO_SIDE_EFFECTS__*/
 const notModified304 = (response) => {
     response = 'res' in response ? response.res : response;
     response.statusCode = http_js_1.HTTP_304_NotModified;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"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",
@@ -11,7 +11,7 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@reykjavik/hanna-utils": "^0.2.16"
+		"@reykjavik/hanna-utils": "^0.2.20"
 	},
 	"peerDependencies": {
 		"@vanilla-extract/css": "^1.14.1",

package/react-router/Wait.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Wait = void 0;
 const react_1 = __importStar(require("react"));

package/react-router/http.js

@@ -7,6 +7,7 @@ exports.isClientFetch = void 0;
  *
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/README-rr.md#isclientfetch
  */
+/*#__NO_SIDE_EFFECTS__*/
 const isClientFetch = (request) => 
 // For info about this detection method:
 // - https://github.com/remix-run/remix/discussions/5583

package/vanillaExtract.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vanillaClass = exports.vanillaProps = exports.vanillaGlobal = void 0;
+exports.vanillaProps = exports.vanillaGlobal = void 0;
+exports.vanillaClass = vanillaClass;
 const css_1 = require("@vanilla-extract/css");
 /**
  * Adds free-form CSS as a globalStyle
@@ -30,4 +31,3 @@ function vanillaClass(cssOrDebugId, css) {
         : css.replace(/&&/g, `.${className}`));
     return className;
 }
-exports.vanillaClass = vanillaClass;