orchid-orm 1.5.20 → 1.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.20",
+  "version": "1.5.22",
   "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.18",
+    "rake-db": "2.3.22",
     "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';
 
@@ -47,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);
   });
 

package/src/codegen/appCodeUpdater.ts

@@ -14,20 +14,21 @@ export type AppCodeUpdaterConfig = {
   mainFilePath: string;
 };
 
-export const appCodeUpdater = (
-  config: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>,
-): AppCodeUpdater => {
+export const appCodeUpdater = ({
+  tablePath,
+  baseTablePath,
+  baseTableName,
+  mainFilePath,
+}: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>): AppCodeUpdater => {
   return async ({ ast, options, basePath, cache: cacheObject }) => {
     const params: AppCodeUpdaterConfig = {
-      ...config,
-      baseTableName: config.baseTableName || 'BaseTable',
       tablePath(name: string) {
-        const file = config.tablePath(name);
-        return path.isAbsolute(file) ? file : path.resolve(basePath, file);
+        const file = tablePath(name);
+        return resolvePath(basePath, file);
       },
-      mainFilePath: path.isAbsolute(config.mainFilePath)
-        ? config.mainFilePath
-        : path.resolve(basePath, config.mainFilePath),
+      baseTablePath: resolvePath(basePath, baseTablePath),
+      baseTableName: baseTableName || 'BaseTable',
+      mainFilePath: resolvePath(basePath, mainFilePath),
     };
 
     const promises: Promise<void>[] = [
@@ -47,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/codegen/updateMainFile.test.ts

@@ -85,10 +85,10 @@ export const db = custom({}, {
     it('should handle object list with elements', async () => {
       asMock(fs.readFile).mockResolvedValue(`
 import { orchidORM } from 'orchid-orm';
-import { Some } from './tables/some';
+import { Other } from './tables/other';
 
 export const db = orchidORM({}, {
-  some: Some,
+  other: Other,
 });
 `);
 
@@ -96,11 +96,11 @@ export const db = orchidORM({}, {
 
       testWritten(`
 import { orchidORM } from 'orchid-orm';
-import { Some } from './tables/some';
+import { Other } from './tables/other';
 import { SomeTable } from './tables/some.table';
 
 export const db = orchidORM({}, {
-  some: Some,
+  other: Other,
   some: SomeTable,
 });
 `);
@@ -234,5 +234,20 @@ export const db = orchidORM({}, {
 });
 `);
     });
+
+    it('should not insert table if table with same key exists, disregarding the import path', async () => {
+      asMock(fs.readFile).mockResolvedValue(`
+import { orchidORM } from 'orchid-orm';
+import { X } from './x';
+
+export const db = orchidORM({}, {
+  some: X,
+});
+`);
+
+      await updateMainFile(mainFilePath, tablePath, ast.addTable, options);
+
+      expect(fs.writeFile).not.toBeCalled();
+    });
   });
 });

package/src/codegen/updateMainFile.ts

@@ -128,6 +128,12 @@ const createTable = (
   );
   if (existing.length) return;
 
+  for (const prop of object.properties) {
+    if (key === ts.prop.getName(prop)) {
+      return;
+    }
+  }
+
   const importPos = ts.import.getEndPos(statements);
   changes.add(
     importPos,