rake-db 2.3.16 → 2.3.18

package/.turbo/turbo-test.log

@@ -0,0 +1,22 @@
+
+> rake-db@2.3.17 test /home/romeo/dev/my/orchid-orm/packages/rake-db
+> jest "--coverage" "--coverageReporters" "json-summary"
+
+PASS src/commands/generate.test.ts
+PASS src/commands/migrateOrRollback.test.ts
+PASS src/commands/createOrDrop.test.ts
+PASS src/migration/createTable.test.ts
+PASS src/migration/changeTable.test.ts
+PASS src/common.test.ts
+PASS src/migration/migration.test.ts
+PASS src/rakeDb.test.ts
+PASS src/pull/astToMigration.test.ts
+PASS src/pull/pull.test.ts
+PASS src/pull/dbStructure.test.ts
+PASS src/pull/structureToAst.test.ts
+
+Test Suites: 12 passed, 12 total
+Tests:       182 passed, 182 total
+Snapshots:   0 total
+Time:        8.267 s, estimated 10 s
+Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # rake-db
 
+## 2.3.18
+
+### Patch Changes
+
+- Relative path in rakeDb config
+
+## 2.3.17
+
+### Patch Changes
+
+- Updated dependencies
+  - pqb@0.9.12
+
 ## 2.3.16
 
 ### Patch Changes

package/{db.ts → app/dbScript.ts}

@@ -1,8 +1,8 @@
 import { config } from 'dotenv';
 import path from 'path';
-import { rakeDb } from './src/rakeDb';
+import { rakeDb } from '../src/rakeDb';
 import { AdapterOptions } from 'pqb';
-import { appCodeUpdater } from '../orm/src';
+import { appCodeUpdater } from '../../orm/src';
 
 config({ path: path.resolve('.env.local') });
 config();
@@ -24,10 +24,10 @@ if (databaseURLTest) {
 rakeDb(options, {
   migrationsPath: 'migrations',
   appCodeUpdater: appCodeUpdater({
-    tablePath: (tableName) => `app/tables/${tableName}.ts`,
-    baseTablePath: 'app/lib/baseTable.ts',
+    tablePath: (tableName) => `tables/${tableName}.ts`,
+    baseTablePath: 'lib/baseTable.ts',
     baseTableName: 'BaseTable',
-    mainFilePath: 'app/db.ts',
+    mainFilePath: 'db.ts',
   }),
   useCodeUpdater: false,
 });

package/{migrations → app/migrations}/20221017181504_createUser.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('user', (t) => ({

package/{migrations → app/migrations}/20221017200111_createProfile.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('profile', (t) => ({

package/{migrations → app/migrations}/20221017200252_createChat.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('chat', (t) => ({

package/{migrations → app/migrations}/20221017200326_createChatUser.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('chatUser', (t) => ({

package/{migrations → app/migrations}/20221017200900_createMessage.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('message', (t) => ({

package/{migrations → app/migrations}/20221017201235_createGeoSchema.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createSchema('geo');

package/{migrations → app/migrations}/20221017210011_createCountry.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('geo.country', (t) => ({

package/{migrations → app/migrations}/20221017210133_createCity.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('geo.city', (t) => ({

package/{migrations → app/migrations}/20221105202843_createUniqueTable.ts

@@ -1,4 +1,4 @@
-import { change } from '../src';
+import { change } from '../../src';
 
 change(async (db) => {
   await db.createTable('uniqueTable', (t) => ({

package/dist/index.d.ts

@@ -495,10 +495,11 @@ declare namespace RakeDbAst {
 
 declare type Db = DbResult<DefaultColumnTypes>;
 declare type RakeDbConfig = {
+    basePath: string;
     migrationsPath: string;
     migrationsTable: string;
     commands: Record<string, (options: AdapterOptions[], config: RakeDbConfig, args: string[]) => Promise<void>>;
-    requireTs(path: string): Promise<void>;
+    import(path: string): Promise<void>;
     noPrimaryKey?: NoPrimaryKeyOption;
     appCodeUpdater?: AppCodeUpdater;
     useCodeUpdater?: boolean;
@@ -510,6 +511,7 @@ declare type RakeDbConfig = {
 declare type AppCodeUpdater = (params: {
     ast: RakeDbAst;
     options: AdapterOptions;
+    basePath: string;
     cache: object;
 }) => Promise<void>;
 

package/dist/index.js

@@ -6,6 +6,7 @@ var pqb = require('pqb');
 var Enquirer = require('enquirer');
 var path = require('path');
 var promises = require('fs/promises');
+var url = require('url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,16 +51,45 @@ var __spreadValues$6 = (a, b) => {
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const migrationConfigDefaults = {
-  migrationsPath: path__default["default"].resolve("src", "db", "migrations"),
+  migrationsPath: path__default["default"].join("src", "db", "migrations"),
   migrationsTable: "schemaMigrations",
   commands: {},
-  requireTs: (path2) => (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path2),
+  import: (path2) => (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path2),
   log: true,
   logger: console,
   useCodeUpdater: true
 };
-const getMigrationConfigWithDefaults = (config) => {
-  return __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
+const processRakeDbConfig = (config) => {
+  var _a;
+  const result = __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
+  if (!result.basePath) {
+    let stack;
+    Error.prepareStackTrace = (_, s) => stack = s;
+    new Error().stack;
+    if (stack) {
+      const thisFile = (_a = stack[0]) == null ? void 0 : _a.getFileName();
+      for (const item of stack) {
+        const file = item.getFileName();
+        if (!file || file === thisFile || /\bnode_modules\b/.test(file)) {
+          continue;
+        }
+        result.basePath = path__default["default"].dirname(file);
+        break;
+      }
+    }
+    if (!result.basePath) {
+      throw new Error(
+        "Failed to determine path to db script. Please set basePath option of rakeDb"
+      );
+    }
+  }
+  if (!path__default["default"].isAbsolute(result.migrationsPath)) {
+    result.migrationsPath = path__default["default"].resolve(
+      result.basePath,
+      result.migrationsPath
+    );
+  }
+  return result;
 };
 const getDatabaseAndUserFromOptions = (options) => {
   if (options.databaseURL) {
@@ -166,7 +196,7 @@ const getMigrationFiles = async (config, up) => {
   const { migrationsPath } = config;
   let files;
   try {
-    files = await promises.readdir(path__default["default"].resolve(migrationsPath));
+    files = await promises.readdir(migrationsPath);
   } catch (_) {
     return [];
   }
@@ -1118,6 +1148,7 @@ const runCodeUpdater = (migration, ast) => {
   return (_b = (_a = migration.options).appCodeUpdater) == null ? void 0 : _b.call(_a, {
     ast,
     options: migration.adapterOptions,
+    basePath: migration.options.basePath,
     cache: migration.appCodeUpdaterCache
   });
 };
@@ -1210,7 +1241,7 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     if (callback) {
       change(callback);
     } else {
-      await config.requireTs(file.path);
+      await config.import(url.pathToFileURL(file.path).toString());
       changeCache[file.path] = getCurrentChangeCallback();
     }
     await getCurrentPromise();
@@ -1335,7 +1366,7 @@ const resetDb = async (arg, config) => {
 };
 
 const writeMigrationFile = async (config, name, content) => {
-  await promises.mkdir(path__default["default"].resolve(config.migrationsPath), { recursive: true });
+  await promises.mkdir(config.migrationsPath, { recursive: true });
   const filePath = path__default["default"].resolve(
     config.migrationsPath,
     `${makeFileTimeStamp()}_${name}.ts`
@@ -2047,7 +2078,7 @@ const pullDbStructure = async (options, config) => {
 
 const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2)) => {
   var _a;
-  const config = getMigrationConfigWithDefaults(partialConfig);
+  const config = processRakeDbConfig(partialConfig);
   const command = (_a = args[0]) == null ? void 0 : _a.split(":")[0];
   if (command === "create") {
     await createDb(options, config);