rake-db 2.7.2 → 2.8.1

package/dist/index.d.ts

@@ -262,13 +262,18 @@ declare namespace RakeDbAst {
 }
 
 type Db = DbResult<DefaultColumnTypes>;
-type InputRakeDbConfig<CT extends ColumnTypesBase> = Partial<Omit<RakeDbConfig<CT>, 'columnTypes'>> & ({
-    columnTypes?: CT | ((t: DefaultColumnTypes) => CT);
-} | {
-    baseTable?: new () => {
+type BaseTable<CT extends ColumnTypesBase> = {
+    name: string;
+    filePath: string;
+    new (): {
         columnTypes: CT;
         snakeCase?: boolean;
     };
+};
+type InputRakeDbConfig<CT extends ColumnTypesBase> = Partial<Omit<RakeDbConfig<CT>, 'columnTypes'>> & ({
+    columnTypes?: CT | ((t: DefaultColumnTypes) => CT);
+} | {
+    baseTable?: BaseTable<CT>;
 });
 type RakeDbConfig<CT extends ColumnTypesBase = DefaultColumnTypes> = {
     columnTypes: CT;
@@ -280,6 +285,7 @@ type RakeDbConfig<CT extends ColumnTypesBase = DefaultColumnTypes> = {
     commands: Record<string, (options: AdapterOptions[], config: RakeDbConfig<CT>, args: string[]) => Promise<void>>;
     import(path: string): Promise<void>;
     noPrimaryKey?: NoPrimaryKeyOption;
+    baseTable?: BaseTable<CT>;
     appCodeUpdater?: AppCodeUpdater;
     useCodeUpdater?: boolean;
     beforeMigrate?(db: Db): Promise<void>;
@@ -287,13 +293,22 @@ type RakeDbConfig<CT extends ColumnTypesBase = DefaultColumnTypes> = {
     beforeRollback?(db: Db): Promise<void>;
     afterRollback?(db: Db): Promise<void>;
 } & QueryLogOptions;
-type AppCodeUpdater = (params: {
-    ast: RakeDbAst;
+type AppCodeUpdaterParams = {
     options: AdapterOptions;
     basePath: string;
     cache: object;
     logger: QueryLogOptions['logger'];
-}) => Promise<void>;
+    baseTable: {
+        filePath: string;
+        name: string;
+    };
+};
+type AppCodeUpdater = {
+    process(params: AppCodeUpdaterParams & {
+        ast: RakeDbAst;
+    }): Promise<void>;
+    afterAll(params: AppCodeUpdaterParams): Promise<void>;
+};
 
 declare const createDb: <CT extends ColumnTypesBase>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;
 declare const dropDb: (arg: MaybeArray<AdapterOptions>) => Promise<void>;

package/dist/index.js

@@ -64,43 +64,25 @@ const migrationConfigDefaults = {
   useCodeUpdater: true
 };
 const processRakeDbConfig = (config) => {
-  var _a, _b;
+  var _a;
   const result = __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
+  if (config.appCodeUpdater && (!("baseTable" in config) || !config.baseTable)) {
+    throw new Error(
+      "`baseTable` option is required in `rakeDb` for `appCodeUpdater`"
+    );
+  }
   if (!result.log) {
     delete result.logger;
   }
   if (!result.basePath || !result.dbScript) {
-    let stack;
-    const original = Error.prepareStackTrace;
-    Error.prepareStackTrace = (_, s) => stack = s;
-    new Error().stack;
-    Error.prepareStackTrace = original;
-    if (stack) {
-      const thisFile = (_a = stack[0]) == null ? void 0 : _a.getFileName();
-      const thisDir = thisFile && path.dirname(thisFile);
-      for (const item of stack) {
-        let file = item.getFileName();
-        if (!file || path.dirname(file) === thisDir || /\bnode_modules\b/.test(file)) {
-          continue;
-        }
-        if (/file:\/\/\/\w+:\//.test(file)) {
-          file = decodeURI(file.slice(8));
-        } else {
-          try {
-            file = new URL(file).pathname;
-          } catch (_) {
-          }
-        }
-        result.basePath = path.dirname(file);
-        result.dbScript = path.basename(file);
-        break;
-      }
-    }
-    if (!result.basePath) {
+    const filePath = orchidCore.getCallerFilePath();
+    if (!filePath) {
       throw new Error(
         "Failed to determine path to db script. Please set basePath option of rakeDb"
       );
     }
+    result.basePath = path.dirname(filePath);
+    result.dbScript = path.basename(filePath);
   }
   if (!path.isAbsolute(result.migrationsPath)) {
     result.migrationsPath = path.resolve(
@@ -109,7 +91,7 @@ const processRakeDbConfig = (config) => {
     );
   }
   if ("baseTable" in config) {
-    const proto = (_b = config.baseTable) == null ? void 0 : _b.prototype;
+    const proto = (_a = config.baseTable) == null ? void 0 : _a.prototype;
     result.columnTypes = proto.columnTypes || pqb.columnTypes;
     if (proto.snakeCase)
       result.snakeCase = true;
@@ -1647,7 +1629,7 @@ var __spreadValues$1 = (a, b) => {
 };
 const getDb = (adapter) => pqb.createDb({ adapter });
 const migrateOrRollback = async (options, config, args, up) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   config = __spreadValues$1({}, config);
   const files = await getMigrationFiles(config, up);
   let count = up ? Infinity : 1;
@@ -1698,6 +1680,14 @@ const migrateOrRollback = async (options, config, args, up) => {
         await ((_e = config.afterRollback) == null ? void 0 : _e.call(config, db != null ? db : db = getDb(adapter)));
       }
     } finally {
+      await ((_f = config.appCodeUpdater) == null ? void 0 : _f.afterAll({
+        options: opts,
+        basePath: config.basePath,
+        cache: appCodeUpdaterCache,
+        logger: config.logger,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        baseTable: config.baseTable
+      }));
       await adapter.close();
     }
     delete config.appCodeUpdater;
@@ -1736,12 +1726,14 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     return db2.migratedAsts;
   });
   for (const ast of asts) {
-    await ((_a = config.appCodeUpdater) == null ? void 0 : _a.call(config, {
+    await ((_a = config.appCodeUpdater) == null ? void 0 : _a.process({
       ast,
       options,
       basePath: config.basePath,
       cache: appCodeUpdaterCache,
-      logger: config.logger
+      logger: config.logger,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      baseTable: config.baseTable
     }));
   }
 };
@@ -2987,7 +2979,7 @@ const createView = (ast) => {
 };
 
 const pullDbStructure = async (options, config) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const adapter = new pqb.Adapter(options);
   const currentSchema = adapter.schema || "public";
   const db = new DbStructure(adapter);
@@ -3010,19 +3002,29 @@ const pullDbStructure = async (options, config) => {
   await saveMigratedVersion(silentQueries, version, config);
   const cache = {};
   for (const item of ast) {
-    await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.call(config, {
+    await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.process({
       ast: item,
       options,
       basePath: config.basePath,
       cache,
-      logger: config.logger
+      logger: config.logger,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      baseTable: config.baseTable
     }));
   }
+  await ((_b = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _b.afterAll({
+    options,
+    basePath: config.basePath,
+    cache,
+    logger: config.logger,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    baseTable: config.baseTable
+  }));
   const unsupportedEntries = Object.entries(ctx.unsupportedTypes);
   const len = unsupportedEntries.length;
   if (len) {
     let count = 0;
-    (_b = config.logger) == null ? void 0 : _b.warn(
+    (_c = config.logger) == null ? void 0 : _c.warn(
       `Found unsupported types:
 ${unsupportedEntries.map(([type, columns]) => {
         count += columns.length;
@@ -3031,7 +3033,7 @@ ${unsupportedEntries.map(([type, columns]) => {
 Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count > 1 ? "s" : ""} to treat ${count > 1 ? "them" : "it"} as other column type`
     );
   }
-  (_c = config.logger) == null ? void 0 : _c.log("Database pulled successfully");
+  (_d = config.logger) == null ? void 0 : _d.log("Database pulled successfully");
   adapter.close();
 };