@tstdl/base 0.92.62 → 0.92.64

package/orm/server/repository.js

@@ -8,10 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 import { count, eq, inArray, sql } from 'drizzle-orm';
 import { PgTransaction as DrizzlePgTransaction } from 'drizzle-orm/pg-core';
 import { NotFoundError } from '../../errors/not-found.error.js';
-import { Singleton } from '../../injector/decorators.js';
+import { Optional, Singleton } from '../../injector/decorators.js';
 import { inject, injectArgument } from '../../injector/inject.js';
 import { resolveArgumentType } from '../../injector/interfaces.js';
 import { injectionToken } from '../../injector/token.js';
@@ -32,6 +35,8 @@ export class EntityRepositoryConfig {
     schema;
 }
 export const ENTITY_TYPE = injectionToken('EntityType');
+const entityTypeToken = Symbol('EntityType');
+const entityRepositoryConfigToken = Symbol('EntityRepositoryConfig');
 const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
 let EntityRepository = class EntityRepository {
     #repositoryConstructor;
@@ -46,8 +51,9 @@ let EntityRepository = class EntityRepository {
     isInTransaction;
     constructor(type, table, columnDefinitions, columnDefinitionsMap, session) {
         this.#repositoryConstructor = new.target;
-        this.type = type ?? injectArgument(this, { optional: true }) ?? inject(ENTITY_TYPE);
-        this.table = table ?? getDrizzleTableFromType(this.type, inject(EntityRepositoryConfig).schema);
+        const entityRepositoryConfig = new.target[entityRepositoryConfigToken] ?? inject(EntityRepositoryConfig);
+        this.type = type ?? injectArgument(this, { optional: true }) ?? assertDefinedPass(new.target[entityTypeToken], 'Missing entity type.');
+        this.table = table ?? getDrizzleTableFromType(this.type, entityRepositoryConfig.schema);
         this.columnDefinitions = columnDefinitions ?? getColumnDefinitions(this.table);
         this.columnDefinitionsMap = columnDefinitionsMap ?? new Map(this.columnDefinitions.map((column) => [column.objectPath.path, column]));
         this.session = session ?? inject(Database);
@@ -449,11 +455,12 @@ let EntityRepository = class EntityRepository {
     }
 };
 EntityRepository = __decorate([
-    Singleton({
-        provider: {
-            useFactory: () => new EntityRepository()
-        }
-    }),
+    Singleton(),
+    __param(0, Optional()),
+    __param(1, Optional()),
+    __param(2, Optional()),
+    __param(3, Optional()),
+    __param(4, Optional()),
     __metadata("design:paramtypes", [Object, Object, Array, Map, Object])
 ], EntityRepository);
 export { EntityRepository };
@@ -464,9 +471,10 @@ export function getRepository(type, config) {
     const className = `${type.name}Service`;
     const entityRepositoryClass = {
         [className]: class extends EntityRepository {
+            static [entityTypeToken] = type;
+            static [entityRepositoryConfigToken] = config;
         }
     }[className];
-    const injectorDecorator = Singleton({ providers: [{ provide: ENTITY_TYPE, useValue: type }, { provide: EntityRepositoryConfig, useValue: config }] });
-    injectorDecorator(entityRepositoryClass);
+    Singleton()(entityRepositoryClass);
     return entityRepositoryClass;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.62",
+  "version": "0.92.64",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"