arkormx 2.0.0-next.10 → 2.0.0-next.11

package/dist/cli.mjs

@@ -1,18 +1,17 @@
 #!/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 { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
+import path, { 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
@@ -1464,18 +1463,14 @@ 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);
 	}

package/dist/index.cjs

@@ -32,15 +32,15 @@ let async_hooks = require("async_hooks");
 let _rexxars_jiti = require("@rexxars/jiti");
 let node_url = require("node:url");
 let node_path = require("node:path");
-node_path = __toESM(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,18 +1025,14 @@ 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);
 	}
@@ -2934,28 +2930,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) => node_path.join(process.cwd(), `arkormx.config.${extension}`));
-};
 const resolveDefaultStubsPath = () => {
-	let current = node_path.dirname((0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
+	let current = path.default.dirname((0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
 	while (true) {
-		const packageJsonPath = node_path.join(current, "package.json");
-		const stubsPath = node_path.join(current, "stubs");
+		const packageJsonPath = path.default.join(current, "package.json");
+		const stubsPath = path.default.join(current, "stubs");
 		if ((0, fs.existsSync)(packageJsonPath) && (0, fs.existsSync)(stubsPath)) return stubsPath;
-		const parent = node_path.dirname(current);
+		const parent = path.default.dirname(current);
 		if (parent === current) break;
 		current = parent;
 	}
-	return node_path.join(process.cwd(), "stubs");
+	return path.default.join(process.cwd(), "stubs");
 };
 const baseConfig = {
 	features: {
@@ -2964,11 +2949,11 @@ const baseConfig = {
 	},
 	paths: {
 		stubs: resolveDefaultStubsPath(),
-		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")
+		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")
 	},
 	outputExt: "ts"
 };
@@ -2988,7 +2973,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] = node_path.isAbsolute(value) ? value : node_path.resolve(process.cwd(), value);
+		if (typeof value === "string" && value.trim().length > 0) all[key] = path.default.isAbsolute(value) ? value : path.default.resolve(process.cwd(), value);
 		return all;
 	}, {});
 	return {
@@ -3104,7 +3089,7 @@ const resolveClient = (resolver) => {
 */
 const resolveAndApplyConfig = (imported) => {
 	const config = imported?.default ?? imported;
-	if (!config || typeof config !== "object") return false;
+	if (!config || typeof config !== "object") return;
 	configureArkormRuntime(config.prisma, {
 		adapter: config.adapter,
 		boot: config.boot,
@@ -3114,7 +3099,6 @@ const resolveAndApplyConfig = (imported) => {
 		outputExt: config.outputExt
 	});
 	runtimeConfigLoaded = true;
-	return true;
 };
 /**
 * Dynamically import a configuration file. 
@@ -3127,11 +3111,13 @@ const importConfigFile = (configPath) => {
 	return RuntimeModuleLoader.load(configPath);
 };
 const loadRuntimeConfigSync = () => {
-	const syncConfigPaths = getRuntimeConfigPaths();
+	const require = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href);
+	const syncConfigPaths = [path.default.join(process.cwd(), "arkormx.config.cjs")];
 	for (const configPath of syncConfigPaths) {
 		if (!(0, fs.existsSync)(configPath)) continue;
 		try {
-			if (resolveAndApplyConfig(RuntimeModuleLoader.loadSync(configPath))) return true;
+			resolveAndApplyConfig(require(configPath));
+			return true;
 		} catch {
 			continue;
 		}
@@ -3146,12 +3132,14 @@ const loadRuntimeConfigSync = () => {
 const loadArkormConfig = async () => {
 	if (runtimeConfigLoaded) return;
 	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
+	if (loadRuntimeConfigSync()) return;
 	runtimeConfigLoadingPromise = (async () => {
-		const configPaths = getRuntimeConfigPaths();
+		const configPaths = [path.default.join(process.cwd(), "arkormx.config.js"), path.default.join(process.cwd(), "arkormx.config.ts")];
 		for (const configPath of configPaths) {
 			if (!(0, fs.existsSync)(configPath)) continue;
 			try {
-				if (resolveAndApplyConfig(await importConfigFile(configPath))) return;
+				resolveAndApplyConfig(await importConfigFile(configPath));
+				return;
 			} catch {
 				continue;
 			}
@@ -3892,7 +3880,7 @@ var CliApp = class {
 				} else candidates.push(mappedFile);
 			}
 		}
-		const runtimeMatch = candidates.find((path$1) => (0, fs.existsSync)(path$1));
+		const runtimeMatch = candidates.find((path$2) => (0, fs.existsSync)(path$2));
 		if (runtimeMatch) return runtimeMatch;
 		return filePath;
 	}

package/dist/index.mjs

@@ -3,16 +3,15 @@ import { str } from "@h3ravel/support";
 import { AsyncLocalStorage } from "async_hooks";
 import { createJiti } from "@rexxars/jiti";
 import { pathToFileURL } from "node:url";
-import * as path from "node:path";
 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 { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
+import path, { 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";
 
@@ -997,18 +996,14 @@ 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);
 	}
@@ -2906,17 +2901,6 @@ 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) {
@@ -3076,7 +3060,7 @@ const resolveClient = (resolver) => {
 */
 const resolveAndApplyConfig = (imported) => {
 	const config = imported?.default ?? imported;
-	if (!config || typeof config !== "object") return false;
+	if (!config || typeof config !== "object") return;
 	configureArkormRuntime(config.prisma, {
 		adapter: config.adapter,
 		boot: config.boot,
@@ -3086,7 +3070,6 @@ const resolveAndApplyConfig = (imported) => {
 		outputExt: config.outputExt
 	});
 	runtimeConfigLoaded = true;
-	return true;
 };
 /**
 * Dynamically import a configuration file. 
@@ -3099,11 +3082,13 @@ const importConfigFile = (configPath) => {
 	return RuntimeModuleLoader.load(configPath);
 };
 const loadRuntimeConfigSync = () => {
-	const syncConfigPaths = getRuntimeConfigPaths();
+	const require = createRequire(import.meta.url);
+	const syncConfigPaths = [path.join(process.cwd(), "arkormx.config.cjs")];
 	for (const configPath of syncConfigPaths) {
 		if (!existsSync(configPath)) continue;
 		try {
-			if (resolveAndApplyConfig(RuntimeModuleLoader.loadSync(configPath))) return true;
+			resolveAndApplyConfig(require(configPath));
+			return true;
 		} catch {
 			continue;
 		}
@@ -3118,12 +3103,14 @@ const loadRuntimeConfigSync = () => {
 const loadArkormConfig = async () => {
 	if (runtimeConfigLoaded) return;
 	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
+	if (loadRuntimeConfigSync()) return;
 	runtimeConfigLoadingPromise = (async () => {
-		const configPaths = getRuntimeConfigPaths();
+		const configPaths = [path.join(process.cwd(), "arkormx.config.js"), path.join(process.cwd(), "arkormx.config.ts")];
 		for (const configPath of configPaths) {
 			if (!existsSync(configPath)) continue;
 			try {
-				if (resolveAndApplyConfig(await importConfigFile(configPath))) return;
+				resolveAndApplyConfig(await importConfigFile(configPath));
+				return;
 			} catch {
 				continue;
 			}

package/package.json

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