@cheetah.js/orm 0.1.61 → 0.1.63

package/dist/domain/entities.js

@@ -24,7 +24,7 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         this.entities.set(entity.target, {
             properties: properties,
             hideProperties: Object.entries(properties)
-                .filter(([key, value]) => value.options.hidden)
+                .filter(([_key, value]) => value.options.hidden)
                 .map(([key]) => key),
             relations,
             indexes: indexes.map((index) => {
@@ -57,7 +57,7 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         };
     }
     snapshotColumns(values) {
-        let properties = Object.entries(values.properties).map(([key, value]) => {
+        let properties = Object.entries(values.properties).map(([_key, value]) => {
             return {
                 name: value.options.columnName,
                 type: value.options.dbType ?? value.type.name,
@@ -107,7 +107,7 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         return [...properties, ...relations];
     }
     snapshotIndexes(values) {
-        return Object.entries(values.properties).map(([key, value]) => {
+        return Object.entries(values.properties).map(([key, _value]) => {
             return {
                 indexName: key,
                 columnName: key,
@@ -120,7 +120,15 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         if (!entity) {
             return "unknown";
         }
-        return entity.properties[this.getFkKey(relation)].type.name;
+        const foreignKey = this.getFkKey(relation);
+        const property = entity.properties[foreignKey];
+        if (!property) {
+            return "unknown";
+        }
+        if (property.options?.dbType) {
+            return property.options.dbType;
+        }
+        return property.type?.name ?? "unknown";
     }
     getFkIncrement(relation) {
         const entity = this.get(relation.entity());
@@ -138,7 +146,7 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
         // se for nullable, deverá retornar o primary key da entidade target
         if (typeof relationShip.fkKey === "undefined") {
             const entity = this.entities.get(relationShip.entity());
-            const property = Object.entries(entity.properties).find(([key, value]) => value.options.isPrimary === true);
+            const property = Object.entries(entity.properties).find(([_key, value]) => value.options.isPrimary === true);
             if (!property) {
                 throw new Error(`Entity ${entity.tableName} does not have a primary key`);
             }

package/dist/orm.service.js

@@ -237,22 +237,43 @@ let OrmService = class OrmService {
         });
     }
     async onInit(customConfig = {}) {
-        const configFile = globby.sync('cheetah.config.ts', { absolute: true });
-        if (configFile.length === 0) {
-            console.log('No config file found!');
-            return;
+        const hasCustomConfig = Object.keys(customConfig).length > 0;
+        let config = null;
+        let setConfig;
+        if (!hasCustomConfig) {
+            const configFile = globby.sync('cheetah.config.ts', { absolute: true });
+            if (configFile.length === 0) {
+                console.log('No config file found!');
+                return;
+            }
+            config = await Promise.resolve(`${configFile[0]}`).then(s => __importStar(require(s)));
+            setConfig = config.default;
+        }
+        else {
+            setConfig = customConfig;
         }
-        const config = await Promise.resolve(`${configFile[0]}`).then(s => __importStar(require(s)));
-        const setConfig = Object.keys(customConfig).length > 0 ? customConfig : config.default;
         this.orm.setConnection(setConfig);
         await this.orm.connect();
-        if (typeof config.default.entities === 'string') {
+        if (config && typeof config.default.entities === 'string') {
             const files = globby.sync([config.default.entities, '!node_modules'], { gitignore: true, absolute: true });
             for (const file of files) {
                 await Promise.resolve(`${file}`).then(s => __importStar(require(s)));
             }
         }
-        const entities = core_1.Metadata.get(constants_1.ENTITIES, Reflect);
+        let entities = core_1.Metadata.get(constants_1.ENTITIES, Reflect);
+        if (!entities) {
+            const entityPaths = this.getSourceFilePaths();
+            const entityFiles = globby.sync(entityPaths.filter(path => path.includes('.entity.') || path.includes('entities/')));
+            for (const file of entityFiles) {
+                try {
+                    await Promise.resolve(`${file}`).then(s => __importStar(require(s)));
+                }
+                catch (error) {
+                    console.warn(`Failed to import entity file ${file}:`, error);
+                }
+            }
+            entities = core_1.Metadata.get(constants_1.ENTITIES, Reflect);
+        }
         if (!entities) {
             console.log('No entities found!');
             return;

package/dist/testing/with-database.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,6 +76,12 @@ function selectLogger(options) {
 }
 async function initializeOrm(orm, options) {
     const storage = new entities_1.EntityStorage();
+    if (options.entityFile) {
+        const entityFiles = await (0, globby_1.default)(options.entityFile, { absolute: true });
+        for (const file of entityFiles) {
+            await Promise.resolve(`${file}`).then(s => __importStar(require(s)));
+        }
+    }
     const service = new orm_service_1.OrmService(orm, storage, options.entityFile);
     const connection = resolveConnection(options.connection);
     await service.onInit(connection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "b73d2cb98381f2f14ea460e24f4fec5469106235"
+  "gitHead": "b81c351dba661381729aa4aa04985276596f4ac9"
 }