Merge pull request #4 from kontheocharis/bug-fixes

Add some bug fixes and improvements to the API

api.ts

@@ -120,7 +120,7 @@ export interface CommonApi {
   /**
    * Read the contents of the given file.
    */
-  read: (filename: string) => Promise<Output>;
+  read: (filename: string) => Promise<string>;
 }
 
 /**
@@ -197,15 +197,17 @@ export interface GlobalConfig {
 /**
  * Make a powar-ts module.
  */
-export function module<T>(m: (vars: T) => Module): (vars: T) => Module {
+export function module<T = undefined>(
+  m: T extends undefined ? () => Module : (vars: T) => Module
+): typeof m {
   return m;
 }
 
 /**
  * Produce some object `U` determined by some module variables `T` and the powar-ts module API.
  */
 export function produce<T, U>(
-  m: (vars: T, p: ModuleApi) => U,
+  m: (vars: T, p: ModuleApi) => U
 ): (vars: T, p: ModuleApi) => U {
   return m;
 }

api_impl.ts

@@ -69,7 +69,7 @@ export function makeCommonApi({
       await ensureParentExists(dest);
       // Ensure to fully resolve the source path, so that the link is not
       // relative.
-      await exec(`ln -sf "$(realpath '${src}')" "${dest}"`);
+      await exec(`ln -sf "$(realpath ${src})" "${dest}"`);
     });
   }
 
@@ -80,8 +80,8 @@ export function makeCommonApi({
     });
   }
 
-  async function read(filename: string): Promise<Output> {
-    return await exec(`cat "${filename}"`);
+  async function read(filename: string): Promise<string> {
+    return (await exec(`cat "${filename}"`)).stdoutAsString();
   }
 
   return {
@@ -101,7 +101,7 @@ export function makeCommonApi({
  */
 async function iterateEntries(
   entries: [string, string | string[]][],
-  fn: (src: string, dest: string) => Promise<void>,
+  fn: (src: string, dest: string) => Promise<void>
 ): Promise<void> {
   for (const [src, d] of entries) {
     const destinations = Array.isArray(d) ? d : [d];

run.ts

@@ -83,17 +83,15 @@ function ensureDepsAreMet(ctx: Ctx): void {
  */
 async function performModuleActions(ctx: Ctx): Promise<void> {
   const { log, settings } = ctx;
-  await Promise.all(
-    getRequestedModules(ctx).map(async (module) => {
-      log.info(`Running ${module.name}...`);
-      const api = makeCommonApi({
-        log: makeLogger(settings.logLevel, 1),
-        path: module.path,
-        settings,
-      });
-      await module.action(api);
-    })
-  );
+  for (const module of getRequestedModules(ctx)) {
+    log.info(`Running ${module.name}...`);
+    const api = makeCommonApi({
+      log: makeLogger(settings.logLevel, 1),
+      path: module.path,
+      settings,
+    });
+    await module.action(api);
+  }
 }
 
 /**