@plugjs/plug 0.0.15 → 0.0.17

package/src/plugs/tsc/runner.ts

@@ -1,6 +1,7 @@
-import ts from 'typescript'; // TypeScript does NOT support ESM modules
+import ts from 'typescript' // TypeScript does NOT support ESM modules
 
-import { failure } from '../../assert'
+import { assertPromises } from '../../assert'
+import { BuildFailure } from '../../failure'
 import { Files } from '../../files'
 import { $p, log } from '../../log'
 import { AbsolutePath, resolveFile } from '../../paths'
@@ -95,16 +96,12 @@ export default class Tsc implements Plug<Files> {
       promises.push(builder.write(fileName, code).then((file) => {
         log.trace('Written', $p(file))
       }).catch((error) => {
-        context.log.error('Error writing to', fileName, error)
-        throw failure() // no more logs!
+        throw new BuildFailure(`Error writing to ${fileName}`, [ error ])
       }))
     })
 
     /* Await for all files to be written and check */
-    const settlements = await Promise.allSettled(promises)
-    const failures = settlements
-        .reduce((failures, s) => failures + s.status === 'rejected' ? 1 : 0, 0)
-    if (failures) throw failure() // already logged above
+    await assertPromises(promises, 'Error writing files')
 
     /* Update report and fail on errors */
     updateReport(report, result.diagnostics, rootDir)

package/src/plugs/tsc.ts

@@ -1,7 +1,7 @@
 import type { CompilerOptions } from 'typescript'
 
+import { installForking } from '../fork'
 import { requireResolve } from '../paths'
-import { installForking } from '../pipe'
 
 declare module '../pipe' {
   export interface Pipe {

package/src/types.ts

@@ -44,14 +44,14 @@ export interface Task<T extends Result = Result> {
   /** The absolute file name where this {@link Task} was defined */
   readonly buildFile: AbsolutePath,
   /** Invoke a task from (possibly) a different {@link Context} */
-  call(state: State, taskName: string): Promise<T>
+  invoke(state: State, taskName: string): Promise<T>
 }
 
 /**
  * The {@link TaskResult} type identifies _what_ can be returned by a
  * {@link TaskDef | _task definition_}.
  */
-export type TaskResult = Pipe | Promise<undefined> | Files | void | undefined
+export type TaskResult = Pipe | Files | void | undefined
 
 /** The {@link TaskDef} type identifies the _definition_ of a task. */
 export type TaskDef<R extends TaskResult = TaskResult> = () => R | Promise<R>
@@ -70,9 +70,7 @@ export type Tasks<D extends BuildDef = BuildDef> = {
   readonly [ k in string & keyof D as D[k] extends TaskDef | Task ? k : never ] :
     D[k] extends TaskDef<infer R> ?
       R extends void | undefined ? Task<undefined> :
-      R extends Promise<undefined> ? Task<undefined> :
-      R extends Pipe ? Task<Files> :
-      R extends Files ? Task<Files> :
+      R extends Pipe | Files ? Task<Files> :
       never :
     D[k] extends Task ? D[k] :
     never
@@ -83,9 +81,8 @@ export type Tasks<D extends BuildDef = BuildDef> = {
  * ========================================================================== */
 
 /**
- * The {@link BuildDef} interface describes the _definition_ of a
- * {@link Context}, that is the object passed to {@link build} to produce
- * a {@link Build}.
+ * The {@link BuildDef} interface describes the _definition_ of a {@link Build},
+ * all its properties and tasks.
  */
 export interface BuildDef {
   [ k : string ] : string | TaskDef | Task
@@ -100,11 +97,11 @@ export type ThisBuild<D extends BuildDef> = {
     k extends string ?
       D[k] extends TaskDef<infer R> ?
         R extends Promise<undefined> | void | undefined ? () => Promise<undefined> :
-        R extends Pipe | Files ? () => Pipe & Promise<Files> :
+        R extends Pipe | Files ? () => Pipe :
         never :
       D[k] extends Task<infer R> ?
         R extends undefined ? () => Promise<undefined> :
-        R extends Files ? () => Pipe & Promise<Files> :
+        R extends Files ? () => Pipe :
         never :
       D[k] extends string ?
         string :
@@ -116,8 +113,4 @@ export type ThisBuild<D extends BuildDef> = {
  * The {@link Build} type represents the collection of {@link Task}s
  * and _properties_ compiled from a {@link BuildDef | build definition}.
  */
-export type Build<
-  D extends BuildDef = BuildDef,
-  T extends Tasks<D> = Tasks<D>,
-  P extends Props<D> = Props<D>,
-> = T & P
+export type Build<D extends BuildDef = BuildDef> = Tasks<D> & Props<D>

package/src/utils/asyncfs.ts

@@ -1,4 +1,5 @@
 import { constants } from 'node:fs'
+
 import fsp from 'node:fs/promises'
 
 type FsPromises = typeof fsp