@carno.js/orm 0.2.10 → 1.0.0

package/dist/common/value-object.js

@@ -5,7 +5,7 @@ const core_1 = require("@carno.js/core");
 class ValueObject {
     constructor(value, skipValidation = false) {
         if (!skipValidation && (!this.validate(value) || !this.validateDatabase(value))) {
-            throw new core_1.HttpException(`Invalid value for ${this.constructor.name}`, 400);
+            throw new core_1.HttpException(400, `Invalid value for ${this.constructor.name}`);
         }
         this.setValue(value);
     }
@@ -67,29 +67,29 @@ class ValueObject {
     validateDatabase(value) {
         if (typeof value === "string") {
             if (this.max !== undefined && value.length > this.max) {
-                throw new core_1.HttpException(`Value exceeds maximum length of ${this.max}`, 400);
+                throw new core_1.HttpException(400, `Value exceeds maximum length of ${this.max}`);
             }
             if (this.min !== undefined && value.length < this.min) {
-                throw new core_1.HttpException(`Value is less than minimum length of ${this.min}`, 400);
+                throw new core_1.HttpException(400, `Value is less than minimum length of ${this.min}`);
             }
         }
         else if (typeof value === "number") {
             if (this.max !== undefined && value > this.max) {
-                throw new core_1.HttpException(`Value exceeds maximum value of ${this.max}`, 400);
+                throw new core_1.HttpException(400, `Value exceeds maximum value of ${this.max}`);
             }
             if (this.min !== undefined && value < this.min) {
-                throw new core_1.HttpException(`Value is less than minimum value of ${this.min}`, 400);
+                throw new core_1.HttpException(400, `Value is less than minimum value of ${this.min}`);
             }
             if (this.precision !== undefined) {
                 const totalDigits = value.toString().replace(".", "").length;
                 if (totalDigits > this.precision) {
-                    throw new core_1.HttpException(`Value exceeds precision of ${this.precision}`, 400);
+                    throw new core_1.HttpException(400, `Value exceeds precision of ${this.precision}`);
                 }
             }
             if (this.scale !== undefined) {
                 const decimalDigits = (value.toString().split(".")[1] || "").length;
                 if (decimalDigits > this.scale) {
-                    throw new core_1.HttpException(`Value exceeds scale of ${this.scale}`, 400);
+                    throw new core_1.HttpException(400, `Value exceeds scale of ${this.scale}`);
                 }
             }
         }

package/dist/entry.d.ts

@@ -1,2 +1,2 @@
 import { Carno } from '@carno.js/core';
-export declare const CarnoOrm: Carno<import("@carno.js/core").ValidatorAdapterConstructor>;
+export declare const CarnoOrm: Carno;

package/dist/entry.js

@@ -8,6 +8,4 @@ const entities_1 = require("./domain/entities");
 const identity_map_middleware_1 = require("./middleware/identity-map.middleware");
 exports.CarnoOrm = new core_1.Carno({
     exports: [orm_1.Orm, orm_service_1.OrmService, entities_1.EntityStorage, identity_map_middleware_1.IdentityMapMiddleware],
-    providers: [identity_map_middleware_1.IdentityMapMiddleware],
-    globalMiddlewares: [identity_map_middleware_1.IdentityMapMiddleware],
 });

package/dist/index.d.ts

@@ -26,3 +26,5 @@ export * from './repository/Repository';
 export { transactionContext } from './transaction/transaction-context';
 export { IdentityMapMiddleware } from './middleware/identity-map.middleware';
 export { identityMapContext } from './identity-map';
+export type { Logger } from './logger';
+export { createLogger, setLogger, resetLogger, setDebugEnabled, ConsoleLogger, SilentLogger } from './logger';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.identityMapContext = exports.IdentityMapMiddleware = exports.transactionContext = exports.EntityStorage = void 0;
+exports.SilentLogger = exports.ConsoleLogger = exports.setDebugEnabled = exports.resetLogger = exports.setLogger = exports.createLogger = exports.identityMapContext = exports.IdentityMapMiddleware = exports.transactionContext = exports.EntityStorage = void 0;
 __exportStar(require("./decorators/entity.decorator"), exports);
 __exportStar(require("./decorators/property.decorator"), exports);
 __exportStar(require("./decorators/primary-key.decorator"), exports);
@@ -46,3 +46,10 @@ var identity_map_middleware_1 = require("./middleware/identity-map.middleware");
 Object.defineProperty(exports, "IdentityMapMiddleware", { enumerable: true, get: function () { return identity_map_middleware_1.IdentityMapMiddleware; } });
 var identity_map_1 = require("./identity-map");
 Object.defineProperty(exports, "identityMapContext", { enumerable: true, get: function () { return identity_map_1.identityMapContext; } });
+var logger_1 = require("./logger");
+Object.defineProperty(exports, "createLogger", { enumerable: true, get: function () { return logger_1.createLogger; } });
+Object.defineProperty(exports, "setLogger", { enumerable: true, get: function () { return logger_1.setLogger; } });
+Object.defineProperty(exports, "resetLogger", { enumerable: true, get: function () { return logger_1.resetLogger; } });
+Object.defineProperty(exports, "setDebugEnabled", { enumerable: true, get: function () { return logger_1.setDebugEnabled; } });
+Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return logger_1.ConsoleLogger; } });
+Object.defineProperty(exports, "SilentLogger", { enumerable: true, get: function () { return logger_1.SilentLogger; } });

package/dist/logger/console-logger.d.ts

@@ -0,0 +1,11 @@
+import type { Logger } from './logger.interface';
+/**
+ * Console-based logger fallback.
+ * Used when @carno.js/logger is not installed.
+ */
+export declare class ConsoleLogger implements Logger {
+    debug(message: string, data?: Record<string, any>): void;
+    info(message: string, data?: Record<string, any>): void;
+    warn(message: string, data?: Record<string, any>): void;
+    error(message: string, data?: Record<string, any>): void;
+}

package/dist/logger/console-logger.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConsoleLogger = void 0;
+/**
+ * Console-based logger fallback.
+ * Used when @carno.js/logger is not installed.
+ */
+class ConsoleLogger {
+    debug(message, data) {
+        console.debug(`[DEBUG] ${message}`, data ?? '');
+    }
+    info(message, data) {
+        console.info(`[INFO] ${message}`, data ?? '');
+    }
+    warn(message, data) {
+        console.warn(`[WARN] ${message}`, data ?? '');
+    }
+    error(message, data) {
+        console.error(`[ERROR] ${message}`, data ?? '');
+    }
+}
+exports.ConsoleLogger = ConsoleLogger;

package/dist/logger/index.d.ts

@@ -0,0 +1,5 @@
+import { createLogger, setLogger, resetLogger, setDebugEnabled } from './logger-factory';
+import { ConsoleLogger } from './console-logger';
+import { SilentLogger } from './silent-logger';
+export { createLogger, setLogger, resetLogger, setDebugEnabled, ConsoleLogger, SilentLogger };
+export type { Logger } from './logger.interface';

package/dist/logger/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SilentLogger = exports.ConsoleLogger = exports.setDebugEnabled = exports.resetLogger = exports.setLogger = exports.createLogger = void 0;
+const logger_factory_1 = require("./logger-factory");
+Object.defineProperty(exports, "createLogger", { enumerable: true, get: function () { return logger_factory_1.createLogger; } });
+Object.defineProperty(exports, "setLogger", { enumerable: true, get: function () { return logger_factory_1.setLogger; } });
+Object.defineProperty(exports, "resetLogger", { enumerable: true, get: function () { return logger_factory_1.resetLogger; } });
+Object.defineProperty(exports, "setDebugEnabled", { enumerable: true, get: function () { return logger_factory_1.setDebugEnabled; } });
+const console_logger_1 = require("./console-logger");
+Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return console_logger_1.ConsoleLogger; } });
+const silent_logger_1 = require("./silent-logger");
+Object.defineProperty(exports, "SilentLogger", { enumerable: true, get: function () { return silent_logger_1.SilentLogger; } });

package/dist/logger/logger-factory.d.ts

@@ -0,0 +1,21 @@
+import type { Logger } from './logger.interface';
+/**
+ * Creates or returns a cached logger instance.
+ * Tries to use @carno.js/logger if available, falls back to console.
+ * Only logs if debug is enabled in config.
+ */
+export declare function createLogger(): Logger;
+/**
+ * Sets a custom logger instance.
+ * Useful for testing or custom implementations.
+ */
+export declare function setLogger(logger: Logger): void;
+/**
+ * Resets the cached logger.
+ * Useful for testing.
+ */
+export declare function resetLogger(): void;
+/**
+ * Enables or disables debug mode programmatically.
+ */
+export declare function setDebugEnabled(enabled: boolean): void;

package/dist/logger/logger-factory.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLogger = createLogger;
+exports.setLogger = setLogger;
+exports.resetLogger = resetLogger;
+exports.setDebugEnabled = setDebugEnabled;
+const console_logger_1 = require("./console-logger");
+const silent_logger_1 = require("./silent-logger");
+let cachedLogger = null;
+let debugEnabled = null;
+/**
+ * Creates or returns a cached logger instance.
+ * Tries to use @carno.js/logger if available, falls back to console.
+ * Only logs if debug is enabled in config.
+ */
+function createLogger() {
+    if (cachedLogger) {
+        return cachedLogger;
+    }
+    if (!isDebugEnabled()) {
+        cachedLogger = new silent_logger_1.SilentLogger();
+        return cachedLogger;
+    }
+    cachedLogger = tryLoadCarnoLogger() ?? new console_logger_1.ConsoleLogger();
+    return cachedLogger;
+}
+function isDebugEnabled() {
+    if (debugEnabled !== null) {
+        return debugEnabled;
+    }
+    debugEnabled = loadDebugConfig();
+    return debugEnabled;
+}
+function loadDebugConfig() {
+    try {
+        const config = require(process.cwd() + '/carno.config');
+        return config?.debug === true || config?.default?.debug === true;
+    }
+    catch {
+        return false;
+    }
+}
+function tryLoadCarnoLogger() {
+    try {
+        const loggerModule = require('@carno.js/logger');
+        const LoggerService = loggerModule.LoggerService;
+        if (LoggerService) {
+            return new LoggerService({ level: 'DEBUG' });
+        }
+    }
+    catch {
+        // @carno.js/logger not installed
+    }
+    return null;
+}
+/**
+ * Sets a custom logger instance.
+ * Useful for testing or custom implementations.
+ */
+function setLogger(logger) {
+    cachedLogger = logger;
+}
+/**
+ * Resets the cached logger.
+ * Useful for testing.
+ */
+function resetLogger() {
+    cachedLogger = null;
+    debugEnabled = null;
+}
+/**
+ * Enables or disables debug mode programmatically.
+ */
+function setDebugEnabled(enabled) {
+    debugEnabled = enabled;
+    cachedLogger = null;
+}

package/dist/logger/logger.interface.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Logger interface for ORM.
+ * Abstracts logging to support both @carno.js/logger and console fallback.
+ */
+export interface Logger {
+    debug(message: string, data?: Record<string, any>): void;
+    info(message: string, data?: Record<string, any>): void;
+    warn(message: string, data?: Record<string, any>): void;
+    error(message: string, data?: Record<string, any>): void;
+}

package/dist/logger/logger.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/logger/silent-logger.d.ts

@@ -0,0 +1,11 @@
+import type { Logger } from './logger.interface';
+/**
+ * Silent logger that does nothing.
+ * Used when debug is disabled.
+ */
+export declare class SilentLogger implements Logger {
+    debug(): void;
+    info(): void;
+    warn(): void;
+    error(): void;
+}

package/dist/logger/silent-logger.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SilentLogger = void 0;
+/**
+ * Silent logger that does nothing.
+ * Used when debug is disabled.
+ */
+class SilentLogger {
+    debug() { }
+    info() { }
+    warn() { }
+    error() { }
+}
+exports.SilentLogger = SilentLogger;

package/dist/middleware/identity-map.middleware.d.ts

@@ -1,4 +1,4 @@
-import { CarnoMiddleware, Context } from '@carno.js/core';
+import { CarnoMiddleware, CarnoClosure, Context } from '@carno.js/core';
 export declare class IdentityMapMiddleware implements CarnoMiddleware {
-    handle(ctx: Context, next: () => void): Promise<void>;
+    handle(ctx: Context, next: CarnoClosure): Promise<void>;
 }

package/dist/middleware/identity-map.middleware.js

@@ -18,5 +18,5 @@ let IdentityMapMiddleware = class IdentityMapMiddleware {
 };
 exports.IdentityMapMiddleware = IdentityMapMiddleware;
 exports.IdentityMapMiddleware = IdentityMapMiddleware = __decorate([
-    (0, core_1.Injectable)()
+    (0, core_1.Service)()
 ], IdentityMapMiddleware);

package/dist/orm.d.ts

@@ -1,15 +1,16 @@
 import { ConnectionSettings, DriverInterface } from './driver/driver.interface';
-import { LoggerService, CacheService } from '@carno.js/core';
+import { CacheService } from '@carno.js/core';
 import { SqlBuilder } from './SqlBuilder';
 import { QueryCacheManager } from './cache/query-cache-manager';
+import { type Logger } from './logger';
 export declare class Orm<T extends DriverInterface = DriverInterface> {
-    logger: LoggerService;
     cacheService?: CacheService;
     driverInstance: T;
     static instance: Orm<any>;
     connection: ConnectionSettings<T>;
     queryCacheManager?: QueryCacheManager;
-    constructor(logger: LoggerService, cacheService?: CacheService);
+    logger: Logger;
+    constructor(cacheService?: CacheService);
     private initializeQueryCacheManager;
     static getInstance(): Orm<any>;
     setConnection(connection: ConnectionSettings<T>): void;

package/dist/orm.js

@@ -16,11 +16,12 @@ const SqlBuilder_1 = require("./SqlBuilder");
 const query_cache_manager_1 = require("./cache/query-cache-manager");
 const transaction_context_1 = require("./transaction/transaction-context");
 const orm_session_context_1 = require("./orm-session-context");
+const logger_1 = require("./logger");
 const DEFAULT_MAX_KEYS_PER_TABLE = 10000;
 let Orm = Orm_1 = class Orm {
-    constructor(logger, cacheService) {
-        this.logger = logger;
+    constructor(cacheService) {
         this.cacheService = cacheService;
+        this.logger = (0, logger_1.createLogger)();
         Orm_1.instance = this;
     }
     initializeQueryCacheManager(cacheSettings) {
@@ -67,6 +68,5 @@ let Orm = Orm_1 = class Orm {
 exports.Orm = Orm;
 exports.Orm = Orm = Orm_1 = __decorate([
     (0, core_1.Service)(),
-    __metadata("design:paramtypes", [core_1.LoggerService,
-        core_1.CacheService])
+    __metadata("design:paramtypes", [core_1.CacheService])
 ], Orm);

package/dist/query/sql-join-manager.d.ts

@@ -3,7 +3,7 @@ import { EntityStorage, Options } from '../domain/entities';
 import { SqlConditionBuilder } from './sql-condition-builder';
 import { SqlColumnManager } from './sql-column-manager';
 import { ModelTransformer } from './model-transformer';
-import { LoggerService } from '@carno.js/core';
+import type { Logger } from '../logger';
 export declare class SqlJoinManager<T> {
     private entityStorage;
     private statements;
@@ -16,7 +16,7 @@ export declare class SqlJoinManager<T> {
     private modelTransformer;
     private getOriginalColumnsCallback;
     private getAliasCallback;
-    constructor(entityStorage: EntityStorage, statements: Statement<T>, entity: Options, model: new () => T, driver: DriverInterface, logger: LoggerService, conditionBuilder: SqlConditionBuilder<T>, columnManager: SqlColumnManager, modelTransformer: ModelTransformer, getOriginalColumnsCallback: () => string[], getAliasCallback: (tableName: string) => string);
+    constructor(entityStorage: EntityStorage, statements: Statement<T>, entity: Options, model: new () => T, driver: DriverInterface, logger: Logger, conditionBuilder: SqlConditionBuilder<T>, columnManager: SqlColumnManager, modelTransformer: ModelTransformer, getOriginalColumnsCallback: () => string[], getAliasCallback: (tableName: string) => string);
     addJoinForRelationshipPath(relationshipPath: string): void;
     applyJoin(relationShip: Relationship<any>, value: FilterQuery<any>, alias: string): string;
     handleSelectJoin(entities: any, models: any): Promise<void>;

package/dist/testing/with-database.d.ts

@@ -1,7 +1,7 @@
-import { LoggerService } from '@carno.js/core';
 import { Orm } from '../orm';
 import { BunPgDriver } from '../driver/bun-pg.driver';
 import { ConnectionSettings } from '../driver/driver.interface';
+import type { Logger } from '../logger';
 export type DatabaseTestContext = {
     orm: Orm<BunPgDriver>;
     executeSql: (sql: string) => Promise<{
@@ -11,7 +11,7 @@ export type DatabaseTestContext = {
 export type DatabaseTestOptions = {
     schema?: string;
     entityFile?: string;
-    logger?: LoggerService;
+    logger?: Logger;
     connection?: Partial<ConnectionSettings<BunPgDriver>>;
 };
 type DatabaseTestRoutine = (context: DatabaseTestContext) => Promise<void>;

package/dist/testing/with-database.js

@@ -104,19 +104,11 @@ async function withDatabase(arg1, arg2, arg3) {
     });
 }
 async function createSession(options) {
-    const logger = selectLogger(options);
-    const orm = new orm_1.Orm(logger);
+    const orm = new orm_1.Orm();
     const storage = new entities_1.EntityStorage();
     await initializeOrm(orm, storage, options);
     return { orm, schema: options.schema ?? DEFAULT_SCHEMA, storage };
 }
-function selectLogger(options) {
-    if (options.logger) {
-        return options.logger;
-    }
-    const config = { applicationConfig: { logger: { level: 'info' } } };
-    return new core_1.LoggerService(config);
-}
 async function initializeOrm(orm, storage, options) {
     if (options.entityFile) {
         const entityFiles = await (0, globby_1.default)(options.entityFile, { absolute: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carno.js/orm",
-  "version": "0.2.10",
+  "version": "1.0.0",
   "description": "A simple ORM for Carno.js.",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "@carno.js/core": "^0.2.0"
+    "@carno.js/core": "^1.0.0"
   },
   "author": "",
   "license": "MIT",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "5c765c2c9172bec7f509ca2513f6c10472ec89eb"
+  "gitHead": "d2b000eeb352a03569b90d8eb2bf3557c00b741b"
 }