@arkstack/common 0.17.16 → 0.17.18

package/dist/faker.d.ts

@@ -1,6 +1,5 @@
 import { Faker, ImageModule } from "@faker-js/faker";
 import { PictwoFakerImage } from "@pictwo/faker";
-
 //#region src/faker.d.ts
 declare const faker: Faker & {
   image: ImageModule & PictwoFakerImage;

package/dist/faker.js

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

package/dist/{helpers-CC35u6ti.d.ts → helpers-E_O2UDRn.d.ts}

@@ -2,7 +2,6 @@ import { JitiOptions, JitiResolveOptions } from "jiti";
 import { TOTP } from "otpauth";
 import { ChalkInstance } from "chalk";
 import { Model, ModelStatic } from "arkormx";
-
 //#region src/Logger.d.ts
 declare class Console {
   static log: (...args: any[]) => string | void;
@@ -165,6 +164,7 @@ interface EnvRegistry {
   APP_HOST: string;
   APP_PORT: number;
   APP_DEBUG: boolean;
+  APP_SECURE: boolean;
   APP_TIMEZONE: string;
   APP_LOCALE: typeof locales[number];
   APP_FALLBACK_LOCALE: typeof locales[number];
@@ -245,7 +245,7 @@ type Primitive = string | number | boolean | null | undefined | Function;
 type LoggerChalk = keyof ChalkInstance | ChalkInstance | (keyof ChalkInstance)[];
 type LoggerParseSignature = [string, LoggerChalk][];
 type DotPathValue<T, P extends string> = P extends `${infer Head}.${infer Tail}` ? Head extends keyof T ? DotPathValue<T[Head], Tail> : never : P extends keyof T ? T[P] : never;
-type DotPath<T> = T extends Primitive ? never : T extends any[] ? never : { [K in keyof T & string]: T[K] extends Primitive ? `${K}` : T[K] extends any[] ? `${K}` : `${K}` | `${K}.${DotPath<T[K]>}` }[keyof T & string];
+type DotPath<T> = T extends Primitive ? never : T extends any[] ? never : { [K in keyof T & string]: T[K] extends Primitive ? `${K}` : T[K] extends any[] ? `${K}` : `${K}` | `${K}.${DotPath<T[K]>}`; }[keyof T & string];
 /**
  * Ouput formater object or format the output
  *
@@ -294,7 +294,8 @@ type ArkstackErrorShape = Error & {
   errors?: unknown;
   getModelName?: () => string;
   status?: number;
-  statusCode?: number; /** Custom properties merged into the error response payload. */
+  statusCode?: number;
+  /** Custom properties merged into the error response payload. */
   body?: Record<string, unknown>;
 };
 interface ArkstackErrorPayload {
@@ -308,7 +309,7 @@ interface ArkstackErrorPayload {
 }
 interface HookRegistry {}
 type Position = 'before' | 'after' | (string & {});
-type IHook = { [P in Position]?: (...args: any[]) => void };
+type IHook = { [P in Position]?: (...args: any[]) => void; };
 type HookName = keyof HookRegistry extends never ? string : keyof HookRegistry | (string & {});
 type HookFor<N extends string> = N extends keyof HookRegistry ? HookRegistry[N] : IHook;
 type HookPos<N extends string, P extends string> = N extends keyof HookRegistry ? P extends keyof HookRegistry[N] ? HookRegistry[N][P] : (...args: any[]) => void : (...args: any[]) => void;
@@ -328,9 +329,9 @@ type PaginationOptions = {
   perPage: number;
 };
 /**
-* A single source → destination mapping a package wants to publish into the
-* consuming application.
-*/
+ * A single source → destination mapping a package wants to publish into the
+ * consuming application.
+ */
 interface PublishEntry {
   /** Absolute path to the file or directory shipped by the package. */
   from: string;
@@ -492,11 +493,7 @@ declare function getModel<TModel extends AbstractModelConstructor = ModelConstru
  */
 declare function getModelSync<TName extends ModelName>(modelName: TName): ModelRegistry[TName];
 declare function getModelSync<TModel extends AbstractModelConstructor = ModelConstructor>(modelName: string): TModel;
-declare const initializeGlobalContext: ({
-  Request,
-  Response,
-  Session
-}?: {
+declare const initializeGlobalContext: ({ Request, Response, Session }?: {
   Request?: any;
   Response?: any;
   Session?: any;

package/dist/index.d.ts

@@ -1,8 +1,7 @@
 /// <reference path="./app.d.ts" />
-import { A as GlobalConfig, B as LoggerLog, C as DotPath, D as EnvRegistry, E as EnvLookup, F as HookPos, G as PublishConfirmation, H as MergedConfig, I as HookPositions, J as PublishGroup, K as PublishEntry, L as HookRegistry, M as HookArgs, N as HookFor, O as EnvReturn, P as HookName, R as IHook, S as ConfigShape, T as EnvKey, U as PaginationOptions, V as LoggerParseSignature, W as Primitive, X as Logger, Y as UnionToIntersection, _ as ArkstackErrorPayload, a as abortIf, b as Choices, c as getModelSync, d as normalizePositiveInteger, f as perPage, g as AppConfig, h as Encryption, i as abort, j as GlobalEnv, k as FileImporter, l as initializeGlobalContext, m as Hash, n as ModelConstructor, o as assertFound, p as resolvePagination, q as PublishFilter, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass, v as ArkstackErrorShape, w as DotPathValue, x as ConfigRegistry, y as Choice, z as LoggerChalk } from "./helpers-CC35u6ti.js";
+import { A as GlobalConfig, B as LoggerLog, C as DotPath, D as EnvRegistry, E as EnvLookup, F as HookPos, G as PublishConfirmation, H as MergedConfig, I as HookPositions, J as PublishGroup, K as PublishEntry, L as HookRegistry, M as HookArgs, N as HookFor, O as EnvReturn, P as HookName, R as IHook, S as ConfigShape, T as EnvKey, U as PaginationOptions, V as LoggerParseSignature, W as Primitive, X as Logger, Y as UnionToIntersection, _ as ArkstackErrorPayload, a as abortIf, b as Choices, c as getModelSync, d as normalizePositiveInteger, f as perPage, g as AppConfig, h as Encryption, i as abort, j as GlobalEnv, k as FileImporter, l as initializeGlobalContext, m as Hash, n as ModelConstructor, o as assertFound, p as resolvePagination, q as PublishFilter, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass, v as ArkstackErrorShape, w as DotPathValue, x as ConfigRegistry, y as Choice, z as LoggerChalk } from "./helpers-E_O2UDRn.js";
 import { Arkstack } from "@arkstack/contract";
 import pino from "pino";
-
 //#region src/lifecycle.d.ts
 declare const bindGracefulShutdown: (shutdown: () => Promise<void> | void, defer?: boolean) => void;
 //#endregion
@@ -17,12 +16,7 @@ declare const bindGracefulShutdown: (shutdown: () => Promise<void> | void, defer
  * @param defer
  */
 declare const bootWithDetectedPort: <TApp, TRoutes = unknown, THandler = unknown>(boot: (port: number) => Promise<void>, preferredPort?: number, app?: Arkstack<TApp, TRoutes, THandler>, defer?: boolean) => Promise<void>;
-declare const renderError: ({
-  message,
-  stack,
-  title,
-  code
-}: {
+declare const renderError: ({ message, stack, title, code }: {
   message?: string;
   stack?: string;
   code?: number;

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-XvUhJFS0.js";
-import { _ as RequestException, b as Hash, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, l as assertFound, m as normalizePositiveInteger, p as isClass, s as abort, u as getModel, v as AppException, x as Encryption, y as Exception } from "./utils-CaaL-9im.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-Die_Dv5y.js";
+import { _ as RequestException, b as Hash, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, l as assertFound, m as normalizePositiveInteger, p as isClass, s as abort, u as getModel, v as AppException, x as Encryption, y as Exception } from "./utils-mymPEYd4.js";
 import { Hook as Hook$1 } from "@arkstack/foundry";
 import { Arkstack } from "@arkstack/contract";
 import { str } from "@h3ravel/support";

package/dist/{system-XvUhJFS0.js → system-Die_Dv5y.js}

@@ -32,7 +32,10 @@ var EnvLoader = class {
 		if (this.loaded) return;
 		this.loaded = true;
 		try {
-			config({ quiet: true });
+			config({
+				quiet: true,
+				override: process.env.ARKSTACK_ENV_RELOAD === "true"
+			});
 		} catch {}
 	}
 	/**
@@ -359,7 +362,8 @@ const rebuildOutput = async () => {
 		force: true
 	});
 	await new Promise((resolveBuild, reject) => {
-		const child = spawn(process.platform === "win32" ? "pnpm.cmd" : "pnpm", [
+		const command = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
+		const child = spawn(command, [
 			"exec",
 			"tsdown",
 			"--log-level",
@@ -452,7 +456,8 @@ const discoverCommands = async (subPath = path.join("app", "console", "commands"
 	for (const file of files) {
 		const basename = path.basename(file.name, path.extname(file.name));
 		try {
-			const command = resolveCommandExport(await importFile(path.join(commandsDir, file.name)), basename);
+			const mod = await importFile(path.join(commandsDir, file.name));
+			const command = resolveCommandExport(mod, basename);
 			if (command) commands.push(command);
 		} catch (error) {
 			console.error(`[arkstack] Failed to load command "${file.name}":`, error);

package/dist/utils/index.d.ts

@@ -1,22 +1,21 @@
-import { a as abortIf, c as getModelSync, d as normalizePositiveInteger, f as perPage, h as Encryption, i as abort, l as initializeGlobalContext, m as Hash, n as ModelConstructor, o as assertFound, p as resolvePagination, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass } from "../helpers-CC35u6ti.js";
+import { a as abortIf, c as getModelSync, d as normalizePositiveInteger, f as perPage, h as Encryption, i as abort, l as initializeGlobalContext, m as Hash, n as ModelConstructor, o as assertFound, p as resolvePagination, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass } from "../helpers-E_O2UDRn.js";
 import { Model } from "arkormx";
-
 //#region src/utils/traits.d.ts
 declare const crc32: (str: string) => number;
 type ResolveTraitLike<T extends Trait | TypeFactory<Trait>> = T extends TypeFactory<Trait> ? ExtractFactory<ReturnType<T>> : T extends Trait ? ExtractFactory<T> : unknown;
 type Combine<T extends any[]> = T extends [infer Head, ...infer Tail] ? Head & Combine<Tail> : object;
 type MapClassesToPrototypes<T extends Array<(new () => any) & {
   prototype: any;
-}>> = { [K in keyof T]: T[K]['prototype'] };
+}>> = { [K in keyof T]: T[K]['prototype']; };
 type MapClassesToInstances<T extends Array<(new () => any) & {
   prototype: any;
-}>> = { [K in keyof T]: InstanceType<T[K]> };
+}>> = { [K in keyof T]: InstanceType<T[K]>; };
 type CombineClasses<T extends Array<(new () => any) & {
   prototype: any;
 }>> = (new () => Combine<MapClassesToInstances<T>>) & {
   prototype: Combine<MapClassesToPrototypes<T>>;
 };
-type ResolveTraitLikeArray<T extends Array<Trait | TypeFactory<Trait>>> = CombineClasses<{ [K in keyof T]: ResolveTraitLike<T[K]> }>;
+type ResolveTraitLikeArray<T extends Array<Trait | TypeFactory<Trait>>> = CombineClasses<{ [K in keyof T]: ResolveTraitLike<T[K]>; }>;
 /**
  * utility type and function: constructor (function)
  */
@@ -35,7 +34,7 @@ type TypeFactory<T = any> = () => T;
 /**
  * utility type: map an object type into a bare properties type
  */
-type Explode<T = any> = { [P in keyof T]: T[P] };
+type Explode<T = any> = { [P in keyof T]: T[P]; };
 /**
  * utility type: convert two arrays of types into an array of union types
  */
@@ -96,7 +95,7 @@ type DeriveTraitsConsOne<T extends (Trait | TypeFactory<Trait>)> = T extends Tra
 /**
  * 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>, /* 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;
 /**
  * utility type: derive type constructor
  */
@@ -125,7 +124,7 @@ type DeriveTraitsStatsOne<T extends (Trait | TypeFactory<Trait>)> = T extends Tr
 /**
  * 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>, /* 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;
 /**
  * utility type: derive type statics
  */

package/dist/utils/index.js

@@ -1,2 +1,2 @@
-import { a as use, b as Hash, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, i as trait, l as assertFound, m as normalizePositiveInteger, n as crc32, o as uses, p as isClass, r as getTraitMethods, s as abort, t as callTraitMethods, u as getModel, x as Encryption } from "../utils-CaaL-9im.js";
+import { a as use, b as Hash, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as resolvePagination, h as perPage, i as trait, l as assertFound, m as normalizePositiveInteger, n as crc32, o as uses, p as isClass, r as getTraitMethods, s as abort, t as callTraitMethods, u as getModel, x as Encryption } from "../utils-mymPEYd4.js";
 export { Encryption, Hash, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getModelSync, getTraitMethods, initializeGlobalContext, isClass, normalizePositiveInteger, perPage, resolvePagination, trait, use, uses };

package/dist/{utils-CaaL-9im.js → utils-mymPEYd4.js}

@@ -1,4 +1,4 @@
-import { a as env, f as resolveRuntimeModule, o as importFile, t as appKey } from "./system-XvUhJFS0.js";
+import { a as env, f as resolveRuntimeModule, o as importFile, t as appKey } from "./system-Die_Dv5y.js";
 import { createRequire } from "node:module";
 import { createCipheriv, createDecipheriv, createHash, randomBytes } from "node:crypto";
 import { Arkstack } from "@arkstack/contract";
@@ -41,7 +41,8 @@ var Hash = class {
 	* @returns 
 	*/
 	static async make(value) {
-		return await hash(value, await genSalt(10));
+		const salt = await genSalt(10);
+		return await hash(value, salt);
 	}
 	/**
 	* Verify a value against a hashed value
@@ -209,7 +210,9 @@ async function getModel(modelName) {
 	const isModelModule = (value) => typeof value === "object" && value !== null;
 	const { getUserConfig } = await import("arkormx");
 	const modelPath = getUserConfig().paths?.models || "./src/models";
-	const model = resolveModelExport(await importFile(resolveRuntimeModule(path.join(path.isAbsolute(modelPath) ? modelPath : path.join(Arkstack.rootDir(), modelPath), modelName))), path.basename(modelName, path.extname(modelName)));
+	const sourcePath = path.join(path.isAbsolute(modelPath) ? modelPath : path.join(Arkstack.rootDir(), modelPath), modelName);
+	const modulePath = resolveRuntimeModule(sourcePath);
+	const model = resolveModelExport(await importFile(modulePath), path.basename(modelName, path.extname(modelName)));
 	if (typeof model !== "function") throw new Error(`Model "${modelName}" not found`);
 	return model;
 }
@@ -225,7 +228,9 @@ function getModelSync(modelName) {
 	const registeredModel = Arkorm.getRegisteredModels().find((model) => model.name === exportName);
 	if (registeredModel) return registeredModel;
 	const modelPath = getUserConfig().paths?.models || "./src/models";
-	const model = resolveModelExport(require(resolveRuntimeModule(path.join(path.isAbsolute(modelPath) ? modelPath : path.join(Arkstack.rootDir(), modelPath), modelName))), exportName);
+	const sourcePath = path.join(path.isAbsolute(modelPath) ? modelPath : path.join(Arkstack.rootDir(), modelPath), modelName);
+	const module = require(resolveRuntimeModule(sourcePath));
+	const model = resolveModelExport(module, exportName);
 	if (typeof model !== "function") throw new Error(`Model "${modelName}" not found`);
 	return model;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/common",
-  "version": "0.17.16",
+  "version": "0.17.18",
   "type": "module",
   "description": "Core utilities, primitives, and shared infrastructure for the Arkstack ecosystem.",
   "homepage": "https://arkstack.toneflix.net",
@@ -45,10 +45,10 @@
     "selfsigned": "^2.4.1"
   },
   "peerDependencies": {
-    "@h3ravel/support": "^2.2.4",
-    "arkormx": "^2.12.0",
-    "@arkstack/contract": "^0.17.16",
-    "@arkstack/foundry": "^0.17.16"
+    "@h3ravel/support": "^2.2.7",
+    "arkormx": "^2.12.8",
+    "@arkstack/contract": "^0.17.18",
+    "@arkstack/foundry": "^0.17.18"
   },
   "optionalDependencies": {
     "@faker-js/faker": "^10.4.0"