orchid-orm 1.5.19 → 1.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.19",
+  "version": "1.5.21",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -55,7 +55,7 @@
     "orchid-orm-schema-to-zod": "0.2.18",
     "pg": "^8.7.3",
     "pg-transactional-tests": "^1.0.7",
-    "rake-db": "2.3.17",
+    "rake-db": "2.3.21",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.0",
     "rollup-plugin-dts": "^4.2.2",

package/src/codegen/appCodeUpdater.test.ts

@@ -1,7 +1,7 @@
 import { appCodeUpdater } from './appCodeUpdater';
 import { asMock, ast } from './testUtils';
 import { updateMainFile } from './updateMainFile';
-import * as path from 'path';
+import path from 'path';
 import { updateTableFile } from './updateTableFile/updateTableFile';
 import { createBaseTableFile } from './createBaseTableFile';
 
@@ -30,10 +30,15 @@ describe('appCodeUpdater', () => {
   const fn = appCodeUpdater(params);
 
   it('should call table and file updaters with proper arguments', async () => {
-    await fn({ ast: ast.addTable, options: {}, cache: {} });
+    await fn({
+      ast: ast.addTable,
+      options: {},
+      basePath: __dirname,
+      cache: {},
+    });
 
-    const mainFilePath = path.resolve(params.mainFilePath);
-    const tablePath = path.resolve(params.tablePath('table'));
+    const mainFilePath = path.resolve(__dirname, params.mainFilePath);
+    const tablePath = path.resolve(__dirname, params.tablePath('table'));
 
     const main = asMock(updateMainFile).mock.calls[0];
     expect(main[0]).toBe(mainFilePath);
@@ -42,12 +47,16 @@ describe('appCodeUpdater', () => {
 
     const [table] = asMock(updateTableFile).mock.calls[0];
     expect(table.tablePath('table')).toBe(tablePath);
-    expect(table.baseTablePath).toBe(params.baseTablePath);
+    expect(table.baseTablePath).toBe(
+      path.resolve(__dirname, params.baseTablePath),
+    );
     expect(table.baseTableName).toBe(params.baseTableName);
     expect(table.mainFilePath).toBe(mainFilePath);
 
     const [base] = asMock(createBaseTableFile).mock.calls[0];
-    expect(base.baseTablePath).toBe(params.baseTablePath);
+    expect(base.baseTablePath).toBe(
+      path.resolve(__dirname, params.baseTablePath),
+    );
     expect(base.baseTableName).toBe(params.baseTableName);
   });
 
@@ -55,11 +64,11 @@ describe('appCodeUpdater', () => {
     const cache = {};
     expect(createBaseTableFile).not.toBeCalled();
 
-    await fn({ ast: ast.addTable, options: {}, cache });
+    await fn({ ast: ast.addTable, options: {}, basePath: __dirname, cache });
 
     expect(createBaseTableFile).toBeCalledTimes(1);
 
-    await fn({ ast: ast.addTable, options: {}, cache });
+    await fn({ ast: ast.addTable, options: {}, basePath: __dirname, cache });
 
     expect(createBaseTableFile).toBeCalledTimes(1);
   });

package/src/codegen/appCodeUpdater.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 import { updateMainFile } from './updateMainFile';
 import { updateTableFile } from './updateTableFile/updateTableFile';
 import { createBaseTableFile } from './createBaseTableFile';
+import { SetOptional } from 'pqb';
 
 export class AppCodeUpdaterError extends Error {}
 
@@ -13,16 +14,23 @@ export type AppCodeUpdaterConfig = {
   mainFilePath: string;
 };
 
-export const appCodeUpdater = (
-  config: AppCodeUpdaterConfig,
-): AppCodeUpdater => {
-  const params = {
-    ...config,
-    tablePath: (name: string) => path.resolve(config.tablePath(name)),
-    mainFilePath: path.resolve(config.mainFilePath),
-  };
+export const appCodeUpdater = ({
+  tablePath,
+  baseTablePath,
+  baseTableName,
+  mainFilePath,
+}: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>): AppCodeUpdater => {
+  return async ({ ast, options, basePath, cache: cacheObject }) => {
+    const params: AppCodeUpdaterConfig = {
+      tablePath(name: string) {
+        const file = tablePath(name);
+        return resolvePath(basePath, file);
+      },
+      baseTablePath: resolvePath(basePath, baseTablePath),
+      baseTableName: baseTableName || 'BaseTable',
+      mainFilePath: resolvePath(basePath, mainFilePath),
+    };
 
-  return async ({ ast, options, cache: cacheObject }) => {
     const promises: Promise<void>[] = [
       updateMainFile(params.mainFilePath, params.tablePath, ast, options),
       updateTableFile({ ...params, ast }),
@@ -40,3 +48,6 @@ export const appCodeUpdater = (
     await Promise.all(promises);
   };
 };
+
+const resolvePath = (basePath: string, filePath: string) =>
+  path.isAbsolute(filePath) ? filePath : path.resolve(basePath, filePath);

package/src/orm.test.ts

@@ -1,4 +1,4 @@
-import { orchidORM } from './orm';
+import { OrchidORM, orchidORM } from './orm';
 import {
   assertType,
   expectSql,
@@ -11,6 +11,14 @@ import { createBaseTable } from './table';
 describe('orm', () => {
   useTestDatabase();
 
+  let db:
+    | OrchidORM<{ user: typeof UserTable; profile: typeof ProfileTable }>
+    | undefined;
+
+  afterEach(async () => {
+    if (db) await db.$close();
+  });
+
   const BaseTable = createBaseTable();
 
   type User = UserTable['columns']['type'];
@@ -31,7 +39,7 @@ describe('orm', () => {
   }
 
   it('should return object with provided adapter, close and transaction method, tables', () => {
-    const db = orchidORM(pgConfig, {
+    db = orchidORM(pgConfig, {
       user: UserTable,
       profile: ProfileTable,
     });
@@ -45,7 +53,7 @@ describe('orm', () => {
   });
 
   it('should return table which is a queryable interface', async () => {
-    const db = orchidORM(pgConfig, {
+    db = orchidORM(pgConfig, {
       user: UserTable,
       profile: ProfileTable,
     });
@@ -71,7 +79,7 @@ describe('orm', () => {
   });
 
   it('should be able to turn on autoPreparedStatements', () => {
-    const db = orchidORM(
+    db = orchidORM(
       { ...pgConfig, autoPreparedStatements: true },
       {
         user: UserTable,

package/src/transaction.test.ts

@@ -4,6 +4,8 @@ import { Client } from 'pg';
 import { noop } from 'pqb';
 
 describe('transaction', () => {
+  afterAll(db.$close);
+
   it('should have override transaction method which implicitly connects tables with a single transaction', async () => {
     const spy = jest.spyOn(Client.prototype, 'query');