Merge pull request #237 from leapfrogtechnology/feat/fix-relative-path

Use relative base path respective to config file

src/config.ts

@@ -47,7 +47,7 @@ export function getSqlBasePath(config: Configuration): string {
 export async function loadConfig(configFilename: string = CONFIG_FILENAME): Promise<Configuration> {
   log('Resolving config file.');
   const isAbsolutePath = path.isAbsolute(configFilename);
-  const filename = isAbsolutePath ? path.parse(configFilename).base : configFilename;
+  const filename = path.parse(configFilename).base;
   const match = filename.match(CONFIG_FILE_CONVENTION) || filename === CONFIG_FILENAME;
 
   if (!match) {
@@ -63,8 +63,13 @@ export async function loadConfig(configFilename: string = CONFIG_FILENAME): Prom
 
   validate(loaded);
 
+  // Resolve the base path relative to the config file location.
+  const configFileLocation = path.dirname(filepath);
+  const relativeBasePath = path.join(configFileLocation, loaded.basePath);
+
   const result = {
     ...loaded,
+    basePath: relativeBasePath,
     injectedConfig: {
       ...loaded.injectedConfig,
       vars: prepareInjectionConfigVars(loaded.injectedConfig.vars)

src/constants.ts

@@ -1,7 +1,5 @@
 /* Global Constants */
 
-import * as path from 'path';
-
 import Configuration from './domain/Configuration';
 
 // General constants
@@ -13,7 +11,7 @@ export const CONNECTIONS_FILENAME = 'connections.sync-db.json';
 
 export const INJECTED_CONFIG_TABLE = '__sync_db_injected_config';
 export const DEFAULT_CONFIG: Configuration = {
-  basePath: path.resolve(process.cwd(), 'src'),
+  basePath: 'src',
   connectionResolver: '',
   execution: 'parallel',
   sql: [],