@reykjavik/webtools 0.2.9 → 0.3.0

package/CHANGELOG.md

@@ -4,7 +4,17 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.2.9
+## 0.3.0
+
+_2025-11-10_
+
+- `@reykjavik/webtools/http`:
+  - **BREAKING** feat: `toMs()` now treats raw numbers as milliseconds (not as
+    seconds)
+- `@reykjavik/webtools/errorhandling`:
+  - feat: Alias `Result.catch()` as `Result.ify()` for readability
+
+## 0.2.9 – 0.2.10
 
 _2025-09-30_
 

package/README.md

@@ -41,6 +41,7 @@ bun add @reykjavik/webtools
   - [Type `ResultTupleObj`](#type-resulttupleobj)
     - [Type `ResultTupleObj.mapTo`](#type-resulttupleobjmapto)
   - [`Result.catch`](#resultcatch)
+  - [`Result.ify`](#resultify)
   - [`Result.map`](#resultmap)
   - [`Result.Success`](#resultsuccess)
   - [`Result.Fail`](#resultfail)
@@ -230,7 +231,11 @@ import type { toSec, TTL } from '@reykjavik/webtools/http';
 
 const ttl: TTL = '2h';
 
-const ttlSec = toSec(ttl);
+const ttlSec1 = toSec(ttl); // 7200
+// Raw numbers are returned as-is (rounded)
+const ttlSec2 = toSec(10.6); // 11
+// Negative numbers become zero
+const ttlSec3 = toSec('-1h'); // 0
 ```
 
 ### `toMs` duration helper
@@ -246,7 +251,11 @@ import type { toMs, TTL } from '@reykjavik/webtools/http';
 
 const ttl: TTL = '2h';
 
-const ttlSec = toMs(ttl);
+const ttlMs1 = toMs(ttl); // 7_200_000
+// Raw numbers are returned as-is (rounded)
+const ttlMs2 = toMs(499.9); // 500
+// Negative numbers become zero
+const ttlMs3 = toMs('-1h'); // 0
 ```
 
 ---
@@ -711,6 +720,8 @@ failed `ResultTupleObj`.
 
 ### `Result.catch`
 
+Aliased as `Result.ify` for readability.
+
 **Syntax:**
 `Result.catch<T, Err>(callback: () => T): ResultTupleObj<T, Err>`  
 **Syntax:**
@@ -744,14 +755,19 @@ fooQuery.result; // Guaranteed to be defined
 
 This function acts as the inverse of [`Result.throw()`](#resultthrow).
 
+### `Result.ify`
+
+Syntatic sugar alias of [`Result.catch`](#resultcatch).
+
 ### `Result.map`
 
 **Syntax:**
 `Result.map<T, T2, E>(result: ResultTuple<T, E>, mapResult: (resultValue: T) => T2): ResultTuple<T2, E>`
 
-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.
+Convenience 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. Errors thrown from the mapping function are caught
+and turned into a failed `ResultTupleObj`.
 
 ```ts
 import { Result } from '@reykjavik/webtools/errorhandling';

package/errorhandling.d.ts

@@ -84,6 +84,7 @@ export declare const Result: {
      */
     Fail: <E extends Error = Error>(e: unknown) => FailResult<E>;
     catch: typeof catch_;
+    ify: typeof catch_;
     /**
      * Helper to map a `ResultTuple`-like object to a new `ResultTupleObj`
      * object, applying a transformation function to the result, but retaining

package/errorhandling.js

@@ -96,6 +96,7 @@ exports.Result = {
     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

package/esm/errorhandling.d.ts

@@ -84,6 +84,7 @@ export declare const Result: {
      */
     Fail: <E extends Error = Error>(e: unknown) => FailResult<E>;
     catch: typeof catch_;
+    ify: typeof catch_;
     /**
      * Helper to map a `ResultTuple`-like object to a new `ResultTupleObj`
      * object, applying a transformation function to the result, but retaining

package/esm/errorhandling.js

@@ -91,6 +91,7 @@ export const Result = {
     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

package/esm/http.d.ts

@@ -157,13 +157,6 @@ type TTLObj = {
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/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.
@@ -171,6 +164,13 @@ export declare const toSec: (ttl: TTL) => number;
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/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.2/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>>;
 };

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.2/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.2/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) {
@@ -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;

package/esm/vanillaExtract.js

@@ -44,4 +44,3 @@ export const vanillaVars = (...varNames) => {
     }
     return vars;
 };
-const { varColor, varBg, setVars } = vanillaVars('color', 'bg');

package/http.d.ts

@@ -157,13 +157,6 @@ type TTLObj = {
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/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.
@@ -171,6 +164,13 @@ export declare const toSec: (ttl: TTL) => number;
  * @see https://github.com/reykjavikcity/webtools/blob/v0.2/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.2/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>>;
 };

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.2/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.2/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) {
@@ -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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.2.9",
+	"version": "0.3.0",
 	"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/vanillaExtract.js

@@ -51,4 +51,3 @@ const vanillaVars = (...varNames) => {
     return vars;
 };
 exports.vanillaVars = vanillaVars;
-const { varColor, varBg, setVars } = (0, exports.vanillaVars)('color', 'bg');