rake-db 2.36.18 → 2.37.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ArrayColumn, Column, CustomTypeColumn, DomainColumn, EnumColumn, PostgisGeographyPointColumn, RawSql, TimestampColumn, TimestampTZColumn, UnknownColumn, addCode, assignDbDataToColumn, backtickQuote, codeToString, colors, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getColumnTypes, getDriverErrorCode, getImportPath, getStackTrace, indexInnerToCode, isRawSQL, logParamToLogObject, makeColumnTypes, makeColumnsByType, parseTableData, parseTableDataInput, pathToLog, primaryKeyInnerToCode, pushTableDataCode, quoteIdentifier, quoteObjectKey, raw, rawSqlToCode, referencesArgsToCode, setCurrentColumnName, setDefaultLanguage, singleQuote, tableDataMethods, toArray, toCamelCase, toSnakeCase } from "pqb/internal";
+import { ArrayColumn, Column, CustomTypeColumn, DomainColumn, EnumColumn, PostgisGeographyPointColumn, RawSql, TimestampColumn, TimestampTZColumn, UnknownColumn, addCode, assignDbDataToColumn, backtickQuote, codeToString, colors, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getColumnTypes, getDriverErrorCode, getForeignKeyTableInstance, getImportPath, getStackTrace, indexInnerToCode, isRawSQL, logParamToLogObject, makeColumnTypes, makeColumnsByType, parseTableData, parseTableDataInput, pathToLog, primaryKeyInnerToCode, pushTableDataCode, quoteIdentifier, quoteObjectKey, raw, rawSqlToCode, referencesArgsToCode, setCurrentColumnName, setDefaultLanguage, singleQuote, tableDataMethods, toArray, toCamelCase, toSnakeCase } from "pqb/internal";
 import path, { join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createDbWithAdapter } from "pqb";
@@ -182,7 +182,7 @@ const addColumnComment = (comments, name, item) => {
 };
 const getForeignKeyTable = (schema, fnOrTable) => {
 	if (typeof fnOrTable === "string") return getSchemaAndTableFromName(schema, fnOrTable);
-	const item = new (fnOrTable())();
+	const item = getForeignKeyTableInstance(fnOrTable());
 	return [item.schema, item.table];
 };
 const getConstraintName = (table, constraint, snakeCase) => {
@@ -409,6 +409,33 @@ const migrationsSchemaTableSql = (adapter, config) => {
 };
 var RakeDbError = class extends Error {};
 var NoPrimaryKey = class extends RakeDbError {};
+const getTableFactoryConfig = ({ baseTable, defineTable }) => {
+	if (baseTable && defineTable) throw new Error("Configure either baseTable or defineTable, not both");
+	if (defineTable) {
+		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");
+		return {
+			columnTypes: defineTable.types,
+			exportAs: defineTable.exportAs,
+			getFilePath: defineTable.getFilePath,
+			nowSQL: defineTable.nowSQL,
+			snakeCase: defineTable.snakeCase,
+			language: defineTable.language
+		};
+	}
+	if (baseTable) {
+		const { types, snakeCase, language } = baseTable.prototype || {};
+		return {
+			columnTypes: types,
+			exportAs: baseTable.exportAs,
+			getFilePath: baseTable.getFilePath,
+			nowSQL: baseTable.nowSQL,
+			snakeCase,
+			language
+		};
+	}
+};
 const createTable$1 = async (migration, tableMethods, up, tableName, first, second, third) => {
 	let options;
 	let fn;
@@ -428,7 +455,8 @@ const createTable$1 = async (migration, tableMethods, up, tableName, first, seco
 	let shape;
 	let tableData;
 	if (fn) {
-		shape = getColumnTypes(types, fn, migration.options.baseTable?.nowSQL, language);
+		const tableFactory = getTableFactoryConfig(migration.options);
+		shape = getColumnTypes(types, fn, tableFactory?.nowSQL, language);
 		tableData = parseTableData(dataFn);
 		tableData.constraints?.forEach((x, i) => {
 			if (x.name || !x.check) return;
@@ -3267,10 +3295,10 @@ const processMigrateConfig = (config, db) => {
 		migrationsPath,
 		...handleConfigLogger(config, db)
 	};
-	if ("baseTable" in config && config.baseTable) {
-		const { snakeCase, language } = config.baseTable.prototype;
-		if (snakeCase) result.snakeCase = true;
-		if (language) result.language = language;
+	const tableFactory = getTableFactoryConfig(config);
+	if (tableFactory) {
+		if (tableFactory.snakeCase) result.snakeCase = true;
+		if (tableFactory.language) result.language = tableFactory.language;
 	}
 	return result;
 };
@@ -6125,6 +6153,7 @@ const ensureBasePathAndDbScript = (config, intermediateCallers = 0) => {
 const makeRakeDbConfig = (config, args) => {
 	const ic = intermediateCallers;
 	intermediateCallers = 0;
+	const tableFactory = getTableFactoryConfig(config);
 	const result = {
 		...rakeDbConfigDefaults,
 		...config,
@@ -6134,10 +6163,8 @@ const makeRakeDbConfig = (config, args) => {
 	Object.assign(result, processMigrateConfig(result));
 	if (!result.recurrentPath && result.migrationsPath) result.recurrentPath = path.join(result.migrationsPath, "recurrent");
 	if (result.recurrentPath && !path.isAbsolute(result.recurrentPath)) result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
-	if ("baseTable" in config && config.baseTable) {
-		const { types } = config.baseTable.prototype;
-		result.columnTypes = types || makeColumnTypes(defaultSchemaConfig());
-	} else {
+	if (tableFactory) result.columnTypes = tableFactory.columnTypes || makeColumnTypes(defaultSchemaConfig());
+	else {
 		const ct = "columnTypes" in config && config.columnTypes;
 		result.columnTypes = (typeof ct === "function" ? ct(makeColumnTypes(defaultSchemaConfig())) : ct) || makeColumnTypes(defaultSchemaConfig());
 	}
@@ -6245,6 +6272,6 @@ ${commandsHelp.map(([key, help, helpArguments]) => {
 `);
 	}
 };
-export { RakeDbError, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
+export { RakeDbError, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, getTableFactoryConfig, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
 
 //# sourceMappingURL=index.mjs.map