rake-db 2.7.1 → 2.8.0

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>;
@@ -293,6 +299,10 @@ type AppCodeUpdater = (params: {
     basePath: string;
     cache: object;
     logger: QueryLogOptions['logger'];
+    baseTable: {
+        filePath: string;
+        name: string;
+    };
 }) => Promise<void>;
 
 declare const createDb: <CT extends ColumnTypesBase>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;

package/dist/index.js

@@ -50,49 +50,39 @@ const migrationConfigDefaults = {
   migrationsTable: "schemaMigrations",
   snakeCase: false,
   commands: {},
-  import: (path2) => import(path2),
+  import: (path2) => {
+    return import(path2).catch((err) => {
+      if (err.code === "ERR_UNKNOWN_FILE_EXTENSION") {
+        require(path2);
+      } else {
+        throw err;
+      }
+    });
+  },
   log: true,
   logger: console,
   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(
@@ -101,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;
@@ -1733,7 +1723,9 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
       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
     }));
   }
 };
@@ -3007,7 +2999,9 @@ const pullDbStructure = async (options, config) => {
       options,
       basePath: config.basePath,
       cache,
-      logger: config.logger
+      logger: config.logger,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      baseTable: config.baseTable
     }));
   }
   const unsupportedEntries = Object.entries(ctx.unsupportedTypes);