orchid-orm 1.5.21 → 1.5.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.21",
+  "version": "1.5.23",
   "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.21",
+    "rake-db": "2.3.22",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.0",
     "rollup-plugin-dts": "^4.2.2",

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,

package/src/codegen/utils.ts

@@ -1,8 +1,13 @@
 import path from 'path';
 
 export const getImportPath = (from: string, to: string) => {
-  const rel = path.posix.relative(path.dirname(from), to);
+  const rel = path
+    .relative(path.dirname(from), to)
+    .split(path.sep)
+    .join(path.posix.sep);
+
   const importPath =
     rel.startsWith('./') || rel.startsWith('../') ? rel : `./${rel}`;
+
   return importPath.replace(/\.[tj]s$/, '');
 };