orchid-orm 1.5.14 → 1.5.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.14",
+  "version": "1.5.15",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {

package/src/bin/init.test.ts

@@ -65,7 +65,8 @@ describe('initOrchidORM', () => {
   "dependencies": {
     "dotenv": "^1.2.3",
     "orchid-orm": "^1.2.3",
-    "pqb": "^1.2.3"
+    "pqb": "^1.2.3",
+    "pg": "^1.2.3"
   },
   "devDependencies": {
     "rake-db": "^1.2.3",
@@ -85,6 +86,7 @@ describe('initOrchidORM', () => {
     "dotenv": "^1.2.3",
     "orchid-orm": "^1.2.3",
     "pqb": "^1.2.3",
+    "pg": "^1.2.3",
     "orchid-orm-schema-to-zod": "^1.2.3"
   },
   "devDependencies": {
@@ -187,6 +189,7 @@ describe('initOrchidORM', () => {
     "dotenv": "^1.2.3",
     "orchid-orm": "^1.2.3",
     "pqb": "^1.2.3",
+    "pg": "^1.2.3",
     "orchid-orm-schema-to-zod": "^1.2.3"
   },
   "devDependencies": {
@@ -355,7 +358,8 @@ ko
 
 export const BaseTable = createBaseTable({
   columnTypes: (t) => ({
-    text: (min: 0, max: Infinity) => t.text(min, max),
+    ...t,
+    text: (min = 0, max = Infinity) => t.text(min, max),
   }),
 });
 `);
@@ -373,8 +377,10 @@ export const BaseTable = createBaseTable({
 
 export const BaseTable = createBaseTable({
   columnTypes: (t) => ({
-    text: (min: 0, max: Infinity) => t.text(min, max),
-    timestamp: <P extends number>(precision?: P) => t.timestamp<P>(precision).asDate(),
+    ...t,
+    text: (min = 0, max = Infinity) => t.text(min, max),
+    timestamp: <P extends number>(precision?: P) =>
+      t.timestamp<P>(precision).asDate(),
   }),
 });
 `);
@@ -392,8 +398,10 @@ export const BaseTable = createBaseTable({
 
 export const BaseTable = createBaseTable({
   columnTypes: (t) => ({
-    text: (min: 0, max: Infinity) => t.text(min, max),
-    timestamp: <P extends number>(precision?: P) => t.timestamp<P>(precision).asNumber(),
+    ...t,
+    text: (min = 0, max = Infinity) => t.text(min, max),
+    timestamp: <P extends number>(precision?: P) =>
+      t.timestamp<P>(precision).asNumber(),
   }),
 });
 `);
@@ -427,7 +435,7 @@ export const BaseTable = createBaseTable({
 import { CommentTable } from './comment.table';
 
 export type Post = PostTable['columns']['type'];
-class PostTable extends BaseTable {
+export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
@@ -435,13 +443,13 @@ class PostTable extends BaseTable {
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     comments: this.hasMany(() => CommentTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 `);
     });
@@ -460,7 +468,7 @@ import { CommentTable } from './comment.table';
 import { tableToZod } from 'orchid-orm-schema-to-zod';
 
 export type Post = PostTable['columns']['type'];
-class PostTable extends BaseTable {
+export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
@@ -468,13 +476,13 @@ class PostTable extends BaseTable {
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     comments: this.hasMany(() => CommentTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 
 export const postSchema = tableToZod(PostTable);
@@ -493,21 +501,24 @@ export const postSchema = tableToZod(PostTable);
 import { PostTable } from './post.table';
 
 export type Comment = CommentTable['columns']['type'];
-class CommentTable extends BaseTable {
+export class CommentTable extends BaseTable {
   table = 'comment';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    postId: t.integer().foreignKey(() => PostTable, 'id').index(),
+    postId: t
+      .integer()
+      .foreignKey(() => PostTable, 'id')
+      .index(),
     text: t.text(5, 1000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     post: this.belongsTo(() => PostTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 `);
     });
@@ -526,21 +537,24 @@ import { PostTable } from './post.table';
 import { tableToZod } from 'orchid-orm-schema-to-zod';
 
 export type Comment = CommentTable['columns']['type'];
-class CommentTable extends BaseTable {
+export class CommentTable extends BaseTable {
   table = 'comment';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    postId: t.integer().foreignKey(() => PostTable, 'id').index(),
+    postId: t
+      .integer()
+      .foreignKey(() => PostTable, 'id')
+      .index(),
     text: t.text(5, 1000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     post: this.belongsTo(() => PostTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 
 export const commentSchema = tableToZod(CommentTable);
@@ -564,7 +578,7 @@ if (!database.databaseURL) throw new Error('DATABASE_URL is missing in .env');
 
 export const config = {
   database,
-}
+};
 `);
     });
 
@@ -596,7 +610,7 @@ if (testDatabase.databaseURL) {
 export const config = {
   allDatabases,
   database: process.env.NODE_ENV === 'test' ? testDatabase : database,
-}
+};
 `);
     });
   });
@@ -611,11 +625,8 @@ export const config = {
       expect(content).toBe(`import { orchidORM } from 'orchid-orm';
 import { config } from './config';
 
-export const db = orchidORM(
-  config.database,
-  {
-  }
-);
+export const db = orchidORM(config.database, {
+});
 `);
     });
 
@@ -629,16 +640,13 @@ export const db = orchidORM(
       );
       expect(content).toBe(`import { orchidORM } from 'orchid-orm';
 import { config } from './config';
-import { Post } from './tables/post.table';
-import { Comment } from './tables/comment.table';
-
-export const db = orchidORM(
-  config.database,
-  {
-    post: Post,
-    comment: Comment,
-  }
-);
+import { PostTable } from './tables/post.table';
+import { CommentTable } from './tables/comment.table';
+
+export const db = orchidORM(config.database, {
+  post: PostTable,
+  comment: CommentTable,
+});
 `);
     });
   });
@@ -657,15 +665,16 @@ import { appCodeUpdater } from 'orchid-orm';
 rakeDb(config.database, {
   migrationsPath: 'src/db/migrations',
   appCodeUpdater: appCodeUpdater({
-    tablePath: (tableName) => \`src/db/tables/\${tableName}.ts\`,
+    tablePath: (tableName) => \`src/db/tables/\${tableName}.table.ts\`,
     baseTablePath: 'src/db/baseTable.ts',
     baseTableName: 'BaseTable',
     mainFilePath: 'src/db/db.ts',
   }),
+  useCodeUpdater: true, // set to false to disable code updater
   commands: {
     async seed() {
-      const { run } = await import('./seed');
-      await run();
+      const { seed } = await import('./seed');
+      await seed();
     },
   },
 });
@@ -687,15 +696,16 @@ import { appCodeUpdater } from 'orchid-orm';
 rakeDb(config.allDatabases, {
   migrationsPath: 'src/db/migrations',
   appCodeUpdater: appCodeUpdater({
-    tablePath: (tableName) => \`src/db/tables/\${tableName}.ts\`,
+    tablePath: (tableName) => \`src/db/tables/\${tableName}.table.ts\`,
     baseTablePath: 'src/db/baseTable.ts',
     baseTableName: 'BaseTable',
     mainFilePath: 'src/db/db.ts',
   }),
+  useCodeUpdater: true, // set to false to disable code updater
   commands: {
     async seed() {
-      const { run } = await import('./seed');
-      await run();
+      const { seed } = await import('./seed');
+      await seed();
     },
   },
 });
@@ -759,8 +769,8 @@ change(async (db) => {
 export const seed = async () => {
   // create records here
 
-  await db.close();
-}
+  await db.$close();
+};
 `);
     });
   });

package/src/bin/init.ts

@@ -81,6 +81,7 @@ const setupPackageJson = async (config: InitConfig) => {
     getLatestPackageVersion('dotenv', 'dependencies'),
     getLatestPackageVersion('orchid-orm', 'dependencies'),
     getLatestPackageVersion('pqb', 'dependencies'),
+    getLatestPackageVersion('pg', 'dependencies'),
     config.addSchemaToZod &&
       getLatestPackageVersion('orchid-orm-schema-to-zod', 'dependencies'),
     getLatestPackageVersion('rake-db', 'devDependencies'),
@@ -213,14 +214,16 @@ const setupBaseTable = async (config: InitConfig) => {
 
 export const BaseTable = createBaseTable({
   columnTypes: (t) => ({
-    text: (min: 0, max: Infinity) => t.text(min, max),`;
+    ...t,
+    text: (min = 0, max = Infinity) => t.text(min, max),`;
 
   const { timestamp } = config;
   if (timestamp) {
     content += `
-    timestamp: <P extends number>(precision?: P) => t.timestamp<P>(precision).${
-      timestamp === 'date' ? 'asDate' : 'asNumber'
-    }(),`;
+    timestamp: <P extends number>(precision?: P) =>
+      t.timestamp<P>(precision).${
+        timestamp === 'date' ? 'asDate' : 'asNumber'
+      }(),`;
   }
 
   content += `
@@ -247,7 +250,7 @@ ${
     : ''
 }
 export type Post = PostTable['columns']['type'];
-class PostTable extends BaseTable {
+export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
@@ -255,13 +258,13 @@ class PostTable extends BaseTable {
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     comments: this.hasMany(() => CommentTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 ${
   config.addSchemaToZod
@@ -280,21 +283,24 @@ ${
     : ''
 }
 export type Comment = CommentTable['columns']['type'];
-class CommentTable extends BaseTable {
+export class CommentTable extends BaseTable {
   table = 'comment';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    postId: t.integer().foreignKey(() => PostTable, 'id').index(),
+    postId: t
+      .integer()
+      .foreignKey(() => PostTable, 'id')
+      .index(),
     text: t.text(5, 1000),
     ...t.timestamps(),
   }));
-  
+
   relations = {
     post: this.belongsTo(() => PostTable, {
       primaryKey: 'id',
       foreignKey: 'postId',
     }),
-  }
+  };
 }
 ${
   config.addSchemaToZod
@@ -345,7 +351,7 @@ export const config = {`;
   database,`;
   }
   content += `
-}
+};
 `;
 
   await fs.writeFile(configPath, content);
@@ -356,11 +362,11 @@ const setupMainDb = async (config: InitConfig) => {
   let tables = '';
   if (config.demoTables) {
     imports += `
-import { Post } from './tables/post.table';
-import { Comment } from './tables/comment.table';`;
+import { PostTable } from './tables/post.table';
+import { CommentTable } from './tables/comment.table';`;
     tables += `
-    post: Post,
-    comment: Comment,`;
+  post: PostTable,
+  comment: CommentTable,`;
   }
 
   const dbPath = path.join(dirPath, 'db.ts');
@@ -369,11 +375,8 @@ import { Comment } from './tables/comment.table';`;
     `import { orchidORM } from 'orchid-orm';
 import { config } from './config';${imports}
 
-export const db = orchidORM(
-  config.database,
-  {${tables}
-  }
-);
+export const db = orchidORM(config.database, {${tables}
+});
 `,
   );
 };
@@ -389,15 +392,16 @@ import { appCodeUpdater } from 'orchid-orm';
 rakeDb(${config.testDatabase ? 'config.allDatabases' : 'config.database'}, {
   migrationsPath: 'src/db/migrations',
   appCodeUpdater: appCodeUpdater({
-    tablePath: (tableName) => \`src/db/tables/\${tableName}.ts\`,
+    tablePath: (tableName) => \`src/db/tables/\${tableName}.table.ts\`,
     baseTablePath: 'src/db/baseTable.ts',
     baseTableName: 'BaseTable',
     mainFilePath: 'src/db/db.ts',
   }),
+  useCodeUpdater: true, // set to false to disable code updater
   commands: {
     async seed() {
-      const { run } = await import('./seed');
-      await run();
+      const { seed } = await import('./seed');
+      await seed();
     },
   },
 });
@@ -411,9 +415,11 @@ const createMigrations = async (config: InitConfig) => {
 
   if (!config.demoTables) return;
 
+  const now = new Date();
+
   const postPath = path.join(
     migrationsPath,
-    `${makeFileTimeStamp()}_createPost.ts`,
+    `${makeFileTimeStamp(now)}_createPost.ts`,
   );
   await fs.writeFile(
     postPath,
@@ -430,9 +436,11 @@ change(async (db) => {
 `,
   );
 
+  now.setTime(now.getTime() + 1000);
+
   const commentPath = path.join(
     migrationsPath,
-    `${makeFileTimeStamp()}_createComment.ts`,
+    `${makeFileTimeStamp(now)}_createComment.ts`,
   );
   await fs.writeFile(
     commentPath,
@@ -450,8 +458,7 @@ change(async (db) => {
   );
 };
 
-const makeFileTimeStamp = () => {
-  const now = new Date();
+const makeFileTimeStamp = (now: Date) => {
   return [
     now.getUTCFullYear(),
     now.getUTCMonth() + 1,
@@ -473,8 +480,8 @@ const createSeed = async () => {
 export const seed = async () => {
   // create records here
 
-  await db.close();
-}
+  await db.$close();
+};
 `,
   );
 };