@tstdl/base 0.92.62 → 0.92.63

package/orm/server/repository.js

@@ -32,6 +32,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 +48,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);
@@ -464,9 +467,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.63",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"