@cheetah.js/orm 0.1.132 → 0.1.136

package/dist/decorators/one-many.decorator.d.ts

@@ -1,3 +1,6 @@
 import { EntityName } from '../driver/driver.interface';
+import { PropertyOptions } from './property.decorator';
 export declare function OneToMany<T>(entity: () => EntityName<T>, fkKey: (string & keyof T) | ((e: T) => any)): PropertyDecorator;
-export declare function ManyToOne<T>(entity?: () => EntityName<T>): PropertyDecorator;
+type ManyToOneOptions = Partial<PropertyOptions>;
+export declare function ManyToOne<T>(entityOrOptions?: (() => EntityName<T>) | ManyToOneOptions, maybeOptions?: ManyToOneOptions): PropertyDecorator;
+export {};

package/dist/decorators/one-many.decorator.js

@@ -5,6 +5,7 @@ exports.ManyToOne = ManyToOne;
 const constants_1 = require("../constants");
 const core_1 = require("@cheetah.js/core");
 const utils_1 = require("../utils");
+const index_decorator_1 = require("./index.decorator");
 function OneToMany(entity, fkKey) {
     return (target, propertyKey) => {
         const existing = core_1.Metadata.get(constants_1.PROPERTIES_RELATIONS, target.constructor) || [];
@@ -15,14 +16,27 @@ function OneToMany(entity, fkKey) {
         core_1.Metadata.set(constants_1.PROPERTIES_RELATIONS, existing, target.constructor);
     };
 }
-function ManyToOne(entity) {
+function ManyToOne(entityOrOptions, maybeOptions) {
     return (target, propertyKey) => {
         const existing = core_1.Metadata.get(constants_1.PROPERTIES_RELATIONS, target.constructor) || [];
-        const entityValue = entity || '__AUTO_DETECT__';
-        const options = { relation: 'many-to-one', propertyKey, isRelation: true, entity: entityValue, type: core_1.Metadata.getType(target, propertyKey), originalEntity: target.constructor };
-        options['columnName'] = `${(0, utils_1.toSnakeCase)(propertyKey)}_id`;
-        // @ts-ignore
-        existing.push(options);
+        const hasEntity = typeof entityOrOptions === 'function';
+        const entity = hasEntity ? entityOrOptions : undefined;
+        const options = (!hasEntity ? entityOrOptions : maybeOptions) || {};
+        const columnName = options.columnName || `${(0, utils_1.toSnakeCase)(propertyKey)}_id`;
+        const relationOptions = {
+            relation: 'many-to-one',
+            propertyKey,
+            isRelation: true,
+            entity: entity || '__AUTO_DETECT__',
+            type: core_1.Metadata.getType(target, propertyKey),
+            originalEntity: target.constructor,
+            columnName,
+            ...options,
+        };
+        if (options.index) {
+            (0, index_decorator_1.Index)({ properties: [propertyKey] })(target, propertyKey);
+        }
+        existing.push(relationOptions);
         core_1.Metadata.set(constants_1.PROPERTIES_RELATIONS, existing, target.constructor);
     };
 }

package/dist/driver/bun-mysql.driver.js

@@ -217,13 +217,13 @@ class BunMysqlDriver extends bun_driver_base_1.BunDriverBase {
         });
     }
     async constraints(tableName, options) {
-        const result = await this.sql.unsafe(`SELECT
-        CONSTRAINT_NAME as index_name,
-        CONCAT('REFERENCES \`', REFERENCED_TABLE_NAME, '\` (\`', REFERENCED_COLUMN_NAME, '\`)') as consdef,
-        'FOREIGN KEY' as constraint_type
-       FROM information_schema.KEY_COLUMN_USAGE
-       WHERE TABLE_NAME = '${tableName}'
-         AND TABLE_SCHEMA = DATABASE()
+        const result = await this.sql.unsafe(`SELECT
+        CONSTRAINT_NAME as index_name,
+        CONCAT('REFERENCES \`', REFERENCED_TABLE_NAME, '\` (\`', REFERENCED_COLUMN_NAME, '\`)') as consdef,
+        'FOREIGN KEY' as constraint_type
+       FROM information_schema.KEY_COLUMN_USAGE
+       WHERE TABLE_NAME = '${tableName}'
+         AND TABLE_SCHEMA = DATABASE()
          AND REFERENCED_TABLE_NAME IS NOT NULL`);
         return result.map((row) => {
             return {

package/dist/driver/bun-pg.driver.js

@@ -182,8 +182,8 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
     }
     async index(tableName, options) {
         const schema = (options && options.schema) || 'public';
-        let result = await this.sql.unsafe(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
-       FROM pg_indexes
+        let result = await this.sql.unsafe(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
+       FROM pg_indexes
        WHERE tablename = '${tableName}' AND schemaname = '${schema}'`);
         result = result.filter((row) => row.index_name.includes('_pkey') || !row.column_name.includes('UNIQUE INDEX'));
         return result.map((row) => {
@@ -196,30 +196,30 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
     }
     async constraints(tableName, options) {
         const schema = (options && options.schema) || 'public';
-        const result = await this.sql.unsafe(`SELECT
-        conname AS index_name,
-        pg_get_constraintdef(pg_constraint.oid) as consdef,
-        CASE contype
-            WHEN 'c' THEN 'CHECK'
-            WHEN 'f' THEN 'FOREIGN KEY'
-            WHEN 'p' THEN 'PRIMARY KEY'
-            WHEN 'u' THEN 'UNIQUE'
-            WHEN 't' THEN 'TRIGGER'
-            WHEN 'x' THEN 'EXCLUSION'
-            ELSE 'UNKNOWN'
-            END AS constraint_type
-       FROM pg_constraint
-       where conrelid =  (
-           SELECT oid
-           FROM pg_class
-           WHERE relname = '${tableName}'
-             AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schema}')
-       )
-         AND conkey @> ARRAY(
-           SELECT attnum
-    FROM pg_attribute
-    WHERE attrelid = conrelid
-      AND attname = '${schema}'
+        const result = await this.sql.unsafe(`SELECT
+        conname AS index_name,
+        pg_get_constraintdef(pg_constraint.oid) as consdef,
+        CASE contype
+            WHEN 'c' THEN 'CHECK'
+            WHEN 'f' THEN 'FOREIGN KEY'
+            WHEN 'p' THEN 'PRIMARY KEY'
+            WHEN 'u' THEN 'UNIQUE'
+            WHEN 't' THEN 'TRIGGER'
+            WHEN 'x' THEN 'EXCLUSION'
+            ELSE 'UNKNOWN'
+            END AS constraint_type
+       FROM pg_constraint
+       where conrelid =  (
+           SELECT oid
+           FROM pg_class
+           WHERE relname = '${tableName}'
+             AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schema}')
+       )
+         AND conkey @> ARRAY(
+           SELECT attnum
+    FROM pg_attribute
+    WHERE attrelid = conrelid
+      AND attname = '${schema}'
   )`);
         return result.map((row) => {
             return {
@@ -230,10 +230,10 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
         });
     }
     async getEnums(tableName, schema) {
-        const result = await this.sql.unsafe(`SELECT e.enumlabel as label, t.typname as type
-       FROM pg_type t
-       JOIN pg_enum e ON t.oid = e.enumtypid
-       JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+        const result = await this.sql.unsafe(`SELECT e.enumlabel as label, t.typname as type
+       FROM pg_type t
+       JOIN pg_enum e ON t.oid = e.enumtypid
+       JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
        WHERE n.nspname = '${schema}'`);
         return result.map((row) => {
             return {

package/dist/orm.js

@@ -48,6 +48,9 @@ let Orm = Orm_1 = class Orm {
         if (!this.driverInstance) {
             throw new Error('Driver instance not initialized');
         }
+        if (transaction_context_1.transactionContext.hasContext()) {
+            return operation(transaction_context_1.transactionContext.getContext());
+        }
         return this.driverInstance.transaction(async (tx) => {
             return transaction_context_1.transactionContext.run(tx, () => operation(tx));
         });

package/dist/orm.service.js

@@ -41,6 +41,9 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrmService = void 0;
 const core_1 = require("@cheetah.js/core");
@@ -49,6 +52,7 @@ const constants_1 = require("./constants");
 const ts_morph_1 = require("ts-morph");
 const orm_1 = require("./orm");
 const globby = __importStar(require("globby"));
+const path_1 = __importDefault(require("path"));
 let OrmService = class OrmService {
     constructor(orm, storage, entityFile) {
         this.orm = orm;
@@ -315,19 +319,17 @@ let OrmService = class OrmService {
         }
     }
     getSourceFilePaths() {
-        const projectRoot = process.cwd(); // Ajuste conforme a estrutura do seu projeto
-        const getAllFiles = (dir) => {
-            const patterns = [`${dir}/**/*.(ts|js)`, "!**/node_modules/**"];
-            try {
-                return globby.sync(patterns, { gitignore: true });
-            }
-            catch (error) {
-                console.error('Erro ao obter arquivos:', error);
-                return [];
-            }
-        };
-        // Filtra os arquivos pelo padrão de nomenclatura
-        return getAllFiles(projectRoot);
+        const projectRoot = process.cwd();
+        const patterns = ['**/*.ts', '**/*.js', '!**/node_modules/**'];
+        try {
+            return globby
+                .sync(patterns, { cwd: projectRoot, gitignore: true, absolute: false })
+                .map((filePath) => path_1.default.resolve(projectRoot, filePath));
+        }
+        catch (error) {
+            console.error('Erro ao obter arquivos:', error);
+            return [];
+        }
     }
 };
 exports.OrmService = OrmService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.132",
+  "version": "0.1.136",
   "description": "A simple ORM for Cheetah.js.",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "a8b11c0105b55a7b3a987246a059573ec877ab81"
+  "gitHead": "2109d17dd39ca357d6a0b48bf0b7bb08270fe8b6"
 }

package/build.d.ts

@@ -1 +0,0 @@
-export {};

package/cheetah.config.d.ts

@@ -1,3 +0,0 @@
-import { ConnectionSettings } from '@cheetah.js/orm/driver/driver.interface';
-declare const config: ConnectionSettings<any>;
-export default config;