orchid-orm 1.5.20 → 1.5.22

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # orchid-orm
 
+## 1.5.22
+
+### Patch Changes
+
+- Make codegen to not add table to the main file when the key already exist
+
+## 1.5.21
+
+### Patch Changes
+
+- Fix baseTablePath in orm codegen
+
 ## 1.5.20
 
 ### Patch Changes

package/dist/index.d.ts

@@ -435,6 +435,6 @@ declare type AppCodeUpdaterConfig = {
     baseTableName: string;
     mainFilePath: string;
 };
-declare const appCodeUpdater: (config: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>) => AppCodeUpdater;
+declare const appCodeUpdater: ({ tablePath, baseTablePath, baseTableName, mainFilePath, }: SetOptional<AppCodeUpdaterConfig, 'baseTableName'>) => AppCodeUpdater;
 
 export { AppCodeUpdaterConfig, AppCodeUpdaterError, DbTable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, QueryMethods, Repo, Table, TableClass, TableClasses, TableToDb, appCodeUpdater, createBaseTable, createRepo, orchidORM };

package/dist/index.js

@@ -1679,6 +1679,11 @@ const createTable$1 = ({ filePath, tablePath, statements, object, content, space
   );
   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,
@@ -2341,16 +2346,22 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class AppCodeUpdaterError extends Error {
 }
-const appCodeUpdater = (config) => {
+const appCodeUpdater = ({
+  tablePath,
+  baseTablePath,
+  baseTableName,
+  mainFilePath
+}) => {
   return async ({ ast, options, basePath, cache: cacheObject }) => {
-    const params = __spreadProps(__spreadValues({}, config), {
-      baseTableName: config.baseTableName || "BaseTable",
+    const params = {
       tablePath(name) {
-        const file = config.tablePath(name);
-        return path__namespace.isAbsolute(file) ? file : path__namespace.resolve(basePath, file);
+        const file = tablePath(name);
+        return resolvePath(basePath, file);
       },
-      mainFilePath: path__namespace.isAbsolute(config.mainFilePath) ? config.mainFilePath : path__namespace.resolve(basePath, config.mainFilePath)
-    });
+      baseTablePath: resolvePath(basePath, baseTablePath),
+      baseTableName: baseTableName || "BaseTable",
+      mainFilePath: resolvePath(basePath, mainFilePath)
+    };
     const promises = [
       updateMainFile(params.mainFilePath, params.tablePath, ast, options),
       updateTableFile(__spreadProps(__spreadValues({}, params), { ast }))
@@ -2366,6 +2377,7 @@ const appCodeUpdater = (config) => {
     await Promise.all(promises);
   };
 };
+const resolvePath = (basePath, filePath) => path__namespace.isAbsolute(filePath) ? filePath : path__namespace.resolve(basePath, filePath);
 
 Object.defineProperty(exports, 'columnTypes', {
   enumerable: true,