orchid-orm 1.76.5 → 1.77.1

package/dist/migrations/bun.js.map

@@ -1 +1 @@
-{"version":3,"file":"bun.js","names":[],"sources":["../../src/migrations/adapters/bun.ts"],"sourcesContent":["import { patchRakeDb } from 'orchid-orm/migrations';\nexport * from '../patch-rake-db-types';\nexport * from 'rake-db/bun';\n\npatchRakeDb();\n"],"mappings":"mDAIa"}
+{"version":3,"file":"bun.js","names":["patchRakeDb"],"sources":["../../src/migrations/adapters/bun.ts"],"sourcesContent":["import { patchRakeDb } from 'orchid-orm/migrations';\nexport * from '../patch-rake-db-types';\nexport * from 'rake-db/bun';\n\npatchRakeDb();\n"],"mappings":"CAIAA,kCAAAA,CAAAA,CAAAA,YAAAA,CAAY"}

package/dist/migrations/bun.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bun.mjs","names":[],"sources":["../../src/migrations/adapters/bun.ts"],"sourcesContent":["import { patchRakeDb } from 'orchid-orm/migrations';\nexport * from '../patch-rake-db-types';\nexport * from 'rake-db/bun';\n\npatchRakeDb();\n"],"mappings":";;AAIA,aAAa"}
+{"version":3,"file":"bun.mjs","names":[],"sources":["../../src/migrations/adapters/bun.ts"],"sourcesContent":["import { patchRakeDb } from 'orchid-orm/migrations';\nexport * from '../patch-rake-db-types';\nexport * from 'rake-db/bun';\n\npatchRakeDb();\n"],"mappings":";;AAIA,YAAY"}

package/dist/migrations/index.d.ts

@@ -1,5 +1,6 @@
 import { ColumnSchemaConfig } from "pqb/internal";
 export * from "rake-db";
+declare const patchRakeDb$1: () => void;
 declare module 'rake-db' {
   interface RakeDbConfig {
     dbPath?: string;
@@ -12,5 +13,5 @@ declare module 'rake-db' {
     generateTableTo?(tableName: string): string;
   }
 }
-declare const patchRakeDb: () => void;
+declare const patchRakeDb: typeof patchRakeDb$1;
 export { patchRakeDb };

package/dist/migrations/index.js

@@ -15,7 +15,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -26,8 +26,6 @@ node_path = __toESM(node_path);
 let node_url = require("node:url");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
-let typescript = require("typescript");
-typescript = __toESM(typescript);
 const viewDataToSql = (viewData, viewName) => {
 	return (0, pqb_internal.sqlToRawSql)(viewDataToQuerySql(viewData, viewName));
 };
@@ -351,8 +349,9 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
 		if (!typeCasts.get(dbBaseType)?.has(codeBaseType)) {
 			if (!(dbColumn instanceof pqb_internal.EnumColumn) || !(codeColumn instanceof pqb_internal.EnumColumn) || !(0, pqb_internal.deepCompare)(dbColumn.options, codeColumn.options)) {
 				if (verifying) throw new AbortSignal();
+				const tableName = (0, rake_db.concatSchemaAndName)(changeTableData.changeTableAst);
 				if (await (0, rake_db.promptSelect)({
-					message: `Cannot cast type of ${(0, rake_db.concatSchemaAndName)(changeTableData.changeTableAst)}'s column ${key} from ${dbType} to ${codeType}`,
+					message: `Cannot cast type of ${tableName}'s column ${key} from ${dbType} to ${codeType}`,
 					options: [`${pqb_internal.colors.yellowBold(`-/+`)} recreate the column, existing data will be ${pqb_internal.colors.red("lost")}`, `write migration manually`]
 				})) throw new AbortSignal();
 				dbColumn.data.name = codeColumn.data.name;
@@ -432,7 +431,7 @@ JOIN pg_type AS t ON t.oid = casttarget`);
 		for (const [source, target] of rows) {
 			const set = directTypeCasts.get(source);
 			if (set) set.add(target);
-			else directTypeCasts.set(source, new Set([target]));
+			else directTypeCasts.set(source, /* @__PURE__ */ new Set([target]));
 		}
 		typeCasts = /* @__PURE__ */ new Map();
 		for (const [type, directSet] of directTypeCasts.entries()) {
@@ -563,7 +562,8 @@ const makeComparableDomain = (currentSchema, schemaName, name, column) => {
 		inner = inner.data.item;
 		arrayDims++;
 	}
-	const [typeSchema = "pg_catalog", type] = (0, rake_db.getSchemaAndTableFromName)(currentSchema, getColumnDbType(inner, currentSchema));
+	const fullType = getColumnDbType(inner, currentSchema);
+	const [typeSchema = "pg_catalog", type] = (0, rake_db.getSchemaAndTableFromName)(currentSchema, fullType);
 	return {
 		schemaName,
 		name,
@@ -802,7 +802,7 @@ const processPrimaryKey = (config, changeTableData) => {
 };
 const changePrimaryKey = (config, columnsPrimaryKey, { codeTable, dbTableData: { primaryKey: dbPrimaryKey }, changeTableAst: { shape, add, drop }, changingColumns }) => {
 	const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
-	const primaryKey = [...new Set([...columnsPrimaryKey, ...(config.snakeCase ? tablePrimaryKey?.columns.map((key) => ({
+	const primaryKey = [.../* @__PURE__ */ new Set([...columnsPrimaryKey, ...(config.snakeCase ? tablePrimaryKey?.columns.map((key) => ({
 		key,
 		name: (0, pqb_internal.toSnakeCase)(key)
 	})) : tablePrimaryKey?.columns.map((key) => ({
@@ -1302,7 +1302,7 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
 };
 const fnOrTableToString = (fnOrTable) => {
 	if (typeof fnOrTable !== "string") {
-		const { schema, table, nameInDb } = new (fnOrTable())();
+		const { schema, table, nameInDb } = (0, pqb_internal.getForeignKeyTableInstance)(fnOrTable());
 		const name = nameInDb || table;
 		if (!name) throw new Error("Referenced table is missing table property");
 		fnOrTable = (0, rake_db.concatSchemaAndName)({
@@ -2210,7 +2210,7 @@ const processDefaultPrivileges = (ast, dbStructure, { internal: { roles } }) =>
 				const codeObj = codePrivilege.objectConfigs.find((o) => o.object === objectType);
 				const dbPrivs = dbObj?.privilegeConfigs ?? [];
 				const codePrivs = codeObj?.privilegeConfigs ?? [];
-				const collapsedDbPrivs = collapsePrivilegesToAll({
+				const collapsedDbPrivilege = {
 					owner: dbPrivilege.owner,
 					grantee: dbPrivilege.grantee,
 					schema: dbPrivilege.schema,
@@ -2218,7 +2218,8 @@ const processDefaultPrivileges = (ast, dbStructure, { internal: { roles } }) =>
 						object: objectType,
 						privilegeConfigs: dbPrivs
 					}]
-				}, objectTypeToAllPrivileges).objectConfigs[0]?.privilegeConfigs ?? [];
+				};
+				const collapsedDbPrivs = collapsePrivilegesToAll(collapsedDbPrivilege, objectTypeToAllPrivileges).objectConfigs[0]?.privilegeConfigs ?? [];
 				const toGrant = codePrivs.filter((cp) => !collapsedDbPrivs.some((dp) => privilegeConfigsMatch(cp, dp, objectType, objectTypeToAllPrivileges)));
 				const toRevoke = dbPrivs.filter((dp) => !codePrivs.some((cp) => privilegeConfigsMatch(cp, dp, objectType, objectTypeToAllPrivileges)));
 				if (toGrant.length) {
@@ -2642,9 +2643,7 @@ const dbViewOptionsToAst = (view) => {
 			case "security_barrier":
 				options.securityBarrier = value === "true";
 				break;
-			case "security_invoker":
-				options.securityInvoker = value === "true";
-				break;
+			case "security_invoker": options.securityInvoker = value === "true";
 		}
 	}
 	return options;
@@ -3069,10 +3068,11 @@ const report = (ast, config, currentSchema) => {
 			break;
 		}
 		case "policy": {
-			const summary = formatPolicySummary(a, dbItemName({
+			const table = dbItemName({
 				schema: a.schema,
 				name: a.table
-			}, currentSchema));
+			}, currentSchema);
+			const summary = formatPolicySummary(a, table);
 			const message = a.action === "create" ? `${green("+ create policy")} ${a.name}: ${summary}` : `${red("- drop policy")} ${a.name}: ${summary}`;
 			code.push(message);
 			break;
@@ -3159,7 +3159,7 @@ const formatPolicyChangeDefinition = (policy) => {
 var AbortSignal = class extends Error {};
 const generate = async (adapters, config, args, afterPull) => {
 	let { dbPath } = config;
-	if (!dbPath || !config.baseTable) throw invalidConfig(config);
+	if (!dbPath || !(0, rake_db.getTableFactoryConfig)(config)) throw invalidConfig(config);
 	if (!adapters.length) throw new Error(`Database options must not be empty`);
 	if (!dbPath.endsWith(".ts")) dbPath += ".ts";
 	let migrationName = args[0] ?? "generated";
@@ -3229,7 +3229,7 @@ const generate = async (adapters, config, args, afterPull) => {
 	if (up) for (const adapter of adapters) await (0, rake_db.migrateAndClose)(adapter, config);
 	else if (!afterPull) await closeAdapters(adapters);
 };
-const invalidConfig = (config) => /* @__PURE__ */ new Error(`\`${config.dbPath ? "baseTable" : "dbPath"}\` setting must be set in the migrations config for the generator to work`);
+const invalidConfig = (config) => /* @__PURE__ */ new Error(`\`${config.dbPath ? "baseTable` or `defineTable" : "dbPath"}\` setting must be set in the migrations config for the generator to work`);
 const getDbFromConfig = async (config, dbPath) => {
 	const db = (await config.import((0, node_url.pathToFileURL)(node_path.default.resolve(config.basePath, dbPath)).toString()))[config.dbExportedAs ?? "db"];
 	if (!db?.$qb) throw new Error(`Unable to import OrchidORM instance as ${config.dbExportedAs ?? "db"} from ${config.dbPath}`);
@@ -3507,95 +3507,128 @@ const processHasAndBelongsToManyColumn = (column, habtmTables, codeItems) => {
 const closeAdapters = (adapters) => {
 	return Promise.all(adapters.map((x) => x.close()));
 };
-const getTableInfosAndFKeys = (asts, config) => {
+const getTableInfos = (asts, config) => {
 	const generateTableTo = config.generateTableTo ?? ((name) => `./tables/${name}.table.ts`);
 	const tableInfos = {};
-	const fkeys = {};
 	for (const ast of asts) if (ast.type === "table") {
 		const tableKey = (0, pqb_internal.toCamelCase)(ast.name);
 		const dbTableName = ast.schema ? `${ast.schema}.${ast.name}` : ast.name;
 		let tablePath = node_path.default.resolve(config.basePath, generateTableTo(tableKey));
 		if (!tablePath.endsWith(".ts")) tablePath += ".ts";
 		const name = (0, pqb_internal.toPascalCase)(ast.name);
-		const info = {
+		tableInfos[dbTableName] = {
 			dbTableName,
 			key: tableKey,
 			path: tablePath,
 			name,
 			className: `${name}Table`
 		};
-		tableInfos[dbTableName] = info;
-		if (ast.constraints) for (const { references } of ast.constraints) {
-			if (!references) continue;
-			(fkeys[references.fnOrTable] ??= []).push({
-				table: info,
-				references
-			});
-		}
 	}
-	return {
-		tableInfos,
-		fkeys
-	};
+	return tableInfos;
 };
-const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs, currentSchema) => {
+const appCodeGenTable = (tableInfos, ast, tableFactorySource, currentSchema) => {
 	const tableInfo = tableInfos[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
-	const imports = {
-		"orchid-orm": "Selectable, Insertable, Updatable",
-		[(0, pqb_internal.getImportPath)(tableInfo.path, baseTablePath)]: baseTableExportedAs
+	const content = appCodeGenDefineTable(tableInfo, ast, tableFactorySource, currentSchema);
+	return {
+		...tableInfo,
+		content
 	};
-	const props = [];
-	if (ast.schema) props.push(`schema = ${(0, pqb_internal.singleQuote)(ast.schema)};`);
-	props.push(`readonly table = ${(0, pqb_internal.singleQuote)(ast.name)};`);
-	if (ast.comment) props.push(`comment = ${(0, pqb_internal.singleQuote)(ast.comment)};`);
-	if (ast.noPrimaryKey === "ignore") props.push("noPrimaryKey = true;");
+};
+const appCodeGenDefineTable = (tableInfo, ast, tableFactorySource, currentSchema) => {
+	const tableOptions = getDefineTableOptions(tableInfo, ast);
 	const hasTableData = Boolean(ast.primaryKey || ast.indexes?.length || ast.excludes?.length || ast.constraints?.length);
-	const shapeCode = (0, pqb_internal.columnsShapeToCode)({
+	const ctx = {
 		t: "t",
+		sql: "sql",
 		table: ast.name,
 		currentSchema
-	}, ast.shape);
-	props.push(`columns = this.setColumns(${hasTableData ? "\n    " : ""}(t) => ({`, hasTableData ? [shapeCode] : shapeCode, hasTableData ? "  })," : "}));");
-	if (hasTableData) props.push((0, pqb_internal.pushTableDataCode)([], ast), ");");
-	const relations = [];
-	const belongsTo = fkeys[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
-	if (belongsTo) for (const { table, references } of belongsTo) {
-		imports[(0, pqb_internal.getImportPath)(tableInfo.path, table.path)] = table.className;
-		relations.push(`${table.key}: this.belongsTo(() => ${table.className}, {`, [`columns: [${references.foreignColumns.map(pqb_internal.singleQuote).join(", ")}],`, `references: [${references.columns.map(pqb_internal.singleQuote).join(", ")}],`], "}),");
-	}
-	if (ast.constraints) for (const { references } of ast.constraints) {
-		if (!references) continue;
-		const table = tableInfos[references.fnOrTable];
-		imports[(0, pqb_internal.getImportPath)(tableInfo.path, table.path)] = table.className;
-		relations.push(`${table.key}: this.hasMany(() => ${table.className}, {`, [`columns: [${references.columns.map(pqb_internal.singleQuote).join(", ")}],`, `references: [${references.foreignColumns.map(pqb_internal.singleQuote).join(", ")}],`], "}),");
-	}
-	if (relations.length) props.push("", "relations = {", relations, "};");
-	const importsCode = importsToCode(imports);
-	const { name, className } = tableInfo;
-	const code = [
-		`export type ${name} = Selectable<${className}>;
-export type ${name}New = Insertable<${className}>;
-export type ${name}Update = Updatable<${className}>;
-
-export class ${className} extends ${baseTableExportedAs} {`,
-		props,
-		"}\n"
-	];
-	return {
-		...tableInfo,
-		content: importsCode + "\n\n" + (0, pqb_internal.codeToString)(code, "", "  ")
 	};
+	const shapeCode = (0, pqb_internal.columnsShapeToCode)(ctx, ast.shape);
+	const { name, className } = tableInfo;
+	const code = [`export type ${name} = Selectable<typeof ${className}>;
+export type ${name}New = Insertable<typeof ${className}>;
+export type ${name}Update = Updatable<typeof ${className}>;
+`];
+	if (tableOptions.length) code.push(`export const ${className} = ${tableFactorySource.exportedAs}(`, [
+		`${(0, pqb_internal.singleQuote)(tableInfo.key)},`,
+		...tableOptions,
+		"(t) => ({",
+		shapeCode,
+		"}),"
+	], `)${hasTableData ? "" : ";"}`);
+	else if (hasTableData && getTableDataItemsCount(ast) === 1) code.push(`export const ${className} = ${tableFactorySource.exportedAs}(`, [
+		`${(0, pqb_internal.singleQuote)(tableInfo.key)},`,
+		"(t) => ({",
+		shapeCode,
+		"}),"
+	], ")");
+	else code.push(`export const ${className} = ${tableFactorySource.exportedAs}(${(0, pqb_internal.singleQuote)(tableInfo.key)}, (t) => ({`, shapeCode, `}))${hasTableData ? "" : ";"}`);
+	if (hasTableData) {
+		let tableDataCode = getTableDataChainCode(ast, ctx);
+		if (ast.constraints?.some(({ check }) => check)) tableDataCode = addTrailingSemicolon(tableDataCode);
+		code.push(tableDataCode, ";");
+	}
+	return importsToCode({
+		"orchid-orm": "Selectable, Insertable, Updatable",
+		[(0, pqb_internal.getImportPath)(tableInfo.path, tableFactorySource.path)]: ctx.isSqlUsed ? `${tableFactorySource.exportedAs}, sql` : tableFactorySource.exportedAs
+	}) + "\n\n" + formatColumnSqlChains((0, pqb_internal.codeToString)(code, "", "  ")) + "\n";
+};
+const getDefineTableOptions = (tableInfo, ast) => {
+	const options = [];
+	if (ast.schema) options.push(`schema: ${(0, pqb_internal.singleQuote)(ast.schema)},`);
+	if (tableInfo.key !== ast.name) options.push(`nameInDb: ${(0, pqb_internal.singleQuote)(ast.name)},`);
+	if (ast.comment) options.push(`comment: ${(0, pqb_internal.singleQuote)(ast.comment)},`);
+	if (ast.noPrimaryKey === "ignore") options.push("noPrimaryKey: true,");
+	return options.length ? [
+		"{",
+		options,
+		"},"
+	] : [];
+};
+const getTableDataChainCode = (ast, ctx) => {
+	const code = [];
+	if (ast.primaryKey) code.push((0, pqb_internal.primaryKeyInnerToCode)(ast.primaryKey, ""));
+	if (ast.indexes) for (const index of ast.indexes) code.push(...removeTrailingComma((0, pqb_internal.indexToCode)(index, "")));
+	if (ast.excludes) for (const exclude of ast.excludes) code.push(...removeTrailingComma((0, pqb_internal.excludeToCode)(exclude, "")));
+	if (ast.constraints) for (const constraint of ast.constraints) code.push(...removeTrailingComma((0, pqb_internal.constraintToCode)(constraint, "", true, "", ctx)));
+	return code;
+};
+const getTableDataItemsCount = (ast) => {
+	return (ast.primaryKey ? 1 : 0) + (ast.indexes?.length ?? 0) + (ast.excludes?.length ?? 0) + (ast.constraints?.length ?? 0);
+};
+const removeTrailingComma = (code) => {
+	if (typeof code === "string") return removeComma(code);
+	const copy = [...code];
+	const lastIndex = copy.length - 1;
+	const last = copy[lastIndex];
+	if (last !== void 0) copy[lastIndex] = removeTrailingComma(last);
+	return copy;
+};
+const removeComma = (code) => code.endsWith(",") ? code.slice(0, -1) : code;
+const formatColumnSqlChains = (code) => {
+	return code.replace(/^(\s+\S+: )t((?:\.\w+\([^{}\n]*\))+)\.index\(\{\n((?:\s+[^\n]*\n)*?)(\s+)\}\)(\.check\(sql[^\n]*)$/gm, (line, prefix, chain, options, _closeIndent, check) => {
+		const methodIndent = `${" ".repeat(line.match(/^\s*/)?.[0].length ?? 0)}  `;
+		const optionIndent = `${methodIndent}  `;
+		const optionLines = options.split("\n").filter(Boolean).map((line) => `${optionIndent}${line.trimStart()}`).join("\n");
+		return `${prefix}t${chain.replace(/\./g, `\n${methodIndent}.`)}\n${methodIndent}.index({\n${optionLines}\n${methodIndent}})\n${methodIndent}${check}`;
+	});
+};
+const addTrailingSemicolon = (code) => {
+	if (typeof code === "string") return `${code};`;
+	const copy = [...code];
+	const lastIndex = copy.length - 1;
+	const last = copy[lastIndex];
+	if (last !== void 0) copy[lastIndex] = addTrailingSemicolon(last);
+	return copy;
 };
 function importsToCode(imports) {
 	return Object.entries(imports).map(([from, name]) => `import { ${name} } from '${from}';`).join("\n");
 }
-const { createSourceFile, ScriptTarget, SyntaxKind } = typescript.default;
 const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, currentSchema) => {
 	const content = await node_fs_promises.default.readFile(dbPath, "utf-8");
-	const statements = getTsStatements(content);
-	const importName = getOrchidOrmImportName(statements);
-	if (!importName) throw new Error(`Main file does not contain import of orchid-orm`);
-	const { config, tablesList } = getOrchidOrmArgs(importName, statements);
+	const importInfo = getOrchidOrmImport(content);
+	if (!importInfo) throw new Error(`Main file does not contain import of orchid-orm`);
+	const { config, tablesList } = getOrchidOrmArgs(content, importInfo.importName);
 	const changes = [];
 	let replacedConfig;
 	if (extensions.length || domains.length) {
@@ -3611,32 +3644,18 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, curre
 		}, ast.baseType.data.name ?? "")},`).join("\n    ")}\n  },`;
 		replacedConfig = code + "\n}";
 	}
-	const tablesChanges = makeTablesListChanges(content, statements, tablesList, tables, dbPath);
+	const tablesChanges = makeTablesListChanges(content, importInfo.lastImportEnd, tablesList, tables, dbPath);
 	if (tablesChanges) addChange(content, changes, tablesChanges.imports.pos, tablesChanges.imports.text);
 	if (replacedConfig) replaceContent(content, changes, config.pos, config.end, replacedConfig);
 	if (tablesChanges) addChange(content, changes, tablesChanges.tablesList.pos, tablesChanges.tablesList.text);
 	return applyChanges(content, changes);
 };
-const getTsStatements = (content) => {
-	return createSourceFile("file.ts", content, ScriptTarget.Latest, true).statements;
-};
-const getOrchidOrmImportName = (statements) => {
-	for (const node of statements) {
-		if (node.kind !== SyntaxKind.ImportDeclaration) continue;
-		const imp = node;
-		if (imp.moduleSpecifier.getText().slice(1, -1) !== "orchid-orm") continue;
-		if (!imp.importClause) continue;
-		const elements = imp.importClause.namedBindings?.elements;
-		if (!elements);
-		for (const element of elements) if (element.name.escapedText === "orchidORM" || element.propertyName && "escapedText" in element.propertyName && element.propertyName.escapedText === "orchidORM") return element.name.escapedText.toString();
-	}
-};
-const makeTablesListChanges = (content, statements, object, tables, dbPath) => {
+const makeTablesListChanges = (content, importPos, object, tables, dbPath) => {
 	const spaces = getTablesListSpaces(content, object);
 	let imports = "";
 	let tablesList = "";
-	const prependComma = object.properties.length && !object.properties.hasTrailingComma;
-	const tablesListNewLine = content.slice(object.properties.end, object.end).includes("\n");
+	const prependComma = object.hasProperties && !object.hasTrailingComma;
+	const tablesListNewLine = content.slice(object.propertiesEnd, object.end).includes("\n");
 	const tablesArr = Object.values(tables);
 	for (let i = 0; i < tablesArr.length; i++) {
 		const { path, className, key } = tablesArr[i];
@@ -3646,15 +3665,13 @@ const makeTablesListChanges = (content, statements, object, tables, dbPath) => {
 		if (i === tablesArr.length - 1 && !tablesListNewLine) tablesList += `\n${spaces}`;
 	}
 	if (!imports.length) return;
-	let importPos = 0;
-	for (const node of statements) if (node.kind === SyntaxKind.ImportDeclaration) importPos = node.end;
 	return {
 		imports: {
 			pos: importPos,
 			text: imports
 		},
 		tablesList: {
-			pos: object.properties.end,
+			pos: object.propertiesEnd,
 			text: tablesList
 		}
 	};
@@ -3663,24 +3680,165 @@ const getTablesListSpaces = (content, object) => {
 	const lines = content.slice(0, object.end).split("\n");
 	return lines[lines.length - 1].match(/^\s+/)?.[0] || "";
 };
-const getOrchidOrmArgs = (importName, statements) => {
-	for (const v of statements) {
-		if (v.kind !== SyntaxKind.VariableStatement) continue;
-		for (const node of v.declarationList.declarations) {
-			const call = node.initializer;
-			if (call?.kind !== SyntaxKind.CallExpression) continue;
-			if (call.expression.getText() !== importName) continue;
-			if (call.arguments.length !== 2) throw new Error("Invalid number of arguments when initializing orchid orm");
-			const object = call.arguments[1];
-			if (object?.kind !== SyntaxKind.ObjectLiteralExpression) throw new Error("Second argument of orchidORM must be an object literal");
-			return {
-				config: call.arguments[0],
-				tablesList: object
-			};
+const getOrchidOrmArgs = (content, importName) => {
+	const call = findCall(content, importName);
+	if (!call) throw new Error("List of tables is not found in main file");
+	const closeParen = findClosingBracket(content, call.openParen);
+	if (closeParen === -1) throw new Error("List of tables is not found in main file");
+	const firstComma = findTopLevelComma(content, call.openParen + 1, closeParen);
+	if (firstComma === -1) throw new Error("Invalid number of arguments when initializing orchid orm");
+	if (findTopLevelComma(content, firstComma + 1, closeParen) !== -1) throw new Error("Invalid number of arguments when initializing orchid orm");
+	const config = makeTrimmedRange(content, call.openParen + 1, firstComma);
+	const tablesList = getObjectRange(content, firstComma + 1, closeParen);
+	if (!tablesList) throw new Error("Second argument of orchidORM must be an object literal");
+	return {
+		config,
+		tablesList
+	};
+};
+const getOrchidOrmImport = (content) => {
+	let lastImportEnd = 0;
+	let importName;
+	const importRegex = /(^|\n)\s*import\s+([\s\S]*?)\s+from\s+['"]([^'"]+)['"]\s*;?/g;
+	let match;
+	while (match = importRegex.exec(content)) {
+		lastImportEnd = importRegex.lastIndex;
+		if (match[3] !== "orchid-orm") continue;
+		const named = match[2].match(/\{([\s\S]*)\}/);
+		if (!named) continue;
+		for (const part of named[1].split(",")) {
+			const item = part.trim();
+			const alias = item.match(/^orchidORM\s+as\s+([A-Za-z_$][\w$]*)$/);
+			if (alias) {
+				importName = alias[1];
+				continue;
+			}
+			if (item === "orchidORM") importName = "orchidORM";
 		}
 	}
+	if (!importName) return;
+	return {
+		importName,
+		lastImportEnd
+	};
+};
+const findCall = (content, importName) => {
+	let index = 0;
+	while (index < content.length) {
+		const found = content.indexOf(importName, index);
+		if (found === -1) return;
+		const before = content[found - 1];
+		const after = content[found + importName.length];
+		if ((!before || !isIdentifierChar(before)) && (!after || !isIdentifierChar(after))) {
+			const openParen = skipWhitespace(content, found + importName.length);
+			if (content[openParen] === "(") return { openParen };
+		}
+		index = found + importName.length;
+	}
 	throw new Error("List of tables is not found in main file");
 };
+const getObjectRange = (content, from, to) => {
+	const pos = skipWhitespace(content, from);
+	if (content[pos] !== "{") return;
+	const end = findClosingBracket(content, pos);
+	if (end === -1 || skipWhitespace(content, end + 1) < to) return;
+	const lastBodyChar = findLastNonWhitespace(content, pos + 1, end);
+	const hasProperties = lastBodyChar !== -1;
+	const hasTrailingComma = hasProperties && content[lastBodyChar] === ",";
+	const propertiesEnd = hasProperties ? lastBodyChar + 1 : pos + 1;
+	return {
+		pos,
+		end: end + 1,
+		propertiesEnd,
+		hasProperties,
+		hasTrailingComma
+	};
+};
+const makeTrimmedRange = (content, from, to) => {
+	return {
+		pos: skipWhitespace(content, from),
+		end: trimWhitespaceEnd(content, from, to)
+	};
+};
+const findTopLevelComma = (content, from, to) => {
+	let depth = 0;
+	for (let i = from; i < to; i++) {
+		const skipped = skipCodeFragment(content, i);
+		if (skipped !== i) {
+			i = skipped - 1;
+			continue;
+		}
+		const char = content[i];
+		if (char === "(" || char === "{" || char === "[") depth++;
+		else if (char === ")" || char === "}" || char === "]") depth--;
+		else if (char === "," && depth === 0) return i;
+	}
+	return -1;
+};
+const findClosingBracket = (content, open) => {
+	const close = getClosingBracket(content[open]);
+	if (!close) return -1;
+	let depth = 1;
+	for (let i = open + 1; i < content.length; i++) {
+		const skipped = skipCodeFragment(content, i);
+		if (skipped !== i) {
+			i = skipped - 1;
+			continue;
+		}
+		const char = content[i];
+		if (char === content[open]) depth++;
+		else if (char === close) {
+			depth--;
+			if (depth === 0) return i;
+		}
+	}
+	return -1;
+};
+const getClosingBracket = (char) => {
+	if (char === "(") return ")";
+	if (char === "{") return "}";
+	if (char === "[") return "]";
+};
+const skipCodeFragment = (content, i) => {
+	const char = content[i];
+	if (char === "'" || char === "\"" || char === "`") return skipQuoted(content, i, char);
+	if (char === "/" && content[i + 1] === "/") {
+		const nextLine = content.indexOf("\n", i + 2);
+		return nextLine === -1 ? content.length : nextLine + 1;
+	}
+	if (char === "/" && content[i + 1] === "*") {
+		const end = content.indexOf("*/", i + 2);
+		return end === -1 ? content.length : end + 2;
+	}
+	return i;
+};
+const skipQuoted = (content, i, quote) => {
+	for (let j = i + 1; j < content.length; j++) {
+		if (content[j] === "\\") {
+			j++;
+			continue;
+		}
+		if (content[j] === quote) return j + 1;
+	}
+	return content.length;
+};
+const skipWhitespace = (content, from) => {
+	let i = from;
+	while (/\s/.test(content[i])) i++;
+	return i;
+};
+const trimWhitespaceEnd = (content, from, to) => {
+	let i = to;
+	while (i > from && /\s/.test(content[i - 1])) i--;
+	return i;
+};
+const findLastNonWhitespace = (content, from, to) => {
+	for (let i = to - 1; i >= from; i--) if (!/\s/.test(content[i])) return i;
+	return -1;
+};
+const isIdentifierChar = (char) => {
+	return /[A-Za-z0-9_$]/.test(char);
+};
 const addChange = (content, changes, at, text, end = at) => {
 	if (changes.length === 0) changes.push([0, at], text, [end, content.length]);
 	else {
@@ -3696,14 +3854,21 @@ const applyChanges = (content, changes) => {
 	return changes.length ? changes.map((item) => typeof item === "string" ? item : content.slice(item[0], item[1])).join("") : content;
 };
 const pull = async (adapters, config) => {
-	if (!config.dbPath || !config.baseTable) throw new Error(`\`${config.dbPath ? "baseTable" : "dbPath"}\` setting must be set in the migrations config for pull command`);
-	const baseTablePath = config.baseTable.getFilePath();
-	const baseTableExportedAs = config.baseTable.exportAs;
+	const { defineTable } = config;
+	if (!config.dbPath || !defineTable) throw new Error(`\`${config.dbPath ? "defineTable" : "dbPath"}\` setting must be set in the migrations config for pull command`);
+	if (!defineTable.types) throw new Error("defineTable is missing types");
+	if (!defineTable.exportAs) throw new Error("defineTable is missing exportAs");
+	if (typeof defineTable.getFilePath !== "function") throw new Error("defineTable is missing getFilePath");
+	const tableFactorySource = {
+		path: defineTable.getFilePath(),
+		exportedAs: defineTable.exportAs
+	};
 	const [adapter] = adapters;
 	const adapterSchema = adapter.getSchema();
 	const currentSchema = (typeof adapterSchema === "function" ? adapterSchema() : adapterSchema) ?? "public";
-	const asts = await (0, rake_db.structureToAst)((0, rake_db.makeStructureToAstCtx)(config, currentSchema), adapter, config);
-	const { tableInfos, fkeys } = getTableInfosAndFKeys(asts, config);
+	const ctx = (0, rake_db.makeStructureToAstCtx)(config, currentSchema);
+	const asts = await (0, rake_db.structureToAst)(ctx, adapter, config);
+	const tableInfos = getTableInfos(asts, config);
 	const exclusiveWriteOptions = { flag: "wx" };
 	const pendingFileWrites = [];
 	const tables = {};
@@ -3712,7 +3877,7 @@ const pull = async (adapters, config) => {
 	let firstTable;
 	for (const ast of asts) switch (ast.type) {
 		case "table": {
-			const table = appCodeGenTable(tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs, currentSchema);
+			const table = appCodeGenTable(tableInfos, ast, tableFactorySource, currentSchema);
 			tables[table.key] = table;
 			if (!firstTable) firstTable = table;
 			pendingFileWrites.push([
@@ -3728,9 +3893,7 @@ const pull = async (adapters, config) => {
 				version: ast.version
 			});
 			break;
-		case "domain":
-			domains.push(ast);
-			break;
+		case "domain": domains.push(ast);
 	}
 	if (!firstTable && !extensions.length && !domains.length) {
 		await adapter.close();