orchid-orm 1.4.21 → 1.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.4.21",
+  "version": "1.4.22",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -31,14 +31,14 @@
   "author": "Roman Kushyn",
   "license": "ISC",
   "dependencies": {
-    "pqb": "0.8.4"
+    "pqb": "0.8.5"
   },
   "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.4",
+    "orchid-orm-schema-to-zod": "0.2.5",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.2",
     "@types/node": "^18.0.1",
@@ -50,7 +50,7 @@
     "rimraf": "^3.0.2",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",
-    "rake-db": "2.2.4"
+    "rake-db": "2.2.6"
   },
   "peerDependencies": {
     "typescript": "*"

package/src/codegen/updateTableFile/createTable.test.ts

@@ -15,11 +15,53 @@ const params = { baseTablePath, baseTableName, tablePath };
 
 const testWritten = makeTestWritten(tablePath('table'));
 
+const template = ({
+  schema,
+  columns,
+  noPrimaryKey,
+}: {
+  schema?: string;
+  columns: string;
+  noPrimaryKey?: boolean;
+}) => `import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  ${schema ? `schema = '${schema}';\n  ` : ''}table = 'table';${
+  noPrimaryKey ? '\n  noPrimaryKey = true;' : ''
+}
+  columns = this.setColumns((t) => (${columns}));
+}
+`;
+
 describe('createTable', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
+  it('should add table', async () => {
+    await updateTableFile({
+      ...params,
+      ast: {
+        ...ast.addTable,
+        schema: 'schema',
+        shape: {},
+      },
+    });
+
+    expect(asMock(fs.mkdir)).toBeCalledWith(path.dirname(tablePath('table')), {
+      recursive: true,
+    });
+
+    testWritten(
+      template({
+        schema: 'schema',
+        columns: `{
+
+  }`,
+      }),
+    );
+  });
+
   it('should add table', async () => {
     await updateTableFile({
       ...params,
@@ -46,15 +88,9 @@ describe('createTable', () => {
       },
     });
 
-    expect(asMock(fs.mkdir)).toBeCalledWith(path.dirname(tablePath('table')), {
-      recursive: true,
-    });
-
-    testWritten(`import { BaseTable } from '../baseTable';
-
-export class Table extends BaseTable {
-  table = 'table';
-  columns = this.setColumns((t) => ({
+    testWritten(
+      template({
+        columns: `{
     id: t.serial().primaryKey(),
     ...t.primaryKey(['one', 'two'], { name: 'name' }),
     ...t.index(['one', 'two'], {
@@ -69,9 +105,9 @@ export class Table extends BaseTable {
         name: 'foreignKeyName',
       },
     ),
-  }));
-}
-`);
+  }`,
+      }),
+    );
   });
 
   it('should add noPrimaryKey prop when noPrimaryKey is `ignore` in ast', async () => {
@@ -80,15 +116,13 @@ export class Table extends BaseTable {
       ast: { ...ast.addTable, noPrimaryKey: 'ignore' },
     });
 
-    testWritten(`import { BaseTable } from '../baseTable';
-
-export class Table extends BaseTable {
-  table = 'table';
-  noPrimaryKey = true;
-  columns = this.setColumns((t) => ({
+    testWritten(
+      template({
+        noPrimaryKey: true,
+        columns: `{
     id: t.serial().primaryKey(),
-  }));
-}
-`);
+  }`,
+      }),
+    );
   });
 });

package/src/codegen/updateTableFile/createTable.ts

@@ -13,7 +13,14 @@ export const createTable = async ({
   const tablePath = params.tablePath(ast.name);
   const baseTablePath = getImportPath(tablePath, params.baseTablePath);
 
-  const props: Code[] = [`table = ${singleQuote(ast.name)};`];
+  const props: Code[] = [];
+
+  if (ast.schema) {
+    props.push(`schema = ${singleQuote(ast.schema)};`);
+  }
+
+  props.push(`table = ${singleQuote(ast.name)};`);
+
   if (ast.noPrimaryKey === 'ignore') {
     props.push('noPrimaryKey = true;');
   }

package/src/codegen/updateTableFile/renameTable.test.ts

@@ -20,7 +20,7 @@ describe('renameTable', () => {
     jest.resetAllMocks();
   });
 
-  it('should only change `table` property', async () => {
+  it('should change `table` property', async () => {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
@@ -39,6 +39,86 @@ export class Table extends BaseTable {
 export class Table extends BaseTable {
   table = 'renamedTable';
   columns = this.setColumns((t) => ({}));
+}`);
+  });
+
+  it('should change `schema` property', async () => {
+    asMock(fs.readFile)
+      .mockResolvedValue(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  schema = 'one';
+  table = 'table';
+  columns = this.setColumns((t) => ({}));
+}`);
+
+    await updateTableFile({
+      ...params,
+      ast: {
+        ...ast.renameTable,
+        fromSchema: 'one',
+        toSchema: 'two',
+      },
+    });
+
+    testWritten(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  schema = 'two';
+  table = 'renamedTable';
+  columns = this.setColumns((t) => ({}));
+}`);
+  });
+
+  it('should remove `schema` property', async () => {
+    asMock(fs.readFile)
+      .mockResolvedValue(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  schema = 'one';
+  table = 'table';
+  columns = this.setColumns((t) => ({}));
+}`);
+
+    await updateTableFile({
+      ...params,
+      ast: {
+        ...ast.renameTable,
+        fromSchema: 'one',
+      },
+    });
+
+    testWritten(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  table = 'renamedTable';
+  columns = this.setColumns((t) => ({}));
+}`);
+  });
+
+  it('should add `schema` property', async () => {
+    asMock(fs.readFile)
+      .mockResolvedValue(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  table = 'table';
+  columns = this.setColumns((t) => ({}));
+}`);
+
+    await updateTableFile({
+      ...params,
+      ast: {
+        ...ast.renameTable,
+        toSchema: 'schema',
+      },
+    });
+
+    testWritten(`import { BaseTable } from '../baseTable';
+
+export class Table extends BaseTable {
+  schema = 'schema';
+  table = 'renamedTable';
+  columns = this.setColumns((t) => ({}));
 }`);
   });
 });

package/src/codegen/updateTableFile/renameTable.ts

@@ -19,12 +19,27 @@ export const renameTable = async ({
   const statements = ts.getStatements(content);
   const className = toPascalCase(ast.from);
 
+  const changeSchema = ast.fromSchema !== ast.toSchema;
+
   for (const node of ts.class.iterate(statements)) {
     if (node.name?.escapedText !== className) continue;
 
+    const addSchema =
+      changeSchema &&
+      ast.toSchema &&
+      !node.members.some((member) => ts.prop.getName(member) === 'schema');
+
+    if (addSchema && ast.toSchema) {
+      changes.add(
+        node.members.pos,
+        `\n  schema = ${singleQuote(ast.toSchema)};`,
+      );
+    }
+
     for (const member of node.members) {
       const name = ts.prop.getName(member);
-      if (name !== 'table') continue;
+
+      if (name !== 'table' && !(changeSchema && name === 'schema')) continue;
 
       const { initializer: value } = member as unknown as {
         initializer?: Expression;
@@ -32,7 +47,19 @@ export const renameTable = async ({
 
       if (!value) continue;
 
-      changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      if (name === 'schema') {
+        if (ast.toSchema) {
+          changes.replace(
+            value.pos,
+            value.end,
+            ` ${singleQuote(ast.toSchema)}`,
+          );
+        } else {
+          changes.remove(member.pos, member.end);
+        }
+      } else {
+        changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      }
     }
   }