rake-db 2.6.0 → 2.7.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { quote, getRaw, EnumColumn, columnTypes, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, TimestampTzColumn, referencesArgsToCode, constraintPropsToCode } from 'pqb';
-import { singleQuote, toSnakeCase, isRaw, toArray, snakeCaseKey, nameKey, emptyObject, deepCompare, raw, pathToLog, emptyArray, toCamelCase, codeToString, addCode, rawToCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+import { columnTypes, quote, getRaw, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, TimestampTzColumn, referencesArgsToCode, constraintPropsToCode } from 'pqb';
+import { singleQuote, toSnakeCase, isRaw, toArray, snakeCaseKey, nameKey, emptyObject, deepCompare, raw, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, rawToCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
 import prompts from 'prompts';
@@ -35,12 +35,12 @@ const migrationConfigDefaults = {
   useCodeUpdater: true
 };
 const processRakeDbConfig = (config) => {
-  var _a;
+  var _a, _b;
   const result = __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
   if (!result.log) {
     delete result.logger;
   }
-  if (!result.basePath) {
+  if (!result.basePath || !result.dbScript) {
     let stack;
     const original = Error.prepareStackTrace;
     Error.prepareStackTrace = (_, s) => stack = s;
@@ -63,6 +63,7 @@ const processRakeDbConfig = (config) => {
           }
         }
         result.basePath = path.dirname(file);
+        result.dbScript = path.basename(file);
         break;
       }
     }
@@ -78,6 +79,14 @@ const processRakeDbConfig = (config) => {
       result.migrationsPath
     );
   }
+  if ("baseTable" in config) {
+    const proto = (_b = config.baseTable) == null ? void 0 : _b.prototype;
+    result.columnTypes = proto.columnTypes || columnTypes;
+    if (proto.snakeCase)
+      result.snakeCase = true;
+  } else {
+    result.columnTypes = "columnTypes" in config && (typeof config.columnTypes === "function" ? config.columnTypes(columnTypes) : config.columnTypes) || columnTypes;
+  }
   return result;
 };
 const getDatabaseAndUserFromOptions = (options) => {
@@ -247,13 +256,11 @@ const makePopulateEnumQuery = (item) => {
 };
 
 let currentChanges = [];
-const change = (fn) => {
-  currentChanges.push(fn);
-};
 const clearChanges = () => {
   currentChanges = [];
 };
 const getCurrentChanges = () => currentChanges;
+const pushChange = (fn) => currentChanges.push(fn);
 
 var __defProp$5 = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
@@ -548,9 +555,12 @@ var __objRest$1 = (source, exclude) => {
     }
   return target;
 };
-const types = Object.assign(Object.create(columnTypes), tableMethods);
 const createTable$1 = async (migration, up, tableName, options, fn) => {
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
+  const types = Object.assign(
+    Object.create(migration.columnTypes),
+    tableMethods
+  );
   types[snakeCaseKey] = snakeCase;
   const shape = getColumnTypes(types, fn);
   const tableData = getTableData();
@@ -874,7 +884,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   var _a;
   resetTableData();
   resetChangeTableData();
-  const tableChanger = Object.create(columnTypes);
+  const tableChanger = Object.create(migration.columnTypes);
   Object.assign(tableChanger, tableChangeMethods);
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
   tableChanger[snakeCaseKey] = snakeCase;
@@ -1264,10 +1274,10 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-const createMigrationInterface = (tx, up, options) => {
+const createMigrationInterface = (tx, up, config) => {
   const adapter = new TransactionAdapter(tx, tx.client, tx.types);
   const { query, arrays } = adapter;
-  const log = logParamToLogObject(options.logger || console, options.log);
+  const log = logParamToLogObject(config.logger || console, config.log);
   adapter.query = (q, types) => {
     return wrapWithLog(log, q, () => query.call(adapter, q, types));
   };
@@ -1275,7 +1285,10 @@ const createMigrationInterface = (tx, up, options) => {
     return wrapWithLog(log, q, () => arrays.call(adapter, q, types));
   };
   Object.assign(adapter, { silentQuery: query, silentArrays: arrays });
-  const db = createDb$1({ adapter });
+  const db = createDb$1({
+    adapter,
+    columnTypes: config.columnTypes
+  });
   const { prototype: proto } = MigrationBase;
   for (const key of Object.getOwnPropertyNames(proto)) {
     db[key] = proto[key];
@@ -1285,7 +1298,7 @@ const createMigrationInterface = (tx, up, options) => {
     adapter,
     log,
     up,
-    options
+    options: config
   });
 };
 class MigrationBase {
@@ -1532,7 +1545,7 @@ const createDomain$1 = async (migration, up, name, fn, options) => {
     action: up ? "create" : "drop",
     schema,
     name: domainName,
-    baseType: fn(columnTypes)
+    baseType: fn(migration.columnTypes)
   }, options);
   let query;
   const values = [];
@@ -1669,7 +1682,6 @@ const begin = {
 const processMigration = async (db, up, file, config, options, appCodeUpdaterCache) => {
   var _a;
   const asts = await db.transaction(begin, async (tx) => {
-    const db2 = createMigrationInterface(tx, up, config);
     clearChanges();
     let changes = changeCache[file.path];
     if (!changes) {
@@ -1683,6 +1695,7 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
       changes = getCurrentChanges();
       changeCache[file.path] = changes;
     }
+    const db2 = createMigrationInterface(tx, up, config);
     for (const fn of up ? changes : changes.reverse()) {
       await fn(db2, up);
     }
@@ -1829,14 +1842,18 @@ const writeMigrationFile = async (config, version, name, content) => {
   var _a;
   await mkdir(config.migrationsPath, { recursive: true });
   const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
-  await writeFile(filePath, content);
+  const importPath = getImportPath(
+    filePath,
+    path.join(config.basePath, config.dbScript)
+  );
+  await writeFile(filePath, content(importPath, name));
   (_a = config.logger) == null ? void 0 : _a.log(`Created ${pathToLog(filePath)}`);
 };
 const generate = async (config, [name]) => {
   if (!name)
     throw new Error("Migration name is missing");
   const version = makeFileTimeStamp();
-  await writeMigrationFile(config, version, name, makeContent(name));
+  await writeMigrationFile(config, version, name, makeContent);
 };
 const makeFileTimeStamp = () => {
   const now = /* @__PURE__ */ new Date();
@@ -1849,8 +1866,8 @@ const makeFileTimeStamp = () => {
     now.getUTCSeconds()
   ].map((value) => value < 10 ? `0${value}` : value).join("");
 };
-const makeContent = (name) => {
-  let content = `import { change } from 'rake-db';
+const makeContent = (importPath, name) => {
+  let content = `import { change } from '${importPath}';
 
 change(async (db) => {`;
   const [first, rest] = getFirstWordAndRest(name);
@@ -2774,8 +2791,7 @@ const astToMigration = (config, ast) => {
   }
   if (!first.length && !tablesAndViews.length && !constraints.length)
     return;
-  let code = `import { change } from 'rake-db';
-`;
+  let code = "";
   if (first.length) {
     code += `
 change(async (db) => {
@@ -2799,7 +2815,8 @@ ${codeToString(constraints, "  ", "  ")}
 });
 `;
   }
-  return code;
+  return (importPath) => `import { change } from '${importPath}';
+${code}`;
 };
 const createSchema = (ast) => {
   return `await db.createSchema(${singleQuote(ast.name)});`;
@@ -2989,9 +3006,20 @@ Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count >
   adapter.close();
 };
 
-const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2)) => {
-  var _a, _b, _c;
+const rakeDb = (options, partialConfig = {}, args = process.argv.slice(2)) => {
   const config = processRakeDbConfig(partialConfig);
+  const promise = runCommand(options, config, args);
+  return Object.assign(
+    (fn) => {
+      pushChange(fn);
+    },
+    {
+      promise
+    }
+  );
+};
+const runCommand = async (options, config, args = process.argv.slice(2)) => {
+  var _a, _b, _c;
   const command = (_a = args[0]) == null ? void 0 : _a.split(":")[0];
   try {
     if (command === "create") {
@@ -3052,5 +3080,5 @@ Migrate and rollback common arguments:
   --code false            do not run code updater
 `;
 
-export { MigrationBase, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { MigrationBase, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map