arkormx 2.0.0-next.4 → 2.0.0-next.5

package/dist/cli.mjs

@@ -3,10 +3,10 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync
 import { dirname, extname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { str } from "@h3ravel/support";
-import { createHash } from "node:crypto";
 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 { createHash } from "node:crypto";
 import { createJiti } from "@rexxars/jiti";
 import { pathToFileURL } from "node:url";
 import { createRequire } from "module";
@@ -1686,9 +1686,6 @@ const getPersistedTableMetadata = (table, options = {}) => {
 		}, {})
 	};
 };
-const getPersistedEnumMap = (table, options = {}) => {
-	return getPersistedTableMetadata(table, options).enums;
-};
 const applyMappedColumn = (tableColumns, column, features, table) => {
 	if (typeof column.map === "string" && column.map.trim().length > 0 && column.map !== column.name) {
 		if (!features.persistedColumnMappings) throw buildPersistedFeatureDisabledError("persistedColumnMappings", table);
@@ -2544,21 +2541,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -2723,7 +2729,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {

package/dist/index.cjs

@@ -4193,21 +4193,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -4372,7 +4381,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {

package/dist/index.d.cts

@@ -3324,13 +3324,13 @@ declare class CliApp {
   private syncPrismaEnumImports;
   private parseModelSyncSource;
   private syncModelFiles;
-  private applyPersistedEnumMetadata;
+  private applyPersistedFieldMetadata;
   /**
    * Parse Prisma enum definitions from a schema and return their member names.
    *
    * @param schema The Prisma schema source.
    * @returns      A map of enum names to their declared member names.
-   */
+      */
   private parsePrismaEnums;
   /**
    * Resolve the generated TypeScript declaration type for a Prisma field.

package/dist/index.d.mts

@@ -3324,13 +3324,13 @@ declare class CliApp {
   private syncPrismaEnumImports;
   private parseModelSyncSource;
   private syncModelFiles;
-  private applyPersistedEnumMetadata;
+  private applyPersistedFieldMetadata;
   /**
    * Parse Prisma enum definitions from a schema and return their member names.
    *
    * @param schema The Prisma schema source.
    * @returns      A map of enum names to their declared member names.
-   */
+      */
   private parsePrismaEnums;
   /**
    * Resolve the generated TypeScript declaration type for a Prisma field.

package/dist/index.mjs

@@ -4164,21 +4164,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -4343,7 +4352,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {

package/package.json

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