@tstdl/base 0.92.54 → 0.92.55

package/authentication/models/index.d.ts

@@ -1,6 +1,7 @@
 export * from './authentication-credentials.model.js';
 export * from './authentication-session.model.js';
 export * from './init-secret-reset-data.model.js';
+export * from './schemas.js';
 export * from './secret-check-result.model.js';
 export * from './token-payload-base.model.js';
 export * from './token.model.js';

package/authentication/models/index.js

@@ -1,6 +1,7 @@
 export * from './authentication-credentials.model.js';
 export * from './authentication-session.model.js';
 export * from './init-secret-reset-data.model.js';
+export * from './schemas.js';
 export * from './secret-check-result.model.js';
 export * from './token-payload-base.model.js';
 export * from './token.model.js';

package/document-management/server/drizzle/{0000_wakeful_firebrand.sql → 0000_sloppy_fenris.sql}

@@ -1,4 +1,4 @@
-CREATE TYPE "document_management"."document_property_data_type" AS ENUM('0', '1', '2', '3');--> statement-breakpoint
+CREATE TYPE "document_management"."document_property_data_type" AS ENUM('text', 'integer', 'decimal', 'boolean');--> statement-breakpoint
 CREATE TABLE "document_management"."document" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
 	"file_id" uuid NOT NULL,

package/document-management/server/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "dc8f7b3d-dc7e-4e13-b4f0-239d726d3307",
+  "id": "8b44dbd1-5662-4e8f-9a42-3057c61bdaa3",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -1518,10 +1518,10 @@
       "name": "document_property_data_type",
       "schema": "document_management",
       "values": [
-        "0",
-        "1",
-        "2",
-        "3"
+        "text",
+        "integer",
+        "decimal",
+        "boolean"
       ]
     }
   },

package/document-management/server/drizzle/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1735923279239,
-      "tag": "0000_wakeful_firebrand",
+      "when": 1739990257563,
+      "tag": "0000_sloppy_fenris",
       "breakpoints": true
     }
   ]

package/mail/drizzle/0000_empty_jubilee.sql

@@ -0,0 +1,13 @@
+CREATE TABLE "mail"."mail_log" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"timestamp" timestamp with time zone NOT NULL,
+	"template" text,
+	"data" jsonb NOT NULL,
+	"send_result" jsonb,
+	"errors" text[],
+	"revision" integer NOT NULL,
+	"revision_timestamp" timestamp with time zone NOT NULL,
+	"create_timestamp" timestamp with time zone NOT NULL,
+	"delete_timestamp" timestamp with time zone,
+	"attributes" jsonb DEFAULT '{}'::jsonb NOT NULL
+);

package/mail/drizzle/meta/0000_snapshot.json

@@ -0,0 +1,100 @@
+{
+  "id": "a6ce7d17-ce0b-4511-b503-b2ac69ff8923",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "mail.mail_log": {
+      "name": "mail_log",
+      "schema": "mail",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "template": {
+          "name": "template",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "send_result": {
+          "name": "send_result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "errors": {
+          "name": "errors",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revision": {
+          "name": "revision",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "revision_timestamp": {
+          "name": "revision_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "create_timestamp": {
+          "name": "create_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "delete_timestamp": {
+          "name": "delete_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attributes": {
+          "name": "attributes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}

package/mail/drizzle/meta/_journal.json

@@ -0,0 +1,13 @@
+{
+  "version": "7",
+  "dialect": "postgresql",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "7",
+      "when": 1739990201071,
+      "tag": "0000_empty_jubilee",
+      "breakpoints": true
+    }
+  ]
+}

package/mail/drizzle.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("drizzle-kit").Config;
+export default _default;

package/mail/drizzle.config.js

@@ -0,0 +1,11 @@
+import { relative, resolve } from 'node:path';
+import { defineConfig } from 'drizzle-kit';
+export default defineConfig({
+    dialect: 'postgresql',
+    out: relative('./', resolve(__dirname, './drizzle/').replace('dist', 'source')),
+    schema: resolve(__dirname, './models/schemas.js'),
+    migrations: {
+        schema: 'authentication',
+        table: '_migrations'
+    }
+});

package/mail/index.d.ts

@@ -8,5 +8,4 @@ export * from './mail.client.js';
 export * from './mail.service.js';
 export * from './models/index.js';
 export * from './module.js';
-export * from './repositories/index.js';
 export * from './tokens.js';

package/mail/index.js

@@ -8,5 +8,4 @@ export * from './mail.client.js';
 export * from './mail.service.js';
 export * from './models/index.js';
 export * from './module.js';
-export * from './repositories/index.js';
 export * from './tokens.js';

package/mail/mail.service.d.ts

@@ -1,6 +1,6 @@
 import type { TypedOmit } from '../types.js';
 import { MailClientConfig } from './mail.client.js';
-import type { MailData, MailSendResult, MailTemplate } from './models/index.js';
+import { type MailData, type MailSendResult, type MailTemplate } from './models/index.js';
 export declare class MailService {
     #private;
     send(mailData: MailData, clientConfig?: MailClientConfig): Promise<MailSendResult>;

package/mail/mail.service.js

@@ -4,19 +4,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { Singleton, inject } from '../injector/index.js';
+import { Singleton, inject, provide } from '../injector/index.js';
 import { Logger } from '../logger/index.js';
+import { DatabaseConfig, EntityRepositoryConfig, injectRepository } from '../orm/server/index.js';
 import { TemplateService } from '../templates/template.service.js';
 import { currentTimestamp } from '../utils/date-time.js';
 import { formatError } from '../utils/format-error.js';
-import { assertDefined, isDefined } from '../utils/type-guards.js';
+import { assertDefined } from '../utils/type-guards.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
+import { MailLog } from './models/index.js';
+import { MailModuleConfig } from './module.js';
 import { MAIL_DEFAULT_DATA } from './tokens.js';
 let MailService = class MailService {
     #mailClient = inject(MailClient);
     #templateService = inject(TemplateService);
-    #mailLogRepository = inject(MailLogRepository, undefined, { optional: true });
+    #mailLogRepository = injectRepository(MailLog);
     #defaultClientConfig = inject(MailClientConfig, undefined, { optional: true });
     #defaultData = inject(MAIL_DEFAULT_DATA, undefined, { optional: true });
     #logger = inject(Logger, 'MailService');
@@ -26,28 +28,21 @@ let MailService = class MailService {
         assertDefined(clientConfig, 'No mail client config provided.');
         const data = { ...this.#defaultData, ...mailData };
         let mailLog;
-        if (isDefined(this.#mailLogRepository)) {
-            const log = {
-                timestamp: currentTimestamp(),
-                template: templateName ?? null,
-                data,
-                sendResult: null,
-                errors: null
-            };
-            mailLog = await this.#mailLogRepository.insert(log);
-        }
+        mailLog = await this.#mailLogRepository.insert({
+            timestamp: currentTimestamp(),
+            template: templateName ?? null,
+            data,
+            sendResult: null,
+            errors: null
+        });
         try {
             const result = await this.#mailClient.send(data, clientConfig);
-            if (isDefined(mailLog)) {
-                await this.#mailLogRepository.patch(mailLog, { sendResult: result });
-            }
+            await this.#mailLogRepository.update(mailLog.id, { sendResult: result });
             return result;
         }
         catch (error) {
             try {
-                if (isDefined(mailLog)) {
-                    await this.#mailLogRepository.patch(mailLog, { errors: [formatError(error)] });
-                }
+                await this.#mailLogRepository.update(mailLog.id, { errors: [formatError(error)] });
             }
             catch (logError) {
                 this.#logger.error(logError);
@@ -62,6 +57,11 @@ let MailService = class MailService {
     }
 };
 MailService = __decorate([
-    Singleton()
+    Singleton({
+        providers: [
+            provide(EntityRepositoryConfig, { useValue: { schema: 'mail' } }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) })
+        ]
+    })
 ], MailService);
 export { MailService };

package/mail/models/index.d.ts

@@ -4,3 +4,4 @@ export * from './mail-data.model.js';
 export * from './mail-log.model.js';
 export * from './mail-send-result.model.js';
 export * from './mail-template.model.js';
+export * from './schemas.js';

package/mail/models/index.js

@@ -4,3 +4,4 @@ export * from './mail-data.model.js';
 export * from './mail-log.model.js';
 export * from './mail-send-result.model.js';
 export * from './mail-template.model.js';
+export * from './schemas.js';

package/mail/models/mail-log.model.d.ts

@@ -1,11 +1,10 @@
-import type { Entity, NewEntity } from '../../database/index.js';
+import { Entity, Json, Timestamp } from '../../orm/index.js';
 import type { MailData } from './mail-data.model.js';
 import type { MailSendResult } from './mail-send-result.model.js';
-export type MailLog = Entity & {
-    timestamp: number;
+export declare class MailLog extends Entity {
+    timestamp: Timestamp;
     template: string | null;
-    data: MailData;
-    sendResult: MailSendResult | null;
+    data: Json<MailData>;
+    sendResult: Json<MailSendResult> | null;
     errors: string[] | null;
-};
-export type NewMailLog = NewEntity<MailLog>;
+}

package/mail/models/mail-log.model.js

@@ -1 +1,38 @@
-export {};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { Entity, Json, Timestamp } from '../../orm/index.js';
+import { StringProperty } from '../../schema/index.js';
+export class MailLog extends Entity {
+    timestamp;
+    template;
+    data;
+    sendResult;
+    errors;
+}
+__decorate([
+    Timestamp(),
+    __metadata("design:type", Number)
+], MailLog.prototype, "timestamp", void 0);
+__decorate([
+    StringProperty({ nullable: true }),
+    __metadata("design:type", Object)
+], MailLog.prototype, "template", void 0);
+__decorate([
+    Json(),
+    __metadata("design:type", Object)
+], MailLog.prototype, "data", void 0);
+__decorate([
+    Json({ nullable: true }),
+    __metadata("design:type", Object)
+], MailLog.prototype, "sendResult", void 0);
+__decorate([
+    StringProperty({ array: true, nullable: true }),
+    __metadata("design:type", Object)
+], MailLog.prototype, "errors", void 0);

package/mail/models/schemas.d.ts

@@ -0,0 +1,3 @@
+import { MailLog } from './mail-log.model.js';
+export declare const mailSchema: import("../../orm/server/database-schema.js").DatabaseSchema<"mail">;
+export declare const mailLog: import("../../orm/server/drizzle/schema-converter.js").PgTableFromType<"mail", typeof MailLog>;

package/mail/models/schemas.js

@@ -0,0 +1,4 @@
+import { databaseSchema } from '../../orm/server/database-schema.js';
+import { MailLog } from './mail-log.model.js';
+export const mailSchema = databaseSchema('mail');
+export const mailLog = mailSchema.getTable(MailLog);

package/mail/module.d.ts

@@ -1,14 +1,15 @@
+import { type DatabaseConfig } from '../orm/server/index.js';
 import type { Type } from '../types.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
 import type { DefaultMailData } from './models/index.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
-export type MailModuleConfig = {
-    defaultClientConfig: MailClientConfig;
-    client: Type<MailClient>;
-    logRepository: Type<MailLogRepository>;
-    defaultData: DefaultMailData;
-};
+export declare class MailModuleConfig {
+    database?: DatabaseConfig;
+    defaultClientConfig?: MailClientConfig;
+    client?: Type<MailClient>;
+    defaultData?: DefaultMailData;
+}
 /**
  * configure mail module
  */
-export declare function configureMail({ defaultClientConfig, client, logRepository, defaultData }: Partial<MailModuleConfig>): void;
+export declare function configureMail(config: MailModuleConfig): void;
+export declare function migrateMailSchema(): Promise<void>;

package/mail/module.js

@@ -1,22 +1,36 @@
+import { inject } from '../injector/index.js';
 import { Injector } from '../injector/injector.js';
+import { Database, migrate } from '../orm/server/index.js';
 import { isDefined } from '../utils/type-guards.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MAIL_DEFAULT_DATA } from './tokens.js';
+export class MailModuleConfig {
+    database;
+    defaultClientConfig;
+    client;
+    defaultData;
+}
 /**
  * configure mail module
  */
-export function configureMail({ defaultClientConfig, client, logRepository, defaultData }) {
-    if (isDefined(defaultClientConfig)) {
-        Injector.registerSingleton(MailClientConfig, { useValue: defaultClientConfig });
-    }
-    if (isDefined(client)) {
-        Injector.registerSingleton(MailClient, { useToken: client });
+export function configureMail(config) {
+    Injector.register(MailModuleConfig, { useValue: config });
+    if (isDefined(config.defaultClientConfig)) {
+        Injector.registerSingleton(MailClientConfig, { useValue: config.defaultClientConfig });
     }
-    if (isDefined(logRepository)) {
-        Injector.registerSingleton(MailLogRepository, { useToken: logRepository });
+    if (isDefined(config.client)) {
+        Injector.registerSingleton(MailClient, { useToken: config.client });
     }
-    if (isDefined(defaultData)) {
-        Injector.registerSingleton(MAIL_DEFAULT_DATA, { useValue: defaultData });
+    if (isDefined(config.defaultData)) {
+        Injector.registerSingleton(MAIL_DEFAULT_DATA, { useValue: config.defaultData });
     }
 }
+export async function migrateMailSchema() {
+    const connection = inject(MailModuleConfig, undefined, { optional: true })?.database?.connection;
+    const database = inject(Database, connection);
+    await migrate(database, {
+        migrationsSchema: 'mail',
+        migrationsTable: '_migrations',
+        migrationsFolder: import.meta.resolve('./drizzle').replace('file://', '')
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.54",
+  "version": "0.92.55",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,14 @@
     "pub": "npm run build:production && rm -vf dist/test* && rm -vrf dist/tools/ && npm publish dist/",
     "tsc:watch": "tsc --watch",
     "tsc-alias:watch": "tsc-alias --watch",
-    "generate:orm": "npm run generate:drizzle:document-management && npm run generate:drizzle:authentication",
+    "generate:orm": "npm run generate:drizzle:document-management && npm run generate:drizzle:authentication && npm run generate:drizzle:mail",
     "generate:drizzle:document-management": "drizzle-kit generate --config dist/document-management/server/drizzle.config.js",
     "generate:drizzle:authentication": "drizzle-kit generate --config dist/authentication/server/drizzle.config.js",
-    "copy:orm": "npm run copy:document-management && npm run copy:authentication",
+    "generate:drizzle:mail": "drizzle-kit generate --config dist/mail/drizzle.config.js",
+    "copy:orm": "npm run copy:document-management && npm run copy:authentication && npm run copy:mail",
     "copy:document-management": "rm -rf ./dist/document-management/server/drizzle && cp -r ./source/document-management/server/drizzle ./dist/document-management/server/",
-    "copy:authentication": "rm -rf ./dist/authentication/server/drizzle && cp -r ./source/authentication/server/drizzle ./dist/authentication/server/"
+    "copy:authentication": "rm -rf ./dist/authentication/server/drizzle && cp -r ./source/authentication/server/drizzle ./dist/authentication/server/",
+    "copy:mail": "rm -rf ./dist/mail/drizzle && cp -r ./source/mail/drizzle ./dist/mail/"
   },
   "exports": {
     "./tsconfig.json": "./tsconfig.json",

package/mail/repositories/index.d.ts

@@ -1,2 +0,0 @@
-export * from './mail-log.repository.js';
-export * from './mongo/index.js';

package/mail/repositories/index.js

@@ -1,2 +0,0 @@
-export * from './mail-log.repository.js';
-export * from './mongo/index.js';

package/mail/repositories/mail-log.repository.d.ts

@@ -1,4 +0,0 @@
-import { EntityRepository } from '../../database/index.js';
-import type { MailLog } from '../models/mail-log.model.js';
-export declare abstract class MailLogRepository extends EntityRepository<MailLog> {
-}

package/mail/repositories/mail-log.repository.js

@@ -1,3 +0,0 @@
-import { EntityRepository } from '../../database/index.js';
-export class MailLogRepository extends EntityRepository {
-}

package/mail/repositories/mongo/index.d.ts

@@ -1 +0,0 @@
-export * from './mongo-mail-log.repository.js';

package/mail/repositories/mongo/index.js

@@ -1 +0,0 @@
-export * from './mongo-mail-log.repository.js';

package/mail/repositories/mongo/mongo-mail-log.repository.d.ts

@@ -1,16 +0,0 @@
-import type { CollectionArgument } from '../../../database/mongo/index.js';
-import { Collection, MongoEntityRepository } from '../../../database/mongo/index.js';
-import { resolveArgumentType } from '../../../injector/index.js';
-import type { Resolvable } from '../../../injector/interfaces.js';
-import { Logger } from '../../../logger/index.js';
-import type { MailLog } from '../../models/mail-log.model.js';
-export type MongoMailLogRepositoryConfig = {
-    config?: MongoMailLogRepositoryArgument;
-};
-export type MongoMailLogRepositoryArgument = CollectionArgument<MailLog>;
-export declare const mongoMailLogRepositoryConfig: MongoMailLogRepositoryConfig;
-export declare class MongoMailLogRepository extends MongoEntityRepository<MailLog> implements Resolvable<MongoMailLogRepositoryArgument> {
-    readonly [resolveArgumentType]: MongoMailLogRepositoryArgument;
-    constructor(collection: Collection<MailLog>, logger: Logger);
-}
-export declare function configureMongoMailLogRepository(config?: Partial<MongoMailLogRepositoryConfig>): void;

package/mail/repositories/mongo/mongo-mail-log.repository.js

@@ -1,33 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-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 { Collection, MongoEntityRepository, noopTransformer } from '../../../database/mongo/index.js';
-import { ForwardArg, Singleton, resolveArgumentType } from '../../../injector/index.js';
-import { Logger } from '../../../logger/index.js';
-export const mongoMailLogRepositoryConfig = {};
-const indexes = [];
-let MongoMailLogRepository = class MongoMailLogRepository extends MongoEntityRepository {
-    constructor(collection, logger) {
-        super(collection, noopTransformer, { logger, indexes });
-    }
-};
-MongoMailLogRepository = __decorate([
-    Singleton({
-        defaultArgumentProvider: () => mongoMailLogRepositoryConfig.config
-    }),
-    __param(0, ForwardArg()),
-    __metadata("design:paramtypes", [Collection, Logger])
-], MongoMailLogRepository);
-export { MongoMailLogRepository };
-export function configureMongoMailLogRepository(config = {}) {
-    mongoMailLogRepositoryConfig.config = config.config ?? mongoMailLogRepositoryConfig.config;
-}