arkormx 2.0.0-next.6 → 2.0.0-next.8

package/dist/cli.mjs

@@ -9,9 +9,9 @@ import { copyFileSync, existsSync as existsSync$1, mkdirSync as mkdirSync$1, rea
 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
@@ -1457,6 +1457,29 @@ const applyMigrationRollbackToPrismaSchema = async (migration, options = {}) =>
 	};
 };
 
+//#endregion
+//#region src/helpers/runtime-module-loader.ts
+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);
+	}
+};
+
 //#endregion
 //#region src/helpers/migration-history.ts
 const createEmptyAppliedMigrationsState = () => ({
@@ -1613,7 +1636,7 @@ const normalizePersistedTableMetadata = (table) => {
 		enums: {}
 	};
 	const candidate = table;
-	if (!(Object.prototype.hasOwnProperty.call(candidate, "columns") || Object.prototype.hasOwnProperty.call(candidate, "enums"))) return {
+	if (!(Object.prototype.hasOwnProperty.call(candidate, "columns") || Object.prototype.hasOwnProperty.call(candidate, "enums") || Object.prototype.hasOwnProperty.call(candidate, "primaryKeyGeneration") || Object.prototype.hasOwnProperty.call(candidate, "timestampColumns"))) return {
 		columns: normalizeLegacyTableColumns(candidate),
 		enums: {}
 	};
@@ -1625,7 +1648,8 @@ const normalizePersistedTableMetadata = (table) => {
 			if (normalizedValues.length > 0) all[columnName] = normalizedValues;
 			return all;
 		}, {}),
-		primaryKeyGeneration: normalizePersistedPrimaryKeyGeneration(candidate.primaryKeyGeneration)
+		primaryKeyGeneration: normalizePersistedPrimaryKeyGeneration(candidate.primaryKeyGeneration),
+		timestampColumns: normalizePersistedTimestampColumns(candidate.timestampColumns)
 	};
 };
 const normalizePersistedPrimaryKeyGeneration = (value) => {
@@ -1640,13 +1664,28 @@ const normalizePersistedPrimaryKeyGeneration = (value) => {
 		runtimeFactory: candidate.runtimeFactory === "uuid" ? "uuid" : void 0
 	};
 };
+const normalizePersistedTimestampColumns = (value) => {
+	if (!Array.isArray(value)) return void 0;
+	const columns = value.reduce((all, entry) => {
+		if (!entry || typeof entry !== "object" || Array.isArray(entry)) return all;
+		const candidate = entry;
+		if (typeof candidate.column !== "string" || candidate.column.trim().length === 0) return all;
+		const normalized = { column: candidate.column };
+		if (candidate.default === "now()") normalized.default = "now()";
+		if (candidate.updatedAt === true) normalized.updatedAt = true;
+		if (!normalized.default && !normalized.updatedAt) return all;
+		all.push(normalized);
+		return all;
+	}, []);
+	return columns.length > 0 ? columns : void 0;
+};
 const normalizePersistedColumnMappingsState = (state) => {
 	return {
 		version: 1,
 		tables: Object.entries(state?.tables ?? {}).reduce((all, [tableName, tableMetadata]) => {
 			if (tableName.trim().length === 0) return all;
 			const normalized = normalizePersistedTableMetadata(tableMetadata);
-			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0 || normalized.primaryKeyGeneration) all[tableName] = normalized;
+			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0 || normalized.primaryKeyGeneration || normalized.timestampColumns?.length) all[tableName] = normalized;
 			return all;
 		}, {})
 	};
@@ -1718,7 +1757,8 @@ const getPersistedTableMetadata = (table, options = {}) => {
 			all[columnName] = [...values];
 			return all;
 		}, {}),
-		primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
+		primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0,
+		timestampColumns: metadata.timestampColumns?.map((column) => ({ ...column }))
 	};
 };
 const applyMappedColumn = (tableColumns, column, features, table) => {
@@ -1745,6 +1785,10 @@ const removePersistedColumnMetadata = (tableMetadata, columnName) => {
 		if (mappedColumn === columnName) delete tableMetadata.columns[attribute];
 	});
 	if (tableMetadata.primaryKeyGeneration?.column === columnName) delete tableMetadata.primaryKeyGeneration;
+	if (tableMetadata.timestampColumns) {
+		tableMetadata.timestampColumns = tableMetadata.timestampColumns.filter((column) => column.column !== columnName);
+		if (tableMetadata.timestampColumns.length === 0) delete tableMetadata.timestampColumns;
+	}
 };
 const applyPrimaryKeyGeneration = (tableMetadata, column) => {
 	if (!column.primary || !column.primaryKeyGeneration) {
@@ -1756,6 +1800,21 @@ const applyPrimaryKeyGeneration = (tableMetadata, column) => {
 		...column.primaryKeyGeneration
 	};
 };
+const applyTimestampColumn = (tableMetadata, column) => {
+	if (column.type !== "timestamp" || column.default !== "now()" && column.updatedAt !== true) {
+		if (tableMetadata.timestampColumns) {
+			tableMetadata.timestampColumns = tableMetadata.timestampColumns.filter((entry) => entry.column !== column.name);
+			if (tableMetadata.timestampColumns.length === 0) delete tableMetadata.timestampColumns;
+		}
+		return;
+	}
+	const nextColumn = {
+		column: column.name,
+		...column.default === "now()" ? { default: "now()" } : {},
+		...column.updatedAt ? { updatedAt: true } : {}
+	};
+	tableMetadata.timestampColumns = [...(tableMetadata.timestampColumns ?? []).filter((entry) => entry.column !== column.name), nextColumn];
+};
 const applyOperationsToPersistedColumnMappingsState = (state, operations, features = resolvePersistedMetadataFeatures()) => {
 	const nextTables = Object.entries(state.tables).reduce((all, [table, metadata]) => {
 		all[table] = {
@@ -1764,7 +1823,8 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 				nextEnums[columnName] = [...values];
 				return nextEnums;
 			}, {}),
-			primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
+			primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0,
+			timestampColumns: metadata.timestampColumns?.map((column) => ({ ...column }))
 		};
 		return all;
 	}, {});
@@ -1778,8 +1838,9 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
 				applyPrimaryKeyGeneration(tableMetadata, column);
+				applyTimestampColumn(tableMetadata, column);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration || tableMetadata.timestampColumns?.length) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -1792,11 +1853,12 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
 				applyPrimaryKeyGeneration(tableMetadata, column);
+				applyTimestampColumn(tableMetadata, column);
 			});
 			operation.dropColumns.forEach((columnName) => {
 				removePersistedColumnMetadata(tableMetadata, columnName);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration || tableMetadata.timestampColumns?.length) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -1853,18 +1915,6 @@ const getPersistedEnumTsType = (values) => {
 	return buildEnumUnionType(values);
 };
 
-//#endregion
-//#region src/helpers/runtime-module-loader.ts
-var RuntimeModuleLoader = class {
-	static async load(filePath) {
-		const resolvedPath = resolve(filePath);
-		return await createJiti(pathToFileURL(resolvedPath).href, {
-			interopDefault: false,
-			tsconfigPaths: true
-		}).import(resolvedPath);
-	}
-};
-
 //#endregion
 //#region src/helpers/runtime-config.ts
 const resolveDefaultStubsPath = () => {
@@ -1899,41 +1949,7 @@ 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. 
 * 
@@ -1943,120 +1959,9 @@ const getUserConfig = (key) => {
 	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;
-	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;
-	configureArkormRuntime(config.prisma, {
-		adapter: config.adapter,
-		boot: config.boot,
-		features: config.features,
-		pagination: config.pagination,
-		paths: config.paths,
-		outputExt: config.outputExt
-	});
-	runtimeConfigLoaded = 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 require = createRequire(import.meta.url);
-	const syncConfigPaths = [path.join(process.cwd(), "arkormx.config.cjs")];
-	for (const configPath of syncConfigPaths) {
-		if (!existsSync$1(configPath)) continue;
-		try {
-			resolveAndApplyConfig(require(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;
-	if (loadRuntimeConfigSync()) return;
-	runtimeConfigLoadingPromise = (async () => {
-		const configPaths = [path.join(process.cwd(), "arkormx.config.js"), path.join(process.cwd(), "arkormx.config.ts")];
-		for (const configPath of configPaths) {
-			if (!existsSync$1(configPath)) continue;
-			try {
-				resolveAndApplyConfig(await importConfigFile(configPath));
-				return;
-			} catch {
-				continue;
-			}
-		}
-		runtimeConfigLoaded = true;
-	})();
-	await runtimeConfigLoadingPromise;
-};
 const getDefaultStubsPath = () => {
 	return resolveDefaultStubsPath();
 };
-loadArkormConfig();
 
 //#endregion
 //#region src/cli/CliApp.ts