@arkstack/common 0.19.2 → 0.19.3

package/dist/app.d.ts

@@ -1,12 +1,12 @@
 import type { GlobalConfig, GlobalEnv } from '.'
 
 interface Stubs {
-  api: string;
-  model: string;
-  resource: string;
-  controller: string;
-  collection: string;
-  apiResource: string;
+  api: string
+  model: string
+  resource: string
+  controller: string
+  collection: string
+  apiResource: string
 }
 
 declare global {
@@ -15,71 +15,60 @@ declare global {
 
   /**
    * Thows to abort the current request
-   * 
-   * @param message 
-   * @param code 
+   *
+   * @param message
+   * @param code
    * @throws {RequestException}
    */
-  function abort (
-    message?: string,
-    code?: number
-  ): void
+  function abort(message?: string, code?: number): void
 
   /**
-   * Asserts that a boolean condition is true. 
-   * 
-   * @param boolean 
-   * @param message 
-   * @param code 
+   * Asserts that a boolean condition is true.
+   *
+   * @param boolean
+   * @param message
+   * @param code
    * @throws {RequestException} Throws if the boolean condition is true.
    */
-  function abortIf<T> (
-    boolean: T,
-    message?: string,
-    code?: number,
-  ): asserts  boolean is T
+  function abortIf<T>(boolean: T, message?: string, code?: number): asserts boolean is T
 
   /**
-   * Asserts that a value is not null or undefined. 
-   * 
-   * @param value 
-   * @param message 
-   * @param code 
+   * Asserts that a value is not null or undefined.
+   *
+   * @param value
+   * @param message
+   * @param code
    * @throws {RequestException} Throws if the value is null or undefined.
    */
-  function assertFound<T> (
-    value: T | null | undefined,
-    message: string,
-    code: number = 404,
-  ): asserts value is T
+  function assertFound<T>(value: T | null | undefined, message: string, code: number = 404): asserts value is T
 
   interface String {
     /**
      * Converts the string to title case.
      */
-    titleCase (): string;
+    titleCase(): string
     /**
      * Converts the string to camel case.
      */
-    camelCase (): string;
+    camelCase(): string
     /**
      * Converts the string to pascal case.
      */
-    pascalCase (): string;
+    pascalCase(): string
     /**
      * Truncates the string to a specified length while preserving words
      * and adds a suffix if necessary.
-     * 
+     *
      * @param len Length of the string
      * @param suffix Suffix to add to the string
      */
-    truncate (len: number, suffix?: string): string;
+    truncate(len: number, suffix?: string): string
   }
 }
 
 declare module 'resora' {
   interface Config {
-    stubs: Stubs;
+    stubs: Stubs
   }
 
   interface ResoraConfig {
@@ -87,4 +76,4 @@ declare module 'resora' {
   }
 }
 
-export { }
+export {}

package/dist/{dist-DwGScrDq.js → dist-kNVDZ1C_.js}

@@ -3085,7 +3085,7 @@ function mergeDeep(target, source) {
 });
 import_dayjs_min.default.extend(import_customParseFormat.default);
 //#endregion
-//#region ../http/dist/redirect-g4KUj_g-.js
+//#region ../http/dist/redirect-D4Oybkdd.js
 const unwrapRequestSource = (source) => {
 	if (source.original) return unwrapRequestSource(source.original);
 	if (source.headers) return source;
@@ -3139,7 +3139,7 @@ const setFallbackRequest = (request) => {
 };
 /**
 * Represents an HTTP request, providing a consistent interface for accessing request data.
-* 
+*
 * @author 3m1n3nc3
 */
 var Request$1 = class Request$1 extends Request {
@@ -3280,7 +3280,7 @@ const setFallbackResponse = (response) => {
 };
 /**
 * Represents an HTTP response, providing a consistent interface for accessing response data.
-* 
+*
 * @author 3m1n3nc3
 */
 var Response$1 = class Response$1 extends Response {

package/dist/faker.js

@@ -1,4 +1,4 @@
-import { g as configLoader } from "./system-BH1phDBR.js";
+import { g as configLoader } from "./system-DzAzwH__.js";
 import * as fakerLocales from "@faker-js/faker";
 import { Faker } from "@faker-js/faker";
 import { pictwoImage } from "@pictwo/faker";

package/dist/{helpers-O3ZUac1k.d.ts → helpers-DpnBcrO9.d.ts}

@@ -184,9 +184,9 @@ interface EnvRegistry {
   APP_DEBUG: boolean;
   APP_SECURE: boolean;
   APP_TIMEZONE: string;
-  APP_LOCALE: typeof locales[number];
-  APP_FALLBACK_LOCALE: typeof locales[number];
-  APP_FAKER_LOCALE: typeof locales[number];
+  APP_LOCALE: (typeof locales)[number];
+  APP_FALLBACK_LOCALE: (typeof locales)[number];
+  APP_FAKER_LOCALE: (typeof locales)[number];
   NODE_ENV: 'development' | 'production' | 'test';
   PORT: number;
   HOST: string;
@@ -247,9 +247,9 @@ interface AppConfig {
   frontend_url: string;
   debug: boolean;
   timezone: string;
-  locale: typeof locales[number];
-  fallback_locale: typeof locales[number];
-  faker_locale: typeof locales[number];
+  locale: (typeof locales)[number];
+  fallback_locale: (typeof locales)[number];
+  faker_locale: (typeof locales)[number];
 }
 /**
  * Known environment variable names.
@@ -299,7 +299,7 @@ interface LoggerLog {
  */
 type EnvReturn<X, K extends string, D> = [X] extends [never] ? [D] extends [undefined] ? EnvLookup<K> : EnvLookup<K> | D : [D] extends [undefined] ? X : X | D;
 interface GlobalEnv {
-  <X = never, D = undefined, K extends (keyof EnvRegistry | (string & {})) = keyof EnvRegistry>(env: K, defaultValue?: D): EnvReturn<X, K, D>;
+  <X = never, D = undefined, K extends keyof EnvRegistry | (string & {}) = keyof EnvRegistry>(env: K, defaultValue?: D): EnvReturn<X, K, D>;
 }
 type ConfigShape = keyof ConfigRegistry extends never ? Record<string, any> : ConfigRegistry;
 interface GlobalConfig {
@@ -311,9 +311,9 @@ interface GlobalConfig {
 interface FileImporter {
   <T = unknown>(filePath: string): Promise<T>;
   <T = unknown>(filePath: string, userOptions?: JitiOptions | undefined): Promise<T>;
-  <T = unknown>(filePath: string, userOptions?: JitiOptions | undefined, resolveOptions?: (JitiResolveOptions & {
+  <T = unknown>(filePath: string, userOptions?: JitiOptions | undefined, resolveOptions?: JitiResolveOptions & {
     default?: true;
-  })): Promise<T>;
+  }): Promise<T>;
 }
 type ArkstackErrorShape = Error & {
   cause?: unknown;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="./app.d.ts" />
-import { $ as HookPos, A as SealedBox, B as ConfigShape, C as Encryption, D as KeyPair, E as KeyInput, F as ArkstackErrorShape, G as EnvRegistry, H as DotPathValue, I as Choice, J as GlobalConfig, K as EnvReturn, L as Choices, M as SerializedKeyPair, N as AppConfig, O as Keys, P as ArkstackErrorPayload, Q as HookName, R as Concrete, S as DerivedKey, T as FingerprintOptions, U as EnvKey, V as DotPath, W as EnvLookup, X as HookArgs, Y as GlobalEnv, Z as HookFor, _ as ChannelOptions, a as abort, at as LoggerParseSignature, b as Codec, c as getModel, ct as Primitive, d as isClass, dt as PublishFilter, et as HookPositions, f as normalizePositiveInteger, ft as PublishGroup, g as Hash, h as setModelResolver, i as ModelResolver, it as LoggerLog, j as SecureChannel, k as NodeCipher, l as getModelSync, lt as PublishConfirmation, m as resolvePagination, mt as Logger, n as ModelConstructor, nt as IHook, o as abortIf, ot as MergedConfig, p as perPage, pt as UnionToIntersection, q as FileImporter, r as ModelRegistry, rt as LoggerChalk, s as assertFound, st as PaginationOptions, t as AbstractModelConstructor, tt as HookRegistry, u as initializeGlobalContext, ut as PublishEntry, v as Cipher, w as EncryptionKey, x as DeriveOptions, y as CipherOptions, z as ConfigRegistry } from "./helpers-O3ZUac1k.js";
+import { $ as HookPos, A as SealedBox, B as ConfigShape, C as Encryption, D as KeyPair, E as KeyInput, F as ArkstackErrorShape, G as EnvRegistry, H as DotPathValue, I as Choice, J as GlobalConfig, K as EnvReturn, L as Choices, M as SerializedKeyPair, N as AppConfig, O as Keys, P as ArkstackErrorPayload, Q as HookName, R as Concrete, S as DerivedKey, T as FingerprintOptions, U as EnvKey, V as DotPath, W as EnvLookup, X as HookArgs, Y as GlobalEnv, Z as HookFor, _ as ChannelOptions, a as abort, at as LoggerParseSignature, b as Codec, c as getModel, ct as Primitive, d as isClass, dt as PublishFilter, et as HookPositions, f as normalizePositiveInteger, ft as PublishGroup, g as Hash, h as setModelResolver, i as ModelResolver, it as LoggerLog, j as SecureChannel, k as NodeCipher, l as getModelSync, lt as PublishConfirmation, m as resolvePagination, mt as Logger, n as ModelConstructor, nt as IHook, o as abortIf, ot as MergedConfig, p as perPage, pt as UnionToIntersection, q as FileImporter, r as ModelRegistry, rt as LoggerChalk, s as assertFound, st as PaginationOptions, t as AbstractModelConstructor, tt as HookRegistry, u as initializeGlobalContext, ut as PublishEntry, v as Cipher, w as EncryptionKey, x as DeriveOptions, y as CipherOptions, z as ConfigRegistry } from "./helpers-DpnBcrO9.js";
 import { Arkstack } from "@arkstack/contract";
 import { ForkOptions } from "node:child_process";
 import pino from "pino";

package/dist/index.js

@@ -1,5 +1,5 @@
-import { _ as EnvLoader, a as env, c as nodeEnv, d as resolveRuntimeDir, f as resolveRuntimeModule, g as configLoader, h as ConfigLoader, i as discoverCommands, l as outputDir, m as CONFIG_KEY, n as appUrl, o as importFile, p as toOutputPath, r as config, s as interopDefault, t as appKey, u as rebuildOutput, v as envLoader } from "./system-BH1phDBR.js";
-import { A as SecureChannel, C as Codec, D as Keys, E as KeyPair, O as NodeCipher, S as Cipher, T as EncryptionKey, _ as setModelResolver, b as Exception, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, k as SealedBox, l as assertFound, m as normalizePositiveInteger, p as isClass, s as abort, u as getModel, v as RequestException, w as Encryption, x as Hash, y as AppException } from "./utils-CvlK2sYM.js";
+import { _ as EnvLoader, a as env, c as nodeEnv, d as resolveRuntimeDir, f as resolveRuntimeModule, g as configLoader, h as ConfigLoader, i as discoverCommands, l as outputDir, m as CONFIG_KEY, n as appUrl, o as importFile, p as toOutputPath, r as config, s as interopDefault, t as appKey, u as rebuildOutput, v as envLoader } from "./system-DzAzwH__.js";
+import { A as SecureChannel, C as Codec, D as Keys, E as KeyPair, O as NodeCipher, S as Cipher, T as EncryptionKey, _ as setModelResolver, b as Exception, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, k as SealedBox, l as assertFound, m as normalizePositiveInteger, p as isClass, s as abort, u as getModel, v as RequestException, w as Encryption, x as Hash, y as AppException } from "./utils-DwfM0lt4.js";
 import { Hook as Hook$1 } from "@arkstack/foundry";
 import { Arkstack } from "@arkstack/contract";
 import { str } from "@h3ravel/support";
@@ -27,13 +27,13 @@ const bindGracefulShutdown = (shutdown, defer) => {
 //#endregion
 //#region src/network.ts
 /**
-* Boots the app using an available port close to the requested port 
+* Boots the app using an available port close to the requested port
 *when requested port is not available
-* 
-* @param boot 
-* @param preferredPort 
-* @param app 
-* @param defer 
+*
+* @param boot
+* @param preferredPort
+* @param app
+* @param defer
 */
 const bootWithDetectedPort = async (boot, preferredPort = 3e3, app, defer) => {
 	const port = await detect(preferredPort);
@@ -227,14 +227,14 @@ const CONFIRMATION_REGISTRY_KEY = Symbol.for("arkstack.confirmables");
 * shared instance even across duplicated module copies.
 */
 var Publisher = class {
-	/** 
-	* The shared, global-symbol-backed registry of publishable groups confirmations. 
+	/**
+	* The shared, global-symbol-backed registry of publishable groups confirmations.
 	*/
 	static get confirmations() {
 		return globalThis[CONFIRMATION_REGISTRY_KEY] ??= [];
 	}
-	/** 
-	* The shared, global-symbol-backed registry of publishable groups. 
+	/**
+	* The shared, global-symbol-backed registry of publishable groups.
 	*/
 	static get registry() {
 		return globalThis[REGISTRY_KEY] ??= [];
@@ -274,10 +274,10 @@ var Publisher = class {
 		this.registry.length = 0;
 		this.confirmations.length = 0;
 	}
-	/** 
-	* Ask to confirm what tag needs to be published. 
-	* 
-	* @param confirmation 
+	/**
+	* Ask to confirm what tag needs to be published.
+	*
+	* @param confirmation
 	*/
 	static confirm(confirmation) {
 		this.confirmations.push(...Array.isArray(confirmation) ? confirmation : [confirmation]);
@@ -372,12 +372,12 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs the message in two columns but allways passing status
-	* 
-	* @param name 
-	* @param value 
-	* @param status 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param name
+	* @param value
+	* @param status
+	* @param exit
+	* @param preserveCol
 	*/
 	static split(name, value, status, exit = false, preserveCol = false, spacer = ".") {
 		status ??= "info";
@@ -392,11 +392,11 @@ var Logger = class Logger {
 	}
 	/**
 	* Wraps text with chalk
-	* 
-	* @param txt 
-	* @param color 
-	* @param preserveCol 
-	* @returns 
+	*
+	* @param txt
+	* @param color
+	* @param preserveCol
+	* @returns
 	*/
 	static textFormat(txt, color, preserveCol = false) {
 		if (txt instanceof Error) {
@@ -418,10 +418,10 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs a success message
-	* 
-	* @param msg 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param msg
+	* @param exit
+	* @param preserveCol
 	*/
 	static success(msg, exit = false, preserveCol = false) {
 		if (!this.shouldSuppressOutput("success")) console.log(chalk.green("✓"), this.textFormat(msg, chalk.bgGreen, preserveCol));
@@ -429,10 +429,10 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs an informational message
-	* 
-	* @param msg 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param msg
+	* @param exit
+	* @param preserveCol
 	*/
 	static info(msg, exit = false, preserveCol = false) {
 		if (!this.shouldSuppressOutput("info")) console.log(chalk.blue("ℹ"), this.textFormat(msg, chalk.bgBlue, preserveCol));
@@ -440,10 +440,10 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs an error message
-	* 
-	* @param msg 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param msg
+	* @param exit
+	* @param preserveCol
 	*/
 	static error(msg, exit = true, preserveCol = false) {
 		if (!this.shouldSuppressOutput("error")) if (msg instanceof Error) {
@@ -454,10 +454,10 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs a warning message
-	* 
-	* @param msg 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param msg
+	* @param exit
+	* @param preserveCol
 	*/
 	static warn(msg, exit = false, preserveCol = false) {
 		if (!this.shouldSuppressOutput("warn")) console.warn(chalk.yellow("⚠"), this.textFormat(msg, chalk.bgYellow, preserveCol));
@@ -465,10 +465,10 @@ var Logger = class Logger {
 	}
 	/**
 	* Logs a debug message (only shown with verbosity >= 3)
-	* 
-	* @param msg 
-	* @param exit 
-	* @param preserveCol 
+	*
+	* @param msg
+	* @param exit
+	* @param preserveCol
 	*/
 	static debug(msg, exit = false, preserveCol = false) {
 		if (!this.shouldSuppressOutput("debug")) if (Array.isArray(msg)) for (let i = 0; i < msg.length; i++) console.log(chalk.gray("🐛"), chalk.bgGray(i + 1), this.textFormat(msg[i], chalk.bgGray, preserveCol));
@@ -499,8 +499,8 @@ var Logger = class Logger {
 	}
 	/**
 	* Ouput formater object or format the output
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static log = ((config, joiner, log = true, sc) => {
 		if (typeof config === "string") {
@@ -512,8 +512,8 @@ var Logger = class Logger {
 	});
 	/**
 	* A simple console like output logger
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	static console() {
 		return Console;
@@ -525,9 +525,9 @@ var Hook = class {
 	static hooks = /* @__PURE__ */ new Map();
 	/**
 	* Hooks define code that should run within defined boundaries to add extra functionalities.
-	* 
-	* @param name 
-	* @param value 
+	*
+	* @param name
+	* @param value
 	*/
 	static set(name, hook) {
 		const oldhook = this.hooks.get(name) ?? {};
@@ -538,8 +538,8 @@ var Hook = class {
 	}
 	/**
 	* Check if a hook is defined by name
-	* 
-	* @param name 
+	*
+	* @param name
 	*/
 	static has(name, pos) {
 		if (pos && this.hooks.has(name)) return Boolean(this.get(name, pos));
@@ -556,8 +556,8 @@ var Hook = class {
 	}
 	/**
 	* Retrieve all defined hooks
-	* 
-	* @param name 
+	*
+	* @param name
 	*/
 	static getAll = () => {
 		const hooks = {};
@@ -566,8 +566,8 @@ var Hook = class {
 	};
 	/**
 	* Remove the defined hook
-	* 
-	* @param name 
+	*
+	* @param name
 	*/
 	static unset(name, pos) {
 		if (name && this.hooks.has(name)) {

package/dist/{system-BH1phDBR.js → system-DzAzwH__.js}

@@ -25,8 +25,8 @@ var EnvLoader = class {
 	loaded = false;
 	/**
 	* Load the `.env` file once.
-	* 
-	* @returns 
+	*
+	* @returns
 	*/
 	ensureLoaded() {
 		if (this.loaded) return;
@@ -89,7 +89,7 @@ var EnvLoader = class {
 		return Number.isFinite(parsed) && String(parsed) === value;
 	}
 };
-/** 
+/**
 * Shared environment loader backing {@link env}.
 */
 const envLoader = new EnvLoader();
@@ -105,7 +105,7 @@ globalThis[CONFIG_KEY] = {};
 * merged in at runtime.
 */
 var ConfigLoader = class {
-	/** 
+	/**
 	* The cached config store, shared across instances via a global symbol.
 	*/
 	get store() {
@@ -114,7 +114,7 @@ var ConfigLoader = class {
 	set store(value) {
 		globalThis[CONFIG_KEY] = value;
 	}
-	/** 
+	/**
 	* Read and cache config modules from the config directory on first use.
 	*/
 	load() {
@@ -181,7 +181,7 @@ var ConfigLoader = class {
 		return this.store;
 	}
 };
-/** 
+/**
 * Shared config loader backing {@link config}.
 */
 const configLoader = new ConfigLoader();
@@ -289,21 +289,21 @@ const OUTPUT_EXTENSIONS = [
 	".cjs",
 	".ts"
 ];
-/** 
-* Strip a trailing known source/compiled extension from a path. 
-* 
-* @param value 
-* @returns 
+/**
+* Strip a trailing known source/compiled extension from a path.
+*
+* @param value
+* @returns
 */
 const stripKnownExtension = (value) => value.replace(/\.(ts|tsx|mts|cts|js|mjs|cjs)$/i, "");
 /**
 * Build the list of concrete file candidates for a base path. Any existing
 * source/compiled extension is dropped first so the correct runtime extension
 * can be tried (e.g. a `.ts` source maps to a `.js` candidate under `dist`).
-* 
-* @param base 
-* @param extensions 
-* @returns 
+*
+* @param base
+* @param extensions
+* @returns
 */
 const moduleCandidates = (base, extensions) => {
 	const bare = stripKnownExtension(base);
@@ -406,11 +406,11 @@ const rebuildOutput = async () => {
 	});
 };
 /**
-* 
+*
 * Dynamically imports a file at the given path with full TypeScript support,
-* including `tsconfig.json` path aliases. 
+* including `tsconfig.json` path aliases.
 *
-* @param filePath - The path to the file to import. 
+* @param filePath - The path to the file to import.
 * @returns The imported module typed as `T`.
 *
 * @example

package/dist/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { A as SealedBox, C as Encryption, D as KeyPair, E as KeyInput, M as SerializedKeyPair, O as Keys, S as DerivedKey, T as FingerprintOptions, _ as ChannelOptions, a as abort, b as Codec, c as getModel, d as isClass, f as normalizePositiveInteger, g as Hash, h as setModelResolver, i as ModelResolver, j as SecureChannel, k as NodeCipher, l as getModelSync, m as resolvePagination, n as ModelConstructor, o as abortIf, p as perPage, r as ModelRegistry, s as assertFound, t as AbstractModelConstructor, u as initializeGlobalContext, v as Cipher, w as EncryptionKey, x as DeriveOptions, y as CipherOptions } from "../helpers-O3ZUac1k.js";
+import { A as SealedBox, C as Encryption, D as KeyPair, E as KeyInput, M as SerializedKeyPair, O as Keys, S as DerivedKey, T as FingerprintOptions, _ as ChannelOptions, a as abort, b as Codec, c as getModel, d as isClass, f as normalizePositiveInteger, g as Hash, h as setModelResolver, i as ModelResolver, j as SecureChannel, k as NodeCipher, l as getModelSync, m as resolvePagination, n as ModelConstructor, o as abortIf, p as perPage, r as ModelRegistry, s as assertFound, t as AbstractModelConstructor, u as initializeGlobalContext, v as Cipher, w as EncryptionKey, x as DeriveOptions, y as CipherOptions } from "../helpers-DpnBcrO9.js";
 import { Model } from "arkormx";
 //#region src/utils/traits.d.ts
 declare const crc32: (str: string) => number;
@@ -38,7 +38,7 @@ type Explode<T = any> = { [P in keyof T]: T[P]; };
 /**
  * utility type: convert two arrays of types into an array of union types
  */
-type MixParams<T1 extends any[], T2 extends any[]> = T1 extends [] ? (T2 extends [] ? [] : T2) : (T2 extends [] ? T1 : (T1 extends [infer H1, ...infer R1] ? (T2 extends [infer H2, ...infer R2] ? [H1 & H2, ...MixParams<R1, R2>] : []) : []));
+type MixParams<T1 extends any[], T2 extends any[]> = T1 extends [] ? T2 extends [] ? [] : T2 : T2 extends [] ? T1 : T1 extends [infer H1, ...infer R1] ? T2 extends [infer H2, ...infer R2] ? [H1 & H2, ...MixParams<R1, R2>] : [] : [];
 /**
  * API: trait type
  */
@@ -74,7 +74,7 @@ type ExtractSuperTrait<T extends Trait> = T extends Trait<TraitDefTypeT, infer S
 /**
  * utility type: derive type constructor: merge two constructors
  */
-type DeriveTraitsConsConsMerge<A extends Cons, B extends Cons> = A extends (new (...args: infer ArgsA) => infer RetA) ? (B extends (new (...args: infer ArgsB) => infer RetB) ? (new (...args: MixParams<ArgsA, ArgsB>) => RetA & RetB) : never) : never;
+type DeriveTraitsConsConsMerge<A extends Cons, B extends Cons> = A extends (new (...args: infer ArgsA) => infer RetA) ? B extends (new (...args: infer ArgsB) => infer RetB) ? new (...args: MixParams<ArgsA, ArgsB>) => RetA & RetB : never : never;
 /**
  * utility type: derive type constructor: extract plain constructor
  */
@@ -83,7 +83,7 @@ type DeriveTraitsConsDirectBase<T extends DirectBase> = T extends Model ? new (.
 /**
  * utility type: derive type constructor: from trait parts
  */
-type DeriveTraitsConsTraitParts<C extends Cons, ST extends ((Trait | TypeFactory<Trait>)[] | undefined)> = ST extends undefined ? DeriveTraitsConsCons<C> : ST extends [] ? DeriveTraitsConsCons<C> : DeriveTraitsConsConsMerge<DeriveTraitsConsCons<C>, DeriveTraitsConsAll<ST>>;
+type DeriveTraitsConsTraitParts<C extends Cons, ST extends (Trait | TypeFactory<Trait>)[] | undefined> = ST extends undefined ? DeriveTraitsConsCons<C> : ST extends [] ? DeriveTraitsConsCons<C> : DeriveTraitsConsConsMerge<DeriveTraitsConsCons<C>, DeriveTraitsConsAll<ST>>;
 /**
  * utility type: derive type constructor: from single trait
  */
@@ -91,15 +91,15 @@ type DeriveTraitsConsTrait<T extends Trait> = DeriveTraitsConsTraitParts<Extract
 /**
  * utility type: derive type constructor: from single trait or trait factory
  */
-type DeriveTraitsConsOne<T extends (Trait | TypeFactory<Trait>)> = T extends Trait ? DeriveTraitsConsTrait<T> : T extends TypeFactory<Trait> ? DeriveTraitsConsTrait<ReturnType<T>> : never;
+type DeriveTraitsConsOne<T extends Trait | TypeFactory<Trait>> = T extends Trait ? DeriveTraitsConsTrait<T> : T extends TypeFactory<Trait> ? DeriveTraitsConsTrait<ReturnType<T>> : never;
 /**
  * utility type: derive type constructor: from one or more traits or trait factories
  */
-type DeriveTraitsConsAll<T extends (((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]) | undefined)> = T extends [infer Only extends DirectBase] ? DeriveTraitsConsDirectBase<Only> : T extends [...infer Others extends (Trait | TypeFactory<Trait>)[], infer Last extends DirectBase] ? (Others extends [] ? DeriveTraitsConsDirectBase<Last> : DeriveTraitsConsConsMerge<DeriveTraitsConsAll<Others>, /* RECURSION */ DeriveTraitsConsDirectBase<Last>>) : T extends (Trait | TypeFactory<Trait>)[] ? (T extends [infer First extends (Trait | TypeFactory<Trait>)] ? (DeriveTraitsConsOne<First>) : (T extends [infer First extends (Trait | TypeFactory<Trait>), ...infer Rest extends (Trait | TypeFactory<Trait>)[]] ? (DeriveTraitsConsConsMerge<DeriveTraitsConsOne<First>, DeriveTraitsConsAll<Rest>>) : never)) : never;
+type DeriveTraitsConsAll<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]) | undefined> = T extends [infer Only extends DirectBase] ? DeriveTraitsConsDirectBase<Only> : T extends [...infer Others extends (Trait | TypeFactory<Trait>)[], infer Last extends DirectBase] ? Others extends [] ? DeriveTraitsConsDirectBase<Last> : DeriveTraitsConsConsMerge<DeriveTraitsConsAll<Others>, DeriveTraitsConsDirectBase<Last>> : T extends (Trait | TypeFactory<Trait>)[] ? T extends [infer First extends Trait | TypeFactory<Trait>] ? DeriveTraitsConsOne<First> : T extends [infer First extends Trait | TypeFactory<Trait>, ...infer Rest extends (Trait | TypeFactory<Trait>)[]] ? DeriveTraitsConsConsMerge<DeriveTraitsConsOne<First>, DeriveTraitsConsAll<Rest>> : never : never;
 /**
  * utility type: derive type constructor
  */
-type DeriveTraitsCons<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase])> = DeriveTraitsConsAll<T>;
+type DeriveTraitsCons<T extends (Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]> = DeriveTraitsConsAll<T>;
 /**
  * utility type: derive type statics: merge two objects with statics
  */
@@ -112,7 +112,7 @@ type DeriveTraitsStatsDirectBase<T extends DirectBase> = T extends Model ? objec
 /**
  * utility type: derive type statics: from trait parts
  */
-type DeriveTraitsStatsTraitParts<C extends Cons, ST extends ((Trait | TypeFactory<Trait>)[] | undefined)> = ST extends undefined ? DeriveTraitsStatsCons<C> : ST extends [] ? DeriveTraitsStatsCons<C> : DeriveTraitsStatsConsMerge<DeriveTraitsStatsCons<C>, DeriveTraitsStatsAll<ST>>;
+type DeriveTraitsStatsTraitParts<C extends Cons, ST extends (Trait | TypeFactory<Trait>)[] | undefined> = ST extends undefined ? DeriveTraitsStatsCons<C> : ST extends [] ? DeriveTraitsStatsCons<C> : DeriveTraitsStatsConsMerge<DeriveTraitsStatsCons<C>, DeriveTraitsStatsAll<ST>>;
 /**
  * utility type: derive type statics: from single trait
  */
@@ -120,24 +120,24 @@ type DeriveTraitsStatsTrait<T extends Trait> = DeriveTraitsStatsTraitParts<Extra
 /**
  * utility type: derive type statics: from single trait or trait factory
  */
-type DeriveTraitsStatsOne<T extends (Trait | TypeFactory<Trait>)> = T extends Trait ? DeriveTraitsStatsTrait<T> : T extends TypeFactory<Trait> ? DeriveTraitsStatsTrait<ReturnType<T>> : never;
+type DeriveTraitsStatsOne<T extends Trait | TypeFactory<Trait>> = T extends Trait ? DeriveTraitsStatsTrait<T> : T extends TypeFactory<Trait> ? DeriveTraitsStatsTrait<ReturnType<T>> : never;
 /**
  * utility type: derive type statics: from one or more traits or trait factories
  */
-type DeriveTraitsStatsAll<T extends (((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]) | undefined)> = T extends [infer Only extends DirectBase] ? DeriveTraitsStatsDirectBase<Only> : T extends [...infer Others extends (Trait | TypeFactory<Trait>)[], infer Last extends DirectBase] ? (Others extends [] ? DeriveTraitsStatsDirectBase<Last> : DeriveTraitsStatsConsMerge<DeriveTraitsStatsAll<Others>, /* RECURSION */ DeriveTraitsStatsDirectBase<Last>>) : T extends (Trait | TypeFactory<Trait>)[] ? (T extends [infer First extends (Trait | TypeFactory<Trait>)] ? (DeriveTraitsStatsOne<First>) : (T extends [infer First extends (Trait | TypeFactory<Trait>), ...infer Rest extends (Trait | TypeFactory<Trait>)[]] ? (DeriveTraitsStatsConsMerge<DeriveTraitsStatsOne<First>, DeriveTraitsStatsAll<Rest>>) : never)) : never;
+type DeriveTraitsStatsAll<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]) | undefined> = T extends [infer Only extends DirectBase] ? DeriveTraitsStatsDirectBase<Only> : T extends [...infer Others extends (Trait | TypeFactory<Trait>)[], infer Last extends DirectBase] ? Others extends [] ? DeriveTraitsStatsDirectBase<Last> : DeriveTraitsStatsConsMerge<DeriveTraitsStatsAll<Others>, DeriveTraitsStatsDirectBase<Last>> : T extends (Trait | TypeFactory<Trait>)[] ? T extends [infer First extends Trait | TypeFactory<Trait>] ? DeriveTraitsStatsOne<First> : T extends [infer First extends Trait | TypeFactory<Trait>, ...infer Rest extends (Trait | TypeFactory<Trait>)[]] ? DeriveTraitsStatsConsMerge<DeriveTraitsStatsOne<First>, DeriveTraitsStatsAll<Rest>> : never : never;
 /**
  * utility type: derive type statics
  */
-type DeriveTraitsStats<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase])> = DeriveTraitsStatsAll<T>;
+type DeriveTraitsStats<T extends (Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]> = DeriveTraitsStatsAll<T>;
 /**
  * utility type: derive type from one or more traits or trait type factories
  */
-type DeriveTraits<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase])> = DeriveTraitsCons<T> & DeriveTraitsStats<T>;
+type DeriveTraits<T extends (Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]> = DeriveTraitsCons<T> & DeriveTraitsStats<T>;
 type TraitMethodHelpers = {
   getTraitMethods: <T extends TraitMethod = TraitMethod>(name: PropertyKey) => T[];
   callTraitMethods: <T = any>(name: PropertyKey, ...args: any[]) => T[];
 };
-type DeriveTraitsWithMethodHelpers<T extends ((Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase])> = DeriveTraits<T> extends (new (...args: infer Args) => infer Instance) ? (new (...args: Args) => Instance & TraitMethodHelpers) & Omit<DeriveTraits<T>, 'prototype'> & TraitMethodHelpers : never;
+type DeriveTraitsWithMethodHelpers<T extends (Trait | TypeFactory<Trait>)[] | [...(Trait | TypeFactory<Trait>)[], DirectBase]> = DeriveTraits<T> extends (new (...args: infer Args) => infer Instance) ? (new (...args: Args) => Instance & TraitMethodHelpers) & Omit<DeriveTraits<T>, 'prototype'> & TraitMethodHelpers : never;
 type TraitMethod = (...args: any[]) => any;
 /**
  * Return every trait implementation for a method, bound to the supplied
@@ -158,7 +158,7 @@ declare const getTraitMethods: <T extends TraitMethod = TraitMethod>(target: obj
  * @returns
  */
 declare const callTraitMethods: <T = any>(target: object | Cons, name: PropertyKey, ...args: any[]) => T[];
-type UsableTraits = ([Trait | TypeFactory<Trait>, ...(Trait | TypeFactory<Trait>)[]] | [...(Trait | TypeFactory<Trait>)[], DirectBase]);
+type UsableTraits = [Trait | TypeFactory<Trait>, ...(Trait | TypeFactory<Trait>)[]] | [...(Trait | TypeFactory<Trait>)[], DirectBase];
 /**
  * API: derive a class from one or more traits or trait type factories
  *
@@ -174,7 +174,7 @@ type DerivedType<T extends Trait> = InstanceType<ExtractFactory<T>>;
 /**
  * internal type: implements trait type or trait type factory
  */
-type Derived<T extends (Trait | TypeFactory<Trait> | Cons)> = T extends TypeFactory<Trait> ? DerivedType<ReturnType<T>> : T extends Trait ? DerivedType<T> : T extends Cons ? T : never;
+type Derived<T extends Trait | TypeFactory<Trait> | Cons> = T extends TypeFactory<Trait> ? DerivedType<ReturnType<T>> : T extends Trait ? DerivedType<T> : T extends Cons ? T : never;
 /**
  * API: type guard for checking whether class instance is derived from a trait
  *
@@ -182,6 +182,6 @@ type Derived<T extends (Trait | TypeFactory<Trait> | Cons)> = T extends TypeFact
  * @param trait
  * @returns
  */
-declare function uses<T extends (Trait | TypeFactory<Trait> | Cons)>(instance: unknown, trait: T): instance is Derived<T>;
+declare function uses<T extends Trait | TypeFactory<Trait> | Cons>(instance: unknown, trait: T): instance is Derived<T>;
 //#endregion
 export { AbstractModelConstructor, type ChannelOptions, Cipher, type CipherOptions, Codec, type DeriveOptions, Derived, type DerivedKey, Encryption, EncryptionKey, type FingerprintOptions, Hash, type KeyInput, KeyPair, Keys, ModelConstructor, ModelRegistry, ModelResolver, NodeCipher, SealedBox, SecureChannel, type SerializedKeyPair, Trait, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getModelSync, getTraitMethods, initializeGlobalContext, isClass, normalizePositiveInteger, perPage, resolvePagination, setModelResolver, trait, use, uses };