@wener/common 2.0.5 → 2.0.6

package/lib/orpc/createOpenApiContractClient.js

@@ -1,27 +1,29 @@
-import { createORPCClient } from "@orpc/client";
-import { OpenAPILink } from "@orpc/openapi-client/fetch";
-import { buildBaseUrl } from "../utils/buildBaseUrl.js";
-import { resolveLinkPlugins } from "./resolveLinkPlugins.js";
+import { createORPCClient } from '@orpc/client';
+import { OpenAPILink } from '@orpc/openapi-client/fetch';
+import { buildBaseUrl } from '../utils/buildBaseUrl.js';
+import { resolveLinkPlugins } from './resolveLinkPlugins.js';
 export function createOpenApiContractClient(contract, options) {
-    let { url, baseUrl, apiKey, getApiKey, getHeaders } = options;
-    const baseHeaders = new Headers(options.headers);
-    if (apiKey) {
-        baseHeaders.set("Authorization", `Bearer ${apiKey}`);
-    }
-    url = buildBaseUrl(url, baseUrl);
-    return createORPCClient(new OpenAPILink(contract, {
-        url,
-        headers: () => {
-            let headers = new Headers(baseHeaders);
-            let accessToken = getApiKey?.();
-            if (accessToken) {
-                headers.set("Authorization", `Bearer ${accessToken}`);
-            }
-            headers = getHeaders?.(headers) ?? headers;
-            return headers;
-        },
-        plugins: resolveLinkPlugins(options),
-        fetch: options.fetch
-    }));
+	let { url, baseUrl, apiKey, getApiKey, getHeaders } = options;
+	const baseHeaders = new Headers(options.headers);
+	if (apiKey) {
+		baseHeaders.set('Authorization', `Bearer ${apiKey}`);
+	}
+	url = buildBaseUrl(url, baseUrl);
+	return createORPCClient(
+		new OpenAPILink(contract, {
+			url,
+			headers: () => {
+				let headers = new Headers(baseHeaders);
+				let accessToken = getApiKey?.();
+				if (accessToken) {
+					headers.set('Authorization', `Bearer ${accessToken}`);
+				}
+				headers = getHeaders?.(headers) ?? headers;
+				return headers;
+			},
+			plugins: resolveLinkPlugins(options),
+			fetch: options.fetch,
+		}),
+	);
 }
 //# sourceMappingURL=createOpenApiContractClient.js.map

package/lib/orpc/createRpcContractClient.js

@@ -1,34 +1,40 @@
-import { createORPCClient } from "@orpc/client";
-import { RPCLink } from "@orpc/client/fetch";
-import { buildBaseUrl } from "../utils/buildBaseUrl.js";
-import { resolveLinkPlugins } from "./resolveLinkPlugins.js";
+import { createORPCClient } from '@orpc/client';
+import { RPCLink } from '@orpc/client/fetch';
+import { buildBaseUrl } from '../utils/buildBaseUrl.js';
+import { resolveLinkPlugins } from './resolveLinkPlugins.js';
 export function createRpcContractClient(options = {}) {
-    let { url = "/api/rpc", baseUrl = globalThis.location?.origin || "http://localhost", apiKey, getApiKey, getHeaders } = options;
-    url = buildBaseUrl(url, baseUrl);
-    const baseHeaders = new Headers(options.headers);
-    if (apiKey) {
-        baseHeaders.set("Authorization", `Bearer ${apiKey}`);
-    }
-    const plugins = resolveLinkPlugins({
-        dedup: true,
-        batch: true,
-        ...options
-    });
-    const link = new RPCLink({
-        url,
-        headers: () => {
-            let headers = new Headers(baseHeaders);
-            let accessToken = getApiKey?.();
-            if (accessToken) {
-                headers.set("Authorization", `Bearer ${accessToken}`);
-            }
-            headers = getHeaders?.(headers) ?? headers;
-            return headers;
-        },
-        fetch: options.fetch,
-        plugins
-    });
-    const client = createORPCClient(link);
-    return client;
+	let {
+		url = '/api/rpc',
+		baseUrl = globalThis.location?.origin || 'http://localhost',
+		apiKey,
+		getApiKey,
+		getHeaders,
+	} = options;
+	url = buildBaseUrl(url, baseUrl);
+	const baseHeaders = new Headers(options.headers);
+	if (apiKey) {
+		baseHeaders.set('Authorization', `Bearer ${apiKey}`);
+	}
+	const plugins = resolveLinkPlugins({
+		dedup: true,
+		batch: true,
+		...options,
+	});
+	const link = new RPCLink({
+		url,
+		headers: () => {
+			let headers = new Headers(baseHeaders);
+			let accessToken = getApiKey?.();
+			if (accessToken) {
+				headers.set('Authorization', `Bearer ${accessToken}`);
+			}
+			headers = getHeaders?.(headers) ?? headers;
+			return headers;
+		},
+		fetch: options.fetch,
+		plugins,
+	});
+	const client = createORPCClient(link);
+	return client;
 }
 //# sourceMappingURL=createRpcContractClient.js.map

package/lib/orpc/index.js

@@ -1,3 +1,3 @@
-export { createRpcContractClient } from "./createRpcContractClient.js";
-export { createOpenApiContractClient } from "./createOpenApiContractClient.js";
+export { createOpenApiContractClient } from './createOpenApiContractClient.js';
+export { createRpcContractClient } from './createRpcContractClient.js';
 //# sourceMappingURL=index.js.map

package/lib/orpc/resolveLinkPlugins.js

@@ -1,28 +1,28 @@
-import { BatchLinkPlugin, DedupeRequestsPlugin } from "@orpc/client/plugins";
-import { resolveFeatureOptions } from "../utils/resolveFeatureOptions.js";
+import { BatchLinkPlugin, DedupeRequestsPlugin } from '@orpc/client/plugins';
+import { resolveFeatureOptions } from '../utils/resolveFeatureOptions.js';
 export function resolveLinkPlugins({ plugins = [], dedup, batch }) {
-    batch = resolveFeatureOptions(batch, {
-        groups: [
-            {
-                condition: () => true,
-                context: {}
-            }
-        ]
-    });
-    if (batch) {
-        plugins.push(new BatchLinkPlugin(batch));
-    }
-    dedup = resolveFeatureOptions(dedup, {
-        groups: [
-            {
-                condition: () => true,
-                context: {}
-            }
-        ]
-    });
-    if (dedup) {
-        plugins.push(new DedupeRequestsPlugin(dedup));
-    }
-    return plugins;
+	batch = resolveFeatureOptions(batch, {
+		groups: [
+			{
+				condition: () => true,
+				context: {},
+			},
+		],
+	});
+	if (batch) {
+		plugins.push(new BatchLinkPlugin(batch));
+	}
+	dedup = resolveFeatureOptions(dedup, {
+		groups: [
+			{
+				condition: () => true,
+				context: {},
+			},
+		],
+	});
+	if (dedup) {
+		plugins.push(new DedupeRequestsPlugin(dedup));
+	}
+	return plugins;
 }
 //# sourceMappingURL=resolveLinkPlugins.js.map

package/lib/password/PHC.js

@@ -1,195 +1,193 @@
-import { ArrayBuffers } from "@wener/utils";
-(function(PHC) {
-    // https://github.com/simonepri/phc-format/blob/master/index.js
-    const idRegex = /^[a-z0-9-]{1,32}$/;
-    const nameRegex = /^[a-z0-9-]{1,32}$/;
-    const valueRegex = /^[a-zA-Z0-9/+.-]+$/;
-    const b64Regex = /^([a-zA-Z0-9/+.-]+|)$/;
-    const decimalRegex = /^((-)?[1-9]\d*|0)$/;
-    const versionRegex = /^v=(\d+)$/;
-    const fromBase64 = ArrayBuffers.fromBase64;
-    const toBase64 = ArrayBuffers.toBase64;
-    const isBuffer = (v)=>{
-        return v instanceof Uint8Array;
-    };
-    function objToKeyVal(obj) {
-        return objectKeys(obj).map((k)=>[
-                k,
-                obj[k]
-            ].join('=')).join(',');
-    }
-    function keyValtoObj(str) {
-        const obj = {};
-        str.split(',').forEach((ps)=>{
-            const pss = ps.split('=');
-            if (pss.length < 2) {
-                throw new TypeError(`params must be in the format name=value`);
-            }
-            const key = pss.shift();
-            if (key !== undefined) {
-                obj[key] = pss.join('=');
-            }
-        });
-        return obj;
-    }
-    function objectKeys(object) {
-        return Object.keys(object);
-    }
-    function objectValues(object) {
-        if (typeof Object.values === 'function') return Object.values(object);
-        return objectKeys(object).map((k)=>object[k]);
-    }
-    function serialize(opts) {
-        const fields = [
-            ''
-        ];
-        if (typeof opts !== 'object' || opts === null) {
-            throw new TypeError('opts must be an object');
-        }
-        // Identifier Validation
-        if (typeof opts.id !== 'string') {
-            throw new TypeError('id must be a string');
-        }
-        if (!idRegex.test(opts.id)) {
-            throw new TypeError(`id must satisfy ${idRegex}`);
-        }
-        fields.push(opts.id);
-        if (typeof opts.version !== 'undefined') {
-            if (typeof opts.version !== 'number' || opts.version < 0 || !Number.isInteger(opts.version)) {
-                throw new TypeError('version must be a positive integer number');
-            }
-            fields.push(`v=${opts.version}`);
-        }
-        // Parameters Validation
-        if (typeof opts.params !== 'undefined') {
-            if (typeof opts.params !== 'object' || opts.params === null) {
-                throw new TypeError('params must be an object');
-            }
-            const pk = objectKeys(opts.params);
-            if (!pk.every((p)=>nameRegex.test(p.toString()))) {
-                throw new TypeError(`params names must satisfy ${nameRegex}`);
-            }
-            // Convert Numbers into Numeric Strings and Buffers into B64 encoded strings.
-            pk.forEach((k)=>{
-                const value = opts.params?.[k];
-                if (typeof value === 'number') {
-                    opts.params[k] = value.toString();
-                } else if (value instanceof Uint8Array) {
-                    opts.params[k] = toBase64(value).split('=')[0];
-                }
-            });
-            const pv = objectValues(opts.params);
-            if (!pv.every((v)=>typeof v === 'string')) {
-                throw new TypeError('params values must be strings');
-            }
-            if (!pv.every((v)=>valueRegex.test(v))) {
-                throw new TypeError(`params values must satisfy ${valueRegex}`);
-            }
-            const strpar = objToKeyVal(opts.params);
-            fields.push(strpar);
-        }
-        if (typeof opts.salt !== 'undefined') {
-            // Salt Validation
-            if (!isBuffer(opts.salt)) {
-                throw new TypeError('salt must be a Buffer');
-            }
-            fields.push(toBase64(opts.salt).split('=')[0]);
-            if (typeof opts.hash !== 'undefined') {
-                // Hash Validation
-                if (!isBuffer(opts.hash)) {
-                    throw new TypeError('hash must be a Buffer');
-                }
-                fields.push(toBase64(opts.hash).split('=')[0]);
-            }
-        }
-        // Create the PHC formatted string
-        const phcstr = fields.join('$');
-        return phcstr;
-    }
-    /**
+import { ArrayBuffers } from '@wener/utils';
+
+((PHC) => {
+	// https://github.com/simonepri/phc-format/blob/master/index.js
+	const idRegex = /^[a-z0-9-]{1,32}$/;
+	const nameRegex = /^[a-z0-9-]{1,32}$/;
+	const valueRegex = /^[a-zA-Z0-9/+.-]+$/;
+	const b64Regex = /^([a-zA-Z0-9/+.-]+|)$/;
+	const decimalRegex = /^((-)?[1-9]\d*|0)$/;
+	const versionRegex = /^v=(\d+)$/;
+	const fromBase64 = ArrayBuffers.fromBase64;
+	const toBase64 = ArrayBuffers.toBase64;
+	const isBuffer = (v) => {
+		return v instanceof Uint8Array;
+	};
+	function objToKeyVal(obj) {
+		return objectKeys(obj)
+			.map((k) => [k, obj[k]].join('='))
+			.join(',');
+	}
+	function keyValtoObj(str) {
+		const obj = {};
+		str.split(',').forEach((ps) => {
+			const pss = ps.split('=');
+			if (pss.length < 2) {
+				throw new TypeError(`params must be in the format name=value`);
+			}
+			const key = pss.shift();
+			if (key !== undefined) {
+				obj[key] = pss.join('=');
+			}
+		});
+		return obj;
+	}
+	function objectKeys(object) {
+		return Object.keys(object);
+	}
+	function objectValues(object) {
+		if (typeof Object.values === 'function') return Object.values(object);
+		return objectKeys(object).map((k) => object[k]);
+	}
+	function serialize(opts) {
+		const fields = [''];
+		if (typeof opts !== 'object' || opts === null) {
+			throw new TypeError('opts must be an object');
+		}
+		// Identifier Validation
+		if (typeof opts.id !== 'string') {
+			throw new TypeError('id must be a string');
+		}
+		if (!idRegex.test(opts.id)) {
+			throw new TypeError(`id must satisfy ${idRegex}`);
+		}
+		fields.push(opts.id);
+		if (typeof opts.version !== 'undefined') {
+			if (typeof opts.version !== 'number' || opts.version < 0 || !Number.isInteger(opts.version)) {
+				throw new TypeError('version must be a positive integer number');
+			}
+			fields.push(`v=${opts.version}`);
+		}
+		// Parameters Validation
+		if (typeof opts.params !== 'undefined') {
+			if (typeof opts.params !== 'object' || opts.params === null) {
+				throw new TypeError('params must be an object');
+			}
+			const pk = objectKeys(opts.params);
+			if (!pk.every((p) => nameRegex.test(p.toString()))) {
+				throw new TypeError(`params names must satisfy ${nameRegex}`);
+			}
+			// Convert Numbers into Numeric Strings and Buffers into B64 encoded strings.
+			pk.forEach((k) => {
+				const value = opts.params?.[k];
+				if (typeof value === 'number') {
+					opts.params[k] = value.toString();
+				} else if (value instanceof Uint8Array) {
+					opts.params[k] = toBase64(value).split('=')[0];
+				}
+			});
+			const pv = objectValues(opts.params);
+			if (!pv.every((v) => typeof v === 'string')) {
+				throw new TypeError('params values must be strings');
+			}
+			if (!pv.every((v) => valueRegex.test(v))) {
+				throw new TypeError(`params values must satisfy ${valueRegex}`);
+			}
+			const strpar = objToKeyVal(opts.params);
+			fields.push(strpar);
+		}
+		if (typeof opts.salt !== 'undefined') {
+			// Salt Validation
+			if (!isBuffer(opts.salt)) {
+				throw new TypeError('salt must be a Buffer');
+			}
+			fields.push(toBase64(opts.salt).split('=')[0]);
+			if (typeof opts.hash !== 'undefined') {
+				// Hash Validation
+				if (!isBuffer(opts.hash)) {
+					throw new TypeError('hash must be a Buffer');
+				}
+				fields.push(toBase64(opts.hash).split('=')[0]);
+			}
+		}
+		// Create the PHC formatted string
+		const phcstr = fields.join('$');
+		return phcstr;
+	}
+	/**
 	 * Generates a PHC string using the data provided.
 	 * @param  {SerializeOptions} opts Object that holds the data needed to generate the PHC string.
 	 * @return {string} The hash string adhering to the PHC format.
 	 */ PHC.serialize = serialize;
-    function deserialize(phcstr) {
-        if (typeof phcstr !== 'string' || phcstr === '') {
-            throw new TypeError('pchstr must be a non-empty string');
-        }
-        if (phcstr[0] !== '$') {
-            throw new TypeError('pchstr must contain a $ as first char');
-        }
-        const fields = phcstr.split('$');
-        // Remove first empty $
-        fields.shift();
-        // Parse Fields
-        let maxf = 5;
-        if (!versionRegex.test(fields[1])) maxf--;
-        if (fields.length > maxf) {
-            throw new TypeError(`pchstr contains too many fileds: ${fields.length}/${maxf}`);
-        }
-        // Parse Identifier
-        const id = fields.shift();
-        if (!id || !idRegex.test(id)) {
-            throw new TypeError(`id must satisfy ${idRegex}`);
-        }
-        let version;
-        // Parse Version
-        if (fields[0] && versionRegex.test(fields[0])) {
-            const versionMatch = fields.shift()?.match(versionRegex);
-            version = versionMatch ? parseInt(versionMatch[1], 10) : undefined;
-        }
-        let hash;
-        let salt;
-        if (fields[fields.length - 1] && b64Regex.test(fields[fields.length - 1])) {
-            if (fields.length > 1 && b64Regex.test(fields[fields.length - 2])) {
-                // Parse Hash
-                const hashStr = fields.pop();
-                if (hashStr) hash = fromBase64(hashStr);
-                // Parse Salt
-                const saltStr = fields.pop();
-                if (saltStr !== undefined) salt = fromBase64(saltStr);
-            } else {
-                // Parse Salt
-                const saltStr = fields.pop();
-                if (saltStr !== undefined) salt = fromBase64(saltStr);
-            }
-        }
-        // Parse Parameters
-        let params;
-        if (fields.length > 0) {
-            const parstr = fields.pop();
-            if (parstr) {
-                params = keyValtoObj(parstr);
-                if (!Object.keys(params).every((p)=>nameRegex.test(p))) {
-                    throw new TypeError(`params names must satisfy ${nameRegex}}`);
-                }
-                const pv = Object.values(params);
-                if (!pv.every((v)=>valueRegex.test(String(v)))) {
-                    throw new TypeError(`params values must satisfy ${valueRegex}`);
-                }
-                // Convert Decimal Strings into Numbers
-                Object.keys(params).forEach((k)=>{
-                    const value = params?.[k];
-                    if (typeof value === 'string' && decimalRegex.test(value)) {
-                        params[k] = parseInt(value, 10);
-                    }
-                });
-            }
-        }
-        if (fields.length > 0) {
-            throw new TypeError(`pchstr contains unrecognized fileds: ${fields}`);
-        }
-        // Build the output object
-        const phcobj = {
-            id
-        };
-        if (version !== undefined) phcobj.version = version;
-        if (params) phcobj.params = params;
-        if (salt) phcobj.salt = salt;
-        if (hash) phcobj.hash = hash;
-        return phcobj;
-    }
-    /**
+	function deserialize(phcstr) {
+		if (typeof phcstr !== 'string' || phcstr === '') {
+			throw new TypeError('pchstr must be a non-empty string');
+		}
+		if (phcstr[0] !== '$') {
+			throw new TypeError('pchstr must contain a $ as first char');
+		}
+		const fields = phcstr.split('$');
+		// Remove first empty $
+		fields.shift();
+		// Parse Fields
+		let maxf = 5;
+		if (!versionRegex.test(fields[1])) maxf--;
+		if (fields.length > maxf) {
+			throw new TypeError(`pchstr contains too many fileds: ${fields.length}/${maxf}`);
+		}
+		// Parse Identifier
+		const id = fields.shift();
+		if (!id || !idRegex.test(id)) {
+			throw new TypeError(`id must satisfy ${idRegex}`);
+		}
+		let version;
+		// Parse Version
+		if (fields[0] && versionRegex.test(fields[0])) {
+			const versionMatch = fields.shift()?.match(versionRegex);
+			version = versionMatch ? parseInt(versionMatch[1], 10) : undefined;
+		}
+		let hash;
+		let salt;
+		if (fields[fields.length - 1] && b64Regex.test(fields[fields.length - 1])) {
+			if (fields.length > 1 && b64Regex.test(fields[fields.length - 2])) {
+				// Parse Hash
+				const hashStr = fields.pop();
+				if (hashStr) hash = fromBase64(hashStr);
+				// Parse Salt
+				const saltStr = fields.pop();
+				if (saltStr !== undefined) salt = fromBase64(saltStr);
+			} else {
+				// Parse Salt
+				const saltStr = fields.pop();
+				if (saltStr !== undefined) salt = fromBase64(saltStr);
+			}
+		}
+		// Parse Parameters
+		let params;
+		if (fields.length > 0) {
+			const parstr = fields.pop();
+			if (parstr) {
+				params = keyValtoObj(parstr);
+				if (!Object.keys(params).every((p) => nameRegex.test(p))) {
+					throw new TypeError(`params names must satisfy ${nameRegex}}`);
+				}
+				const pv = Object.values(params);
+				if (!pv.every((v) => valueRegex.test(String(v)))) {
+					throw new TypeError(`params values must satisfy ${valueRegex}`);
+				}
+				// Convert Decimal Strings into Numbers
+				Object.keys(params).forEach((k) => {
+					const value = params?.[k];
+					if (typeof value === 'string' && decimalRegex.test(value)) {
+						params[k] = parseInt(value, 10);
+					}
+				});
+			}
+		}
+		if (fields.length > 0) {
+			throw new TypeError(`pchstr contains unrecognized fileds: ${fields}`);
+		}
+		// Build the output object
+		const phcobj = {
+			id,
+		};
+		if (version !== undefined) phcobj.version = version;
+		if (params) phcobj.params = params;
+		if (salt) phcobj.salt = salt;
+		if (hash) phcobj.hash = hash;
+		return phcobj;
+	}
+	/**
 	 * Parses data from a PHC string.
 	 * @param  {string} phcstr A PHC string to parse.
 	 * @return {DeserializeResult} The object containing the data parsed from the PHC string.
@@ -197,4 +195,4 @@ import { ArrayBuffers } from "@wener/utils";
 })(PHC || (PHC = {}));
 export var PHC;
 
-//# sourceMappingURL=PHC.js.map
+//# sourceMappingURL=PHC.js.map