orchid-orm 1.5.8 → 1.5.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -39,14 +39,14 @@
   "author": "Roman Kushyn",
   "license": "ISC",
   "dependencies": {
-    "pqb": "0.9.6"
+    "pqb": "0.9.8"
   },
   "devDependencies": {
     "@swc/core": "^1.3.19",
     "rollup": "^2.79.0",
     "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-esbuild": "^4.10.1",
-    "orchid-orm-schema-to-zod": "0.2.12",
+    "orchid-orm-schema-to-zod": "0.2.14",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.2",
     "@types/node": "^18.0.1",
@@ -58,7 +58,7 @@
     "rimraf": "^3.0.2",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",
-    "rake-db": "2.3.9"
+    "rake-db": "2.3.13"
   },
   "peerDependencies": {
     "typescript": "*"

package/src/codegen/createBaseTableFile.test.ts

@@ -34,13 +34,8 @@ describe('createBaseTableFile', () => {
     expect(asMock(fs.writeFile)).toBeCalledWith(
       params.baseTablePath,
       `import { createBaseTable } from 'orchid-orm';
-import { columnTypes } from 'pqb';
 
-export const ${params.baseTableName} = createBaseTable({
-  columnTypes: {
-    ...columnTypes,
-  },
-});
+export const ${params.baseTableName} = createBaseTable();
 `,
       {
         flag: 'wx',

package/src/codegen/createBaseTableFile.ts

@@ -17,13 +17,8 @@ export const createBaseTableFile = async ({
     .writeFile(
       baseTablePath,
       `import { createBaseTable } from 'orchid-orm';
-import { columnTypes } from 'pqb';
 
-export const ${baseTableName} = createBaseTable({
-  columnTypes: {
-    ...columnTypes,
-  },
-});
+export const ${baseTableName} = createBaseTable();
 `,
       {
         flag: 'wx',

package/src/index.ts

@@ -2,3 +2,4 @@ export * from './table';
 export * from './orm';
 export * from './repo';
 export * from './codegen/appCodeUpdater';
+export { columnTypes } from 'pqb';

package/src/orm.test.ts

@@ -7,25 +7,19 @@ import {
 } from './test-utils/test-utils';
 import { pgConfig } from './test-utils/test-db';
 import { createBaseTable } from './table';
-import { columnTypes } from 'pqb';
 
 describe('orm', () => {
   useTestDatabase();
 
-  const BaseTable = createBaseTable({
-    columnTypes: {
-      ...columnTypes,
-      text: (min = 0, max = Infinity) => columnTypes.text(min, max),
-    },
-  });
+  const BaseTable = createBaseTable();
 
   type User = UserTable['columns']['type'];
   class UserTable extends BaseTable {
     table = 'user';
     columns = this.setColumns((t) => ({
       id: t.serial().primaryKey(),
-      name: t.text(),
-      password: t.text(),
+      name: t.text(1, 10),
+      password: t.text(1, 10),
     }));
   }
 

package/src/repo.test.ts

@@ -2,10 +2,10 @@ import { orchidORM } from './orm';
 import { pgConfig } from './test-utils/test-db';
 import { createBaseTable } from './table';
 import { assertType, expectSql } from './test-utils/test-utils';
-import { columnTypes, QueryReturnType } from 'pqb';
+import { QueryReturnType } from 'pqb';
 import { createRepo } from './repo';
 
-const BaseTable = createBaseTable({ columnTypes });
+const BaseTable = createBaseTable();
 
 class SomeTable extends BaseTable {
   table = 'someTable';

package/src/table.test.ts

@@ -42,7 +42,7 @@ describe('table', () => {
     it('should return date as string by default', async () => {
       await db.user.create(userData);
 
-      const BaseTable = createBaseTable({ columnTypes });
+      const BaseTable = createBaseTable();
       class UserTable extends BaseTable {
         table = 'user';
         columns = this.setColumns((t) => ({

package/src/table.ts

@@ -1,8 +1,10 @@
 import {
   ColumnShapeOutput,
   ColumnsShape,
+  columnTypes,
   ColumnTypesBase,
   Db,
+  DefaultColumnTypes,
   getColumnTypes,
   Query,
 } from 'pqb';
@@ -46,9 +48,17 @@ export type Table = {
   noPrimaryKey?: boolean;
 };
 
-export const createBaseTable = <CT extends ColumnTypesBase>(options: {
-  columnTypes: CT;
-}) => {
+export const createBaseTable = <CT extends ColumnTypesBase>(
+  options: {
+    columnTypes?: CT;
+  } = { columnTypes: columnTypes as unknown as CT },
+) => {
+  return create(
+    options.columnTypes as ColumnTypesBase extends CT ? DefaultColumnTypes : CT,
+  );
+};
+
+const create = <CT extends ColumnTypesBase>(columnTypes: CT) => {
   return class BaseTable {
     table!: string;
     columns!: TableConfig;
@@ -57,13 +67,13 @@ export const createBaseTable = <CT extends ColumnTypesBase>(options: {
     noPrimaryKey?: boolean;
 
     constructor() {
-      this.columnTypes = options.columnTypes;
+      this.columnTypes = columnTypes;
     }
 
     setColumns = <T extends ColumnsShape>(
       fn: (t: CT) => T,
     ): { shape: T; type: ColumnShapeOutput<T> } => {
-      const shape = getColumnTypes(options.columnTypes, fn);
+      const shape = getColumnTypes(columnTypes, fn);
 
       return {
         shape,