@cto.af/utils 1.4.2 → 2.0.1

package/lib/{index.d.mts → index.d.ts}

@@ -1,7 +1,6 @@
-//#region src/index.d.ts
-declare class AssertionError extends Error {
-  constructor(actual: unknown, expected: unknown, message?: string);
-  toString(): string;
+export declare class AssertionError extends Error {
+    constructor(actual: unknown, expected: unknown, message?: string);
+    toString(): string;
 }
 /**
  * Very simplified assert, which will work in the browser.
@@ -10,13 +9,15 @@ declare class AssertionError extends Error {
  * @param message Optional message.
  * @throws {AssertionError} If value is falsy.
  */
-declare function assert(value: unknown, message?: string): asserts value;
-type Pretty<T> = { [K in keyof T]: T[K] } & {};
-interface ErrnoException extends Error {
-  errno?: number | undefined;
-  code?: string | undefined;
-  path?: string | undefined;
-  syscall?: string | undefined;
+export declare function assert(value: unknown, message?: string): asserts value;
+export type Pretty<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export interface ErrnoException extends Error {
+    errno?: number | undefined;
+    code?: string | undefined;
+    path?: string | undefined;
+    syscall?: string | undefined;
 }
 /**
  * Is the object an ErrnoException?
@@ -24,7 +25,7 @@ interface ErrnoException extends Error {
  * @param e Object to check.
  * @returns Type assertion.
  */
-declare function isErrno(e: unknown): e is ErrnoException;
+export declare function isErrno(e: unknown): e is ErrnoException;
 /**
  * Does the error contain a specific code?
  *
@@ -33,9 +34,9 @@ declare function isErrno(e: unknown): e is ErrnoException;
  * @returns True if code matches.
  * @throws {TypeError} On invalid code type.
  */
-declare function errCode(e: unknown, code: string | number): boolean;
-interface CiOptions {
-  CI?: boolean;
+export declare function errCode(e: unknown, code: string | number): boolean;
+export interface CiOptions {
+    CI?: boolean;
 }
 /**
  * Is the current environment CI-like.
@@ -43,11 +44,11 @@ interface CiOptions {
  * @param opts Override the environment determination, for testing.
  * @returns True if in CI.
  */
-declare function isCI(opts?: CiOptions): boolean;
-interface PromiseWithResolvers<T> {
-  promise: Promise<T>;
-  resolve(value: T | PromiseLike<T>): void;
-  reject(reason?: any): void;
+export declare function isCI(opts?: CiOptions): boolean;
+export interface PromiseWithResolvers<T> {
+    promise: Promise<T>;
+    resolve(value: T | PromiseLike<T>): void;
+    reject(reason?: any): void;
 }
 /**
  * Polyfill for Promise.withResolvers.  Once node 22 is the minimum version,
@@ -58,7 +59,7 @@ interface PromiseWithResolvers<T> {
  *   resolve or reject it, corresponding to the two parameters passed to the
  *   executor of the Promise() constructor.
  */
-declare function promiseWithResolvers<T>(): PromiseWithResolvers<T>;
+export declare function promiseWithResolvers<T>(): PromiseWithResolvers<T>;
 /**
  * Get the names of the keys of an options type, from the defaults.
  *
@@ -66,7 +67,7 @@ declare function promiseWithResolvers<T>(): PromiseWithResolvers<T>;
  * @param defaults Default values for the options.
  * @returns List of keys of the given object.
  */
-declare function nameSet<T extends object>(defaults: T): Set<keyof T>;
+export declare function nameSet<T extends object>(defaults: T): Set<keyof T>;
 /**
  * Assert that none of the given sets of strings share a value.
  * Useful for validating inputs to select.
@@ -74,14 +75,14 @@ declare function nameSet<T extends object>(defaults: T): Set<keyof T>;
  * @param sets Sets to check.
  * @throws {AssertionError} If sets are the wrong type.
  */
-declare function assertDisjoint(...sets: (Set<string> | string[] | object)[]): void;
+export declare function assertDisjoint(...sets: (Set<string> | string[] | object)[]): void;
 /**
  * Select with a defaults object, a list of keys, or a set of keys.  The
  * set of keys might perform better, but we can't extract types from it.
  *
  * @template T Options object, where most properties are optional.
  */
-type Selector<T extends object> = Partial<T> | (keyof T)[] | Set<keyof T>;
+export type Selector<T extends object> = Partial<T> | (keyof T)[] | Set<keyof T>;
 /**
  * A defaults object extracts a required subset of T.
  * A list of keys extracts a partial subset of T with those possible keys.
@@ -90,14 +91,14 @@ type Selector<T extends object> = Partial<T> | (keyof T)[] | Set<keyof T>;
  * @template T Options object, where most properties are optional.
  * @template U Selector.
  */
-type Selected<T extends object, U extends Selector<T>> = U extends Partial<T> ? U : U extends (keyof T)[] ? Pretty<Partial<Pick<T, U[number]>>> : Partial<T>;
+export type Selected<T extends object, U extends Selector<T>> = U extends Partial<T> ? U : U extends (keyof T)[] ? Pretty<Partial<Pick<T, U[number]>>> : Partial<T>;
 /**
  * The keys that were selected.
  *
  * @template T Options object, where most properties are optional.
  * @template U Selector.
  */
-type SelectedKeys<T extends object, U extends Selector<T>> = U extends Partial<T> ? keyof U : U extends (keyof T)[] ? U[number] : never;
+export type SelectedKeys<T extends object, U extends Selector<T>> = U extends Partial<T> ? keyof U : U extends (keyof T)[] ? U[number] : never;
 /**
  * Select some properties from an object into multiple other objects.
  * All unselected fields will be contained in a final object for the
@@ -113,8 +114,15 @@ type SelectedKeys<T extends object, U extends Selector<T>> = U extends Partial<T
  * @returns One object for each of args,
  *   plus an extra one for everything that was left over.
  */
-declare function select<T extends object, U extends Selector<T>>(obj: T, defaultsU: U): [Selected<T, U>, Pretty<Omit<T, SelectedKeys<T, U>>>];
-declare function select<T extends object, U extends Selector<T>, V extends Selector<T>>(obj: T, defaultsU: U, defaultsV: V): [Selected<T, U>, Selected<T, V>, Pretty<Omit<T, SelectedKeys<T, U> | SelectedKeys<T, V>>>];
-declare function select<T extends object, U extends Selector<T>, V extends Selector<T>, W extends Selector<T>>(obj: T, defaultsU: U, defaultsV: V, defaultsW: W): [Selected<T, U>, Selected<T, V>, Selected<T, W>, Pretty<Omit<T, SelectedKeys<T, U> | SelectedKeys<T, V> | SelectedKeys<T, W>>>];
-//#endregion
-export { AssertionError, CiOptions, ErrnoException, Pretty, PromiseWithResolvers, Selected, SelectedKeys, Selector, assert, assertDisjoint, errCode, isCI, isErrno, nameSet, promiseWithResolvers, select };
+export declare function select<T extends object, U extends Selector<T>>(obj: T, defaultsU: U): [Selected<T, U>, Pretty<Omit<T, SelectedKeys<T, U>>>];
+export declare function select<T extends object, U extends Selector<T>, V extends Selector<T>>(obj: T, defaultsU: U, defaultsV: V): [
+    Selected<T, U>,
+    Selected<T, V>,
+    Pretty<Omit<T, SelectedKeys<T, U> | SelectedKeys<T, V>>>
+];
+export declare function select<T extends object, U extends Selector<T>, V extends Selector<T>, W extends Selector<T>>(obj: T, defaultsU: U, defaultsV: V, defaultsW: W): [
+    Selected<T, U>,
+    Selected<T, V>,
+    Selected<T, W>,
+    Pretty<Omit<T, SelectedKeys<T, U> | SelectedKeys<T, V> | SelectedKeys<T, W>>>
+];

package/lib/index.js

@@ -0,0 +1,182 @@
+export class AssertionError extends Error {
+    constructor(actual, expected, message) {
+        let generatedMessage = false;
+        if (!message) {
+            message = `The expression evaluated to a falsy value:\n\n  assert(${actual})\n`;
+            generatedMessage = true;
+        }
+        super(message);
+        Object.assign(this, {
+            code: 'ERR_ASSERTION',
+            actual,
+            expected,
+            operator: '==',
+            generatedMessage,
+        });
+    }
+    toString() {
+        return `AssertionError [ERR_ASSERTION]: ${this.message}`;
+    }
+}
+/**
+ * Very simplified assert, which will work in the browser.
+ *
+ * @param value Any value that should be truthy.
+ * @param message Optional message.
+ * @throws {AssertionError} If value is falsy.
+ */
+export function assert(value, message) {
+    if (value) {
+        return;
+    }
+    throw new AssertionError(value, true, message);
+}
+/**
+ * Is the object an ErrnoException?
+ *
+ * @param e Object to check.
+ * @returns Type assertion.
+ */
+export function isErrno(e) {
+    return (e instanceof Error) &&
+        Object.prototype.hasOwnProperty.call(e, 'code');
+}
+/**
+ * Does the error contain a specific code?
+ *
+ * @param e Exception to check.
+ * @param code Code such as 'ENOENT' or -2.
+ * @returns True if code matches.
+ * @throws {TypeError} On invalid code type.
+ */
+export function errCode(e, code) {
+    if (!isErrno(e)) {
+        return false;
+    }
+    switch (typeof code) {
+        case 'string':
+            return e.code === code;
+        case 'number':
+            return e.errno === code;
+    }
+    throw new TypeError(`Invalid code: ${JSON.stringify(code)}`);
+}
+/**
+ * Is the current environment CI-like.
+ *
+ * @param opts Override the environment determination, for testing.
+ * @returns True if in CI.
+ */
+export function isCI(opts) {
+    // Override for testing, so we don't have to much with process.env
+    if (opts && ('CI' in opts)) {
+        return Boolean(opts.CI);
+    }
+    if (typeof process === 'undefined') {
+        return false;
+    }
+    const { env } = process;
+    return Boolean(
+    // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari,
+    // GitHub Actions
+    env.CI ||
+        env.CONTINUOUS_INTEGRATION || // Travis CI, Cirrus CI
+        env.BUILD_NUMBER || // Jenkins, TeamCity
+        env.RUN_ID || // TaskCluster, dsari
+        false);
+}
+const noOp = () => undefined;
+/**
+ * Polyfill for Promise.withResolvers.  Once node 22 is the minimum version,
+ * this should be removed.
+ *
+ * @template T Return type for resolve.
+ * @returns An object containing a new Promise object and two functions to
+ *   resolve or reject it, corresponding to the two parameters passed to the
+ *   executor of the Promise() constructor.
+ */
+export function promiseWithResolvers() {
+    let resolve = noOp;
+    let reject = noOp;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return { promise, resolve, reject };
+}
+/**
+ * Get the names of the keys of an options type, from the defaults.
+ *
+ * @template T Options type.
+ * @param defaults Default values for the options.
+ * @returns List of keys of the given object.
+ */
+export function nameSet(defaults) {
+    return new Set(Object.keys(defaults));
+}
+/**
+ * Assert that none of the given sets of strings share a value.
+ * Useful for validating inputs to select.
+ *
+ * @param sets Sets to check.
+ * @throws {AssertionError} If sets are the wrong type.
+ */
+export function assertDisjoint(...sets) {
+    const seen = new Set();
+    for (const s of sets) {
+        let it = null;
+        if (Array.isArray(s)) {
+            it = s;
+        }
+        else if (s instanceof Set) {
+            it = s;
+        }
+        else if ((typeof s === 'object') && s) {
+            it = Object.keys(s);
+        }
+        else {
+            throw new Error('Invalid set');
+        }
+        for (const i of it) {
+            assert(!seen.has(i), i);
+            seen.add(i);
+        }
+    }
+}
+export function select(obj, ...defaults) {
+    const sets = [];
+    const res = defaults.map(a => {
+        const ret = Object.create(null);
+        if (a instanceof Set) {
+            sets.push(a);
+            return ret;
+        }
+        if (Array.isArray(a)) {
+            sets.push(new Set(a));
+            return ret;
+        }
+        if (!a || (typeof a !== 'object')) {
+            throw new Error(`Invalid set: ${a}`);
+        }
+        sets.push(nameSet(a));
+        return Object.assign(ret, a);
+    });
+    const leftovers = Object.create(null);
+    res.push(leftovers);
+    if (!obj) {
+        return res;
+    }
+    for (const [k, v] of Object.entries(obj)) {
+        let found = false;
+        sets.forEach((s, i) => {
+            if (!found && s.has(k)) {
+                found = true;
+                res[i][k] = v;
+            }
+        });
+        if (!found) {
+            leftovers[k] = v;
+        }
+    }
+    return res;
+}

package/lib/{u8.d.mts → u8.d.ts}

@@ -1,4 +1,3 @@
-//#region src/u8.d.ts
 /**
  * Convert hex string to bytes.
  *
@@ -12,5 +11,4 @@ declare const hexToU8: (s: string) => Uint8Array;
  * @returns Hex.
  */
 declare const u8toHex: (u8: Uint8Array) => string;
-//#endregion
-export { hexToU8, u8toHex };
+export { hexToU8, u8toHex, };

package/lib/u8.js

@@ -0,0 +1,20 @@
+import * as impl from './u8Impl.js';
+/**
+ * Convert hex string to bytes.
+ *
+ * @param str String.
+ * @returns Buffer.
+ */
+const hexToU8 = 
+// @ts-expect-error fromHex not in types yet
+Uint8Array.fromHex ??
+    impl.hexToU8;
+/**
+ * Convert bytes to hex string.
+ * @param u8 Bytes.
+ * @returns Hex.
+ */
+const u8toHex = 
+// @ts-expect-error toHex not in types yet
+Uint8Array.prototype.toHex ? impl.u8toHexModern : impl.u8toHex;
+export { hexToU8, u8toHex, };

package/lib/{u8Impl.d.mts → u8Impl.d.ts}

@@ -1,22 +1,19 @@
-//#region src/u8Impl.d.ts
 /**
  * Convert hex string to bytes.
  *
  * @param str String.
  * @returns Buffer.
  */
-declare function hexToU8(str: string): Uint8Array;
+export declare function hexToU8(str: string): Uint8Array;
 /**
  * Convert bytes to hex string.
  * @param u8 Bytes.
  * @returns Hex.
  */
-declare function u8toHex(u8: Uint8Array): string;
+export declare function u8toHex(u8: Uint8Array): string;
 /**
  * Convert bytes to hex string.
  * @param u8 Bytes.
  * @returns Hex.
  */
-declare function u8toHexModern(u8: Uint8Array): string;
-//#endregion
-export { hexToU8, u8toHex, u8toHexModern };
+export declare function u8toHexModern(u8: Uint8Array): string;

package/lib/u8Impl.js

@@ -0,0 +1,33 @@
+/**
+ * Convert hex string to bytes.
+ *
+ * @param str String.
+ * @returns Buffer.
+ */
+export function hexToU8(str) {
+    str = str.replace(/\s/g, '');
+    let len = Math.ceil(str.length / 2);
+    const res = new Uint8Array(len);
+    len--;
+    for (let end = str.length, start = end - 2; end >= 0; end = start, start -= 2, len--) {
+        res[len] = parseInt(str.substring(start, end), 16);
+    }
+    return res;
+}
+/**
+ * Convert bytes to hex string.
+ * @param u8 Bytes.
+ * @returns Hex.
+ */
+export function u8toHex(u8) {
+    return u8.reduce((t, v) => t + v.toString(16).padStart(2, '0'), '');
+}
+/**
+ * Convert bytes to hex string.
+ * @param u8 Bytes.
+ * @returns Hex.
+ */
+export function u8toHexModern(u8) {
+    // @ts-expect-error toHex not in types yet
+    return u8.toHex();
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@cto.af/utils",
-  "version": "1.4.2",
+  "version": "2.0.1",
   "decription": "",
-  "main": "lib/index.mjs",
+  "main": "lib/index.js",
   "files": [
     "lib/*"
   ],
   "exports": {
-    ".": "./lib/index.mjs",
-    "./u8": "./lib/u8.mjs"
+    ".": "./lib/index.js",
+    "./u8": "./lib/u8.js"
   },
   "type": "module",
   "author": "Joe Hildebrand <joe-github@cursive.net>",
@@ -21,13 +21,8 @@
   "bugs": {
     "url": "https://github.com/cto-af/utils/issues"
   },
-  "packageManager": "pnpm@10.30.3",
-  "pnpm": {
-    "overrides": {
-      "c8@11.0.0>yargs": "18.0.0"
-    }
-  },
+  "packageManager": "pnpm@12.5.1",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

package/lib/index.mjs

@@ -1 +0,0 @@
-var AssertionError=class extends Error{constructor(actual,expected,message){let generatedMessage=!1;message||(message=`The expression evaluated to a falsy value:\n\n  assert(${actual})\n`,generatedMessage=!0),super(message),Object.assign(this,{code:`ERR_ASSERTION`,actual,expected,operator:`==`,generatedMessage})}toString(){return`AssertionError [ERR_ASSERTION]: ${this.message}`}};function assert(value,message){if(!value)throw new AssertionError(value,!0,message)}function isErrno(e){return e instanceof Error&&Object.prototype.hasOwnProperty.call(e,`code`)}function errCode(e,code){if(!isErrno(e))return!1;switch(typeof code){case`string`:return e.code===code;case`number`:return e.errno===code}throw TypeError(`Invalid code: ${JSON.stringify(code)}`)}function isCI(opts){if(opts&&`CI`in opts)return!!opts.CI;if(typeof process>`u`)return!1;let{env}=process;return!!(env.CI||env.CONTINUOUS_INTEGRATION||env.BUILD_NUMBER||env.RUN_ID)}const noOp=()=>void 0;function promiseWithResolvers(){let resolve=noOp,reject=noOp;return{promise:new Promise((res,rej)=>{resolve=res,reject=rej}),resolve,reject}}function nameSet(defaults){return new Set(Object.keys(defaults))}function assertDisjoint(...sets){let seen=new Set;for(let s of sets){let it=null;if(Array.isArray(s))it=s;else if(s instanceof Set)it=s;else if(typeof s==`object`&&s)it=Object.keys(s);else throw Error(`Invalid set`);for(let i of it)assert(!seen.has(i),i),seen.add(i)}}function select(obj,...defaults){let sets=[],res=defaults.map(a=>{let ret=Object.create(null);if(a instanceof Set)return sets.push(a),ret;if(Array.isArray(a))return sets.push(new Set(a)),ret;if(!a||typeof a!=`object`)throw Error(`Invalid set: ${a}`);return sets.push(nameSet(a)),Object.assign(ret,a)}),leftovers=Object.create(null);if(res.push(leftovers),!obj)return res;for(let[k,v]of Object.entries(obj)){let found=!1;sets.forEach((s,i)=>{!found&&s.has(k)&&(found=!0,res[i][k]=v)}),found||(leftovers[k]=v)}return res}export{AssertionError,assert,assertDisjoint,errCode,isCI,isErrno,nameSet,promiseWithResolvers,select};

package/lib/u8.mjs

@@ -1 +0,0 @@
-import{hexToU8 as hexToU8$1,u8toHex as u8toHex$1,u8toHexModern}from"./u8Impl.mjs";const hexToU8=Uint8Array.fromHex??hexToU8$1,u8toHex=Uint8Array.prototype.toHex?u8toHexModern:u8toHex$1;export{hexToU8,u8toHex};

package/lib/u8Impl.mjs

@@ -1 +0,0 @@
-function hexToU8(str){str=str.replace(/\s/g,``);let len=Math.ceil(str.length/2),res=new Uint8Array(len);len--;for(let end=str.length,start=end-2;end>=0;end=start,start-=2,len--)res[len]=parseInt(str.substring(start,end),16);return res}function u8toHex(u8){return u8.reduce((t,v)=>t+v.toString(16).padStart(2,`0`),``)}function u8toHexModern(u8){return u8.toHex()}export{hexToU8,u8toHex,u8toHexModern};