arkormx 2.0.0-next.11 → 2.0.0-next.13

package/dist/cli.mjs

@@ -1,17 +1,18 @@
 #!/usr/bin/env node
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
+import * as path from "node:path";
 import { dirname, extname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { str } from "@h3ravel/support";
-import path, { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
+import { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
 import { copyFileSync, existsSync as existsSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { AsyncLocalStorage } from "async_hooks";
 import { createJiti } from "@rexxars/jiti";
 import { pathToFileURL } from "node:url";
-import { createRequire } from "module";
 import { fileURLToPath } from "url";
 import { Logger } from "@h3ravel/shared";
+import { createRequire } from "module";
 import { Command, Kernel } from "@h3ravel/musket";
 
 //#region src/Exceptions/ArkormException.ts
@@ -1463,14 +1464,18 @@ var RuntimeModuleLoader = class {
 	static async load(filePath) {
 		const resolvedPath = resolve(filePath);
 		return await createJiti(pathToFileURL(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		}).import(resolvedPath);
 	}
 	static loadSync(filePath) {
 		const resolvedPath = resolve(filePath);
 		return createJiti(pathToFileURL(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		})(resolvedPath);
 	}
@@ -1913,6 +1918,17 @@ const getPersistedEnumTsType = (values) => {
 
 //#endregion
 //#region src/helpers/runtime-config.ts
+const supportedConfigExtensions = [
+	"cjs",
+	"js",
+	"mjs",
+	"ts",
+	"cts",
+	"mts"
+];
+const getRuntimeConfigPaths = () => {
+	return supportedConfigExtensions.map((extension) => path.join(process.cwd(), `arkormx.config.${extension}`));
+};
 const resolveDefaultStubsPath = () => {
 	let current = path.dirname(fileURLToPath(import.meta.url));
 	while (true) {
@@ -1945,16 +1961,160 @@ const userConfig = {
 	features: { ...baseConfig.features ?? {} },
 	paths: { ...baseConfig.paths ?? {} }
 };
+let runtimeConfigLoaded = false;
+let runtimeConfigLoadingPromise;
+let runtimeClientResolver;
+let runtimeAdapter;
+let runtimePaginationURLDriverFactory;
+let runtimePaginationCurrentPageResolver;
 const transactionClientStorage = new AsyncLocalStorage();
+const mergePathConfig = (paths) => {
+	const defaults = baseConfig.paths ?? {};
+	const current = userConfig.paths ?? {};
+	const incoming = Object.entries(paths ?? {}).reduce((all, [key, value]) => {
+		if (typeof value === "string" && value.trim().length > 0) all[key] = path.isAbsolute(value) ? value : path.resolve(process.cwd(), value);
+		return all;
+	}, {});
+	return {
+		...defaults,
+		...current,
+		...incoming
+	};
+};
+const mergeFeatureConfig = (features) => {
+	const defaults = baseConfig.features ?? {};
+	const current = userConfig.features ?? {};
+	return {
+		...defaults,
+		...current,
+		...features ?? {}
+	};
+};
+const bindAdapterToModels = (adapter, models) => {
+	models.forEach((model) => {
+		model.setAdapter(adapter);
+	});
+	return adapter;
+};
 /**
 * Get the user-provided ArkORM configuration. 
 * 
 * @returns The user-provided ArkORM configuration object.  
 */
 const getUserConfig = (key) => {
+	if (!runtimeConfigLoaded) loadRuntimeConfigSync();
 	if (key) return userConfig[key];
 	return userConfig;
 };
+/**
+* Configure the ArkORM runtime with the provided Prisma client resolver and 
+* delegate mapping resolver.
+* 
+* @param prisma 
+* @param mapping 
+*/
+const configureArkormRuntime = (prisma, options = {}) => {
+	const nextConfig = {
+		...userConfig,
+		features: mergeFeatureConfig(options.features),
+		paths: mergePathConfig(options.paths)
+	};
+	nextConfig.prisma = prisma;
+	if (options.pagination !== void 0) nextConfig.pagination = options.pagination;
+	if (options.adapter !== void 0) nextConfig.adapter = options.adapter;
+	if (options.boot !== void 0) nextConfig.boot = options.boot;
+	if (options.outputExt !== void 0) nextConfig.outputExt = options.outputExt;
+	Object.assign(userConfig, { ...nextConfig });
+	runtimeClientResolver = prisma;
+	runtimeAdapter = options.adapter;
+	runtimePaginationURLDriverFactory = nextConfig.pagination?.urlDriver;
+	runtimePaginationCurrentPageResolver = nextConfig.pagination?.resolveCurrentPage;
+	runtimeConfigLoaded = true;
+	runtimeConfigLoadingPromise = void 0;
+	options.boot?.({
+		prisma: resolveClient(prisma),
+		bindAdapter: bindAdapterToModels
+	});
+};
+/**
+* Resolve a Prisma client instance from the provided resolver, which can be either
+* a direct client instance or a function that returns a client instance.
+* 
+* @param resolver 
+* @returns 
+*/
+const resolveClient = (resolver) => {
+	if (!resolver) return void 0;
+	const client = typeof resolver === "function" ? resolver() : resolver;
+	if (!client || typeof client !== "object") return void 0;
+	return client;
+};
+/**
+* Resolve and apply the ArkORM configuration from an imported module. 
+* This function checks for a default export and falls back to the module itself, then validates
+* the configuration object and applies it to the runtime if valid.
+* 
+* @param imported 
+* @returns 
+*/
+const resolveAndApplyConfig = (imported) => {
+	const config = imported?.default ?? imported;
+	if (!config || typeof config !== "object") return false;
+	configureArkormRuntime(config.prisma, {
+		adapter: config.adapter,
+		boot: config.boot,
+		features: config.features,
+		pagination: config.pagination,
+		paths: config.paths,
+		outputExt: config.outputExt
+	});
+	runtimeConfigLoaded = true;
+	return true;
+};
+/**
+* Dynamically import a configuration file. 
+* A cache-busting query parameter is appended to ensure the latest version is loaded.
+* 
+* @param configPath 
+* @returns A promise that resolves to the imported configuration module.   
+*/
+const importConfigFile = (configPath) => {
+	return RuntimeModuleLoader.load(configPath);
+};
+const loadRuntimeConfigSync = () => {
+	const syncConfigPaths = getRuntimeConfigPaths();
+	for (const configPath of syncConfigPaths) {
+		if (!existsSync$1(configPath)) continue;
+		try {
+			if (resolveAndApplyConfig(RuntimeModuleLoader.loadSync(configPath))) return true;
+		} catch {
+			continue;
+		}
+	}
+	return false;
+};
+/**
+* Load the ArkORM configuration by searching for configuration files in the 
+* current working directory.
+* @returns 
+*/
+const loadArkormConfig = async () => {
+	if (runtimeConfigLoaded) return;
+	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
+	runtimeConfigLoadingPromise = (async () => {
+		const configPaths = getRuntimeConfigPaths();
+		for (const configPath of configPaths) {
+			if (!existsSync$1(configPath)) continue;
+			try {
+				if (resolveAndApplyConfig(await importConfigFile(configPath))) return;
+			} catch {
+				continue;
+			}
+		}
+		runtimeConfigLoaded = true;
+	})();
+	await runtimeConfigLoadingPromise;
+};
 const getDefaultStubsPath = () => {
 	return resolveDefaultStubsPath();
 };
@@ -3517,6 +3677,7 @@ var logo_default = String.raw`
 
 //#endregion
 //#region src/cli/index.ts
+await loadArkormConfig();
 const app = new CliApp();
 await Kernel.init(app, {
 	logo: logo_default,

package/dist/index.cjs

@@ -28,19 +28,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let kysely = require("kysely");
 let _h3ravel_support = require("@h3ravel/support");
+let node_path = require("node:path");
+node_path = __toESM(node_path);
 let async_hooks = require("async_hooks");
 let _rexxars_jiti = require("@rexxars/jiti");
 let node_url = require("node:url");
-let node_path = require("node:path");
-let module$1 = require("module");
 let fs = require("fs");
 let url = require("url");
 let node_fs = require("node:fs");
 let node_crypto = require("node:crypto");
 let node_child_process = require("node:child_process");
 let path = require("path");
-path = __toESM(path);
 let _h3ravel_shared = require("@h3ravel/shared");
+let module$1 = require("module");
 let _h3ravel_musket = require("@h3ravel/musket");
 let _h3ravel_collect_js = require("@h3ravel/collect.js");
 
@@ -1025,14 +1025,18 @@ var RuntimeModuleLoader = class {
 	static async load(filePath) {
 		const resolvedPath = (0, node_path.resolve)(filePath);
 		return await (0, _rexxars_jiti.createJiti)((0, node_url.pathToFileURL)(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		}).import(resolvedPath);
 	}
 	static loadSync(filePath) {
 		const resolvedPath = (0, node_path.resolve)(filePath);
 		return (0, _rexxars_jiti.createJiti)((0, node_url.pathToFileURL)(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		})(resolvedPath);
 	}
@@ -2930,17 +2934,28 @@ const getPersistedEnumTsType = (values) => {
 
 //#endregion
 //#region src/helpers/runtime-config.ts
+const supportedConfigExtensions = [
+	"cjs",
+	"js",
+	"mjs",
+	"ts",
+	"cts",
+	"mts"
+];
+const getRuntimeConfigPaths = () => {
+	return supportedConfigExtensions.map((extension) => node_path.join(process.cwd(), `arkormx.config.${extension}`));
+};
 const resolveDefaultStubsPath = () => {
-	let current = path.default.dirname((0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
+	let current = node_path.dirname((0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
 	while (true) {
-		const packageJsonPath = path.default.join(current, "package.json");
-		const stubsPath = path.default.join(current, "stubs");
+		const packageJsonPath = node_path.join(current, "package.json");
+		const stubsPath = node_path.join(current, "stubs");
 		if ((0, fs.existsSync)(packageJsonPath) && (0, fs.existsSync)(stubsPath)) return stubsPath;
-		const parent = path.default.dirname(current);
+		const parent = node_path.dirname(current);
 		if (parent === current) break;
 		current = parent;
 	}
-	return path.default.join(process.cwd(), "stubs");
+	return node_path.join(process.cwd(), "stubs");
 };
 const baseConfig = {
 	features: {
@@ -2949,11 +2964,11 @@ const baseConfig = {
 	},
 	paths: {
 		stubs: resolveDefaultStubsPath(),
-		seeders: path.default.join(process.cwd(), "database", "seeders"),
-		models: path.default.join(process.cwd(), "src", "models"),
-		migrations: path.default.join(process.cwd(), "database", "migrations"),
-		factories: path.default.join(process.cwd(), "database", "factories"),
-		buildOutput: path.default.join(process.cwd(), "dist")
+		seeders: node_path.join(process.cwd(), "database", "seeders"),
+		models: node_path.join(process.cwd(), "src", "models"),
+		migrations: node_path.join(process.cwd(), "database", "migrations"),
+		factories: node_path.join(process.cwd(), "database", "factories"),
+		buildOutput: node_path.join(process.cwd(), "dist")
 	},
 	outputExt: "ts"
 };
@@ -2973,7 +2988,7 @@ const mergePathConfig = (paths) => {
 	const defaults = baseConfig.paths ?? {};
 	const current = userConfig.paths ?? {};
 	const incoming = Object.entries(paths ?? {}).reduce((all, [key, value]) => {
-		if (typeof value === "string" && value.trim().length > 0) all[key] = path.default.isAbsolute(value) ? value : path.default.resolve(process.cwd(), value);
+		if (typeof value === "string" && value.trim().length > 0) all[key] = node_path.isAbsolute(value) ? value : node_path.resolve(process.cwd(), value);
 		return all;
 	}, {});
 	return {
@@ -3012,6 +3027,7 @@ const bindAdapterToModels = (adapter, models) => {
 * @returns The user-provided ArkORM configuration object.  
 */
 const getUserConfig = (key) => {
+	if (!runtimeConfigLoaded) loadRuntimeConfigSync();
 	if (key) return userConfig[key];
 	return userConfig;
 };
@@ -3089,7 +3105,7 @@ const resolveClient = (resolver) => {
 */
 const resolveAndApplyConfig = (imported) => {
 	const config = imported?.default ?? imported;
-	if (!config || typeof config !== "object") return;
+	if (!config || typeof config !== "object") return false;
 	configureArkormRuntime(config.prisma, {
 		adapter: config.adapter,
 		boot: config.boot,
@@ -3099,6 +3115,7 @@ const resolveAndApplyConfig = (imported) => {
 		outputExt: config.outputExt
 	});
 	runtimeConfigLoaded = true;
+	return true;
 };
 /**
 * Dynamically import a configuration file. 
@@ -3111,13 +3128,11 @@ const importConfigFile = (configPath) => {
 	return RuntimeModuleLoader.load(configPath);
 };
 const loadRuntimeConfigSync = () => {
-	const require = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href);
-	const syncConfigPaths = [path.default.join(process.cwd(), "arkormx.config.cjs")];
+	const syncConfigPaths = getRuntimeConfigPaths();
 	for (const configPath of syncConfigPaths) {
 		if (!(0, fs.existsSync)(configPath)) continue;
 		try {
-			resolveAndApplyConfig(require(configPath));
-			return true;
+			if (resolveAndApplyConfig(RuntimeModuleLoader.loadSync(configPath))) return true;
 		} catch {
 			continue;
 		}
@@ -3132,14 +3147,12 @@ const loadRuntimeConfigSync = () => {
 const loadArkormConfig = async () => {
 	if (runtimeConfigLoaded) return;
 	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
-	if (loadRuntimeConfigSync()) return;
 	runtimeConfigLoadingPromise = (async () => {
-		const configPaths = [path.default.join(process.cwd(), "arkormx.config.js"), path.default.join(process.cwd(), "arkormx.config.ts")];
+		const configPaths = getRuntimeConfigPaths();
 		for (const configPath of configPaths) {
 			if (!(0, fs.existsSync)(configPath)) continue;
 			try {
-				resolveAndApplyConfig(await importConfigFile(configPath));
-				return;
+				if (resolveAndApplyConfig(await importConfigFile(configPath))) return;
 			} catch {
 				continue;
 			}
@@ -3880,7 +3893,7 @@ var CliApp = class {
 				} else candidates.push(mappedFile);
 			}
 		}
-		const runtimeMatch = candidates.find((path$2) => (0, fs.existsSync)(path$2));
+		const runtimeMatch = candidates.find((path$1) => (0, fs.existsSync)(path$1));
 		if (runtimeMatch) return runtimeMatch;
 		return filePath;
 	}

package/dist/index.mjs

@@ -1,17 +1,18 @@
 import { sql } from "kysely";
 import { str } from "@h3ravel/support";
+import * as path from "node:path";
+import { dirname, extname, join, resolve } from "node:path";
 import { AsyncLocalStorage } from "async_hooks";
 import { createJiti } from "@rexxars/jiti";
 import { pathToFileURL } from "node:url";
-import { dirname, extname, join, resolve } from "node:path";
-import { createRequire } from "module";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { existsSync as existsSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { spawnSync } from "node:child_process";
-import path, { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
+import { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
 import { Logger } from "@h3ravel/shared";
+import { createRequire } from "module";
 import { Command } from "@h3ravel/musket";
 import { Collection } from "@h3ravel/collect.js";
 
@@ -996,14 +997,18 @@ var RuntimeModuleLoader = class {
 	static async load(filePath) {
 		const resolvedPath = resolve(filePath);
 		return await createJiti(pathToFileURL(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		}).import(resolvedPath);
 	}
 	static loadSync(filePath) {
 		const resolvedPath = resolve(filePath);
 		return createJiti(pathToFileURL(resolvedPath).href, {
+			fsCache: false,
 			interopDefault: false,
+			moduleCache: false,
 			tsconfigPaths: true
 		})(resolvedPath);
 	}
@@ -2901,6 +2906,17 @@ const getPersistedEnumTsType = (values) => {
 
 //#endregion
 //#region src/helpers/runtime-config.ts
+const supportedConfigExtensions = [
+	"cjs",
+	"js",
+	"mjs",
+	"ts",
+	"cts",
+	"mts"
+];
+const getRuntimeConfigPaths = () => {
+	return supportedConfigExtensions.map((extension) => path.join(process.cwd(), `arkormx.config.${extension}`));
+};
 const resolveDefaultStubsPath = () => {
 	let current = path.dirname(fileURLToPath(import.meta.url));
 	while (true) {
@@ -2983,6 +2999,7 @@ const bindAdapterToModels = (adapter, models) => {
 * @returns The user-provided ArkORM configuration object.  
 */
 const getUserConfig = (key) => {
+	if (!runtimeConfigLoaded) loadRuntimeConfigSync();
 	if (key) return userConfig[key];
 	return userConfig;
 };
@@ -3060,7 +3077,7 @@ const resolveClient = (resolver) => {
 */
 const resolveAndApplyConfig = (imported) => {
 	const config = imported?.default ?? imported;
-	if (!config || typeof config !== "object") return;
+	if (!config || typeof config !== "object") return false;
 	configureArkormRuntime(config.prisma, {
 		adapter: config.adapter,
 		boot: config.boot,
@@ -3070,6 +3087,7 @@ const resolveAndApplyConfig = (imported) => {
 		outputExt: config.outputExt
 	});
 	runtimeConfigLoaded = true;
+	return true;
 };
 /**
 * Dynamically import a configuration file. 
@@ -3082,13 +3100,11 @@ const importConfigFile = (configPath) => {
 	return RuntimeModuleLoader.load(configPath);
 };
 const loadRuntimeConfigSync = () => {
-	const require = createRequire(import.meta.url);
-	const syncConfigPaths = [path.join(process.cwd(), "arkormx.config.cjs")];
+	const syncConfigPaths = getRuntimeConfigPaths();
 	for (const configPath of syncConfigPaths) {
 		if (!existsSync(configPath)) continue;
 		try {
-			resolveAndApplyConfig(require(configPath));
-			return true;
+			if (resolveAndApplyConfig(RuntimeModuleLoader.loadSync(configPath))) return true;
 		} catch {
 			continue;
 		}
@@ -3103,14 +3119,12 @@ const loadRuntimeConfigSync = () => {
 const loadArkormConfig = async () => {
 	if (runtimeConfigLoaded) return;
 	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
-	if (loadRuntimeConfigSync()) return;
 	runtimeConfigLoadingPromise = (async () => {
-		const configPaths = [path.join(process.cwd(), "arkormx.config.js"), path.join(process.cwd(), "arkormx.config.ts")];
+		const configPaths = getRuntimeConfigPaths();
 		for (const configPath of configPaths) {
 			if (!existsSync(configPath)) continue;
 			try {
-				resolveAndApplyConfig(await importConfigFile(configPath));
-				return;
+				if (resolveAndApplyConfig(await importConfigFile(configPath))) return;
 			} catch {
 				continue;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkormx",
-  "version": "2.0.0-next.11",
+  "version": "2.0.0-next.13",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",