@tstdl/base 0.93.145 → 0.93.146

package/orm/tests/repository-cti-transactions.test.js

@@ -7,19 +7,19 @@ 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);
 };
-import { beforeAll, describe, expect, test } from 'vitest';
 import { sql } from 'drizzle-orm';
+import { beforeAll, describe, expect, test } from 'vitest';
+import { Singleton } from '../../injector/decorators.js';
 import { StringProperty } from '../../schema/index.js';
+import { setupIntegrationTest } from '../../testing/index.js';
+import { ChildEntity, Column, Inheritance, Table } from '../decorators.js';
 import { Entity } from '../entity.js';
-import { Column, Inheritance, ChildEntity, Table } from '../decorators.js';
 import { getRepository } from '../server/repository.js';
-import { configureOrm, Database } from '../server/index.js';
-import { Injector, runInInjectionContext } from '../../injector/index.js';
 import { Transactional } from '../server/transactional.js';
-import { Singleton } from '../../injector/decorators.js';
 describe('ORM Repository CTI Transactions (Integration)', () => {
     let injector;
     let db;
+    let service;
     const schema = 'test_orm_cti_transactions';
     let Parent = class Parent extends Entity {
         type;
@@ -66,18 +66,10 @@ describe('ORM Repository CTI Transactions (Integration)', () => {
         Singleton()
     ], TestService);
     beforeAll(async () => {
-        injector = new Injector('Test');
-        configureOrm({
-            repositoryConfig: { schema },
-            connection: {
-                host: '127.0.0.1',
-                port: 5432,
-                user: 'tstdl',
-                password: 'wf7rq6glrk5jykne',
-                database: 'tstdl',
-            }
-        });
-        db = injector.resolve(Database);
+        ({ injector, database: db } = await setupIntegrationTest({
+            orm: { schema },
+        }));
+        service = injector.resolve(TestService);
         await db.execute(sql `CREATE SCHEMA IF NOT EXISTS ${sql.identifier(schema)}`);
         await db.execute(sql `DROP TABLE IF EXISTS ${sql.identifier(schema)}.${sql.identifier('children')} CASCADE`);
         await db.execute(sql `DROP TABLE IF EXISTS ${sql.identifier(schema)}.${sql.identifier('parents')} CASCADE`);
@@ -104,23 +96,17 @@ describe('ORM Repository CTI Transactions (Integration)', () => {
     `);
     });
     test('should rollback inheritance inserts across multiple tables on service error', async () => {
-        await runInInjectionContext(injector, async () => {
-            const service = injector.resolve(TestService);
-            await expect(service.createTwo('ShouldRollback', 'Fails', true)).rejects.toThrow('Planned failure');
-            const { rows: parentRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('parents')}`);
-            const { rows: childRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('children')}`);
-            expect(parentRows).toHaveLength(0);
-            expect(childRows).toHaveLength(0);
-        });
+        await expect(service.createTwo('ShouldRollback', 'Fails', true)).rejects.toThrow('Planned failure');
+        const { rows: parentRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('parents')}`);
+        const { rows: childRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('children')}`);
+        expect(parentRows).toHaveLength(0);
+        expect(childRows).toHaveLength(0);
     });
     test('should commit inheritance inserts across multiple tables on success', async () => {
-        await runInInjectionContext(injector, async () => {
-            const service = injector.resolve(TestService);
-            await service.createTwo('C1', 'C2', false);
-            const { rows: parentRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('parents')}`);
-            const { rows: childRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('children')}`);
-            expect(parentRows).toHaveLength(2);
-            expect(childRows).toHaveLength(2);
-        });
+        await service.createTwo('C1', 'C2', false);
+        const { rows: parentRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('parents')}`);
+        const { rows: childRows } = await db.execute(sql `SELECT * FROM ${sql.identifier(schema)}.${sql.identifier('children')}`);
+        expect(parentRows).toHaveLength(2);
+        expect(childRows).toHaveLength(2);
     });
 });

package/orm/tests/repository-cti-upsert-many.test.d.ts

@@ -1 +1,2 @@
+/** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 export {};

package/orm/tests/repository-cti-upsert-many.test.js

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 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);
@@ -9,15 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { sql } from 'drizzle-orm';
 import { beforeAll, describe, expect, test } from 'vitest';
-import { Injector, runInInjectionContext } from '../../injector/index.js';
 import { StringProperty } from '../../schema/index.js';
+import { setupIntegrationTest } from '../../testing/index.js';
 import { ChildEntity, Column, Inheritance, Table } from '../decorators.js';
 import { Entity } from '../entity.js';
-import { configureOrm, Database } from '../server/index.js';
-import { injectRepository } from '../server/repository.js';
+import { getRepository } from '../server/index.js';
 describe('ORM Repository CTI UpsertMany (Integration)', () => {
     let injector;
     let db;
+    let itemRepo;
+    let bookRepo;
     const schema = 'test_orm_cti_upsert_many';
     let Item = class Item extends Entity {
         type;
@@ -48,18 +50,11 @@ describe('ORM Repository CTI UpsertMany (Integration)', () => {
         ChildEntity('book')
     ], Book);
     beforeAll(async () => {
-        injector = new Injector('Test');
-        configureOrm({
-            repositoryConfig: { schema },
-            connection: {
-                host: '127.0.0.1',
-                port: 5432,
-                user: 'tstdl',
-                password: 'wf7rq6glrk5jykne',
-                database: 'tstdl',
-            }
-        });
-        db = injector.resolve(Database);
+        ({ injector, database: db } = await setupIntegrationTest({
+            orm: { schema },
+        }));
+        itemRepo = injector.resolve(getRepository(Item));
+        bookRepo = injector.resolve(getRepository(Book));
         await db.execute(sql `CREATE SCHEMA IF NOT EXISTS ${sql.identifier(schema)}`);
         await db.execute(sql `DROP TABLE IF EXISTS ${sql.identifier(schema)}.${sql.identifier('books')} CASCADE`);
         await db.execute(sql `DROP TABLE IF EXISTS ${sql.identifier(schema)}.${sql.identifier('items')} CASCADE`);
@@ -86,42 +81,35 @@ describe('ORM Repository CTI UpsertMany (Integration)', () => {
     `);
     });
     test('should upsertMany child entities (insert and update mixed)', async () => {
-        await runInInjectionContext(injector, async () => {
-            const bookRepo = injectRepository(Book);
-            // 1. Insert initial books
-            const book1 = Object.assign(new Book(), { title: 'Book 1', author: 'Author 1' });
-            const book2 = Object.assign(new Book(), { title: 'Book 2', author: 'Author 2' });
-            const [inserted1, inserted2] = await bookRepo.insertMany([book1, book2]);
-            // 2. Prepare upsert payload: update book1, new book3
-            const update1 = Object.assign(new Book(), { id: inserted1.id, title: 'Book 1 Updated', author: 'Author 1 Updated' });
-            const book3 = Object.assign(new Book(), { title: 'Book 3', author: 'Author 3' });
-            const results = await bookRepo.upsertMany('id', [update1, book3]);
-            expect(results).toHaveLength(2);
-            const updated1 = results.find((b) => b.id === inserted1.id);
-            const inserted3 = results.find((b) => b.title === 'Book 3');
-            expect(updated1).toBeDefined();
-            expect(updated1.title).toBe('Book 1 Updated');
-            expect(updated1.author).toBe('Author 1 Updated');
-            expect(inserted3).toBeDefined();
-            expect(inserted3.id).toBeDefined();
-            expect(inserted3.author).toBe('Author 3');
-            // Verify book2 is untouched
-            const loaded2 = await bookRepo.load(inserted2.id);
-            expect(loaded2.title).toBe('Book 2');
-        });
+        // 1. Insert initial books
+        const book1 = Object.assign(new Book(), { title: 'Book 1', author: 'Author 1' });
+        const book2 = Object.assign(new Book(), { title: 'Book 2', author: 'Author 2' });
+        const [inserted1, inserted2] = await bookRepo.insertMany([book1, book2]);
+        // 2. Prepare upsert payload: update book1, new book3
+        const update1 = Object.assign(new Book(), { id: inserted1.id, title: 'Book 1 Updated', author: 'Author 1 Updated' });
+        const book3 = Object.assign(new Book(), { title: 'Book 3', author: 'Author 3' });
+        const results = await bookRepo.upsertMany('id', [update1, book3]);
+        expect(results).toHaveLength(2);
+        const updated1 = results.find((b) => b.id === inserted1.id);
+        const inserted3 = results.find((b) => b.title === 'Book 3');
+        expect(updated1).toBeDefined();
+        expect(updated1.title).toBe('Book 1 Updated');
+        expect(updated1.author).toBe('Author 1 Updated');
+        expect(inserted3).toBeDefined();
+        expect(inserted3.id).toBeDefined();
+        expect(inserted3.author).toBe('Author 3');
+        // Verify book2 is untouched
+        const loaded2 = await bookRepo.load(inserted2.id);
+        expect(loaded2.title).toBe('Book 2');
     });
     test('should polymorphic tryLoadByQuery', async () => {
-        await runInInjectionContext(injector, async () => {
-            const itemRepo = injectRepository(Item);
-            const bookRepo = injectRepository(Book);
-            await bookRepo.insert(Object.assign(new Book(), { title: 'Unique Book', author: 'Unique Author' }));
-            // Load via Item repo using a book-specific property (should fail if not joined, but here we query by title)
-            // Querying by book-specific property requires casting query or using raw sql if repository type doesn't have it.
-            // But we can query by base property 'title'.
-            const loaded = await itemRepo.tryLoadByQuery({ title: 'Unique Book' }, { includeSubclasses: true });
-            expect(loaded).toBeDefined();
-            expect(loaded).toBeInstanceOf(Book);
-            expect(loaded.author).toBe('Unique Author');
-        });
+        await bookRepo.insert(Object.assign(new Book(), { title: 'Unique Book', author: 'Unique Author' }));
+        // Load via Item repo using a book-specific property (should fail if not joined, but here we query by title)
+        // Querying by book-specific property requires casting query or using raw sql if repository type doesn't have it.
+        // But we can query by base property 'title'.
+        const loaded = await itemRepo.tryLoadByQuery({ title: 'Unique Book' }, { includeSubclasses: true });
+        expect(loaded).toBeDefined();
+        expect(loaded).toBeInstanceOf(Book);
+        expect(loaded.author).toBe('Unique Author');
     });
 });

package/orm/tests/repository-cti.test.d.ts

@@ -1 +1,2 @@
+/** biome-ignore-all lint/nursery/noExcessiveClassesPerFile: <explanation> */
 export {};