@plugjs/plug 0.0.7 → 0.0.8

package/dist/plugs/tsc/options.cjs

@@ -68,8 +68,7 @@ async function getCompilerOptions(file, ...override) {
   if (file)
     result = mergeResults(result, await loadOptions(file));
   if (override.length) {
-    const [overrides, overridesFile] = override;
-    const overridesDir = (0, import_paths.getAbsoluteParent)(overridesFile);
+    const [overrides, overridesFile, overridesDir] = override;
     const options = import_typescript.default.convertCompilerOptionsFromJson(overrides, overridesDir, overridesFile);
     result = mergeResults(result, options);
   }

package/dist/plugs/tsc/options.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/plugs/tsc/options.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AAEf,mBAAqE;AACrE,qBAAyB;AAWzB,SAAS,aACL,MACA,UAC6B;AAC/B,SAAO;AAAA,IACL,SAAS,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AAAA,IAChD,QAAQ,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AAAA,EAC/C;AACF;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,UAAM,gCAAkB,IAAI;AAGlC,QAAM,OAAO,UAAM,yBAAS,MAAM,OAAO;AACzC,QAAM,EAAE,QAAQ,MAAM,IAAI,kBAAAA,QAAG,0BAA0B,MAAM,IAAI;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAGnD,QAAM,EAAE,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI;AACvD,QAAM,SAAS,kBAAAA,QAAG,+BAA+B,iBAAiB,KAAK,IAAI;AAC3E,MAAI,OAAO,OAAO;AAAQ,WAAO;AAGjC,MAAI,CAAC;AAAa,WAAO;AAGzB,QAAM,UAAM,kCAAoB,KAAK,WAAW;AAGhD,MAAI,MAAM,SAAS,GAAG,GAAG;AACvB,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC;AAAA,MACrD,UAAU,kBAAAA,QAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA,MACN,MAAM,kBAAAA,QAAG,iBAAiB,MAAM,MAAM,kBAAAA,QAAG,aAAa,MAAM,OAAO,kBAAAA,QAAG,WAAW,IAAI;AAAA,MACrF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAeA,eAAsB,mBAClB,SACG,UACmC;AACxC,MAAI,SAAwC,EAAE,SAAS,kBAAAA,QAAG,0BAA0B,GAAG,QAAQ,CAAC,EAAE;AAGlG,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,SAAS,QAAQ;AACnB,UAAM,CAAE,WAAW,aAAc,IAAI;AACrC,UAAM,mBAAe,gCAAkB,aAAa;AACpD,UAAM,UAAU,kBAAAA,QAAG,+BAA+B,WAAW,cAAc,aAAa;AACxF,aAAS,aAAa,QAAQ,OAAO;AAAA,EACvC;AAGA,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AAEf,mBAAqE;AACrE,qBAAyB;AAWzB,SAAS,aACL,MACA,UAC6B;AAC/B,SAAO;AAAA,IACL,SAAS,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AAAA,IAChD,QAAQ,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AAAA,EAC/C;AACF;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,UAAM,gCAAkB,IAAI;AAGlC,QAAM,OAAO,UAAM,yBAAS,MAAM,OAAO;AACzC,QAAM,EAAE,QAAQ,MAAM,IAAI,kBAAAA,QAAG,0BAA0B,MAAM,IAAI;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAGnD,QAAM,EAAE,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI;AACvD,QAAM,SAAS,kBAAAA,QAAG,+BAA+B,iBAAiB,KAAK,IAAI;AAC3E,MAAI,OAAO,OAAO;AAAQ,WAAO;AAGjC,MAAI,CAAC;AAAa,WAAO;AAGzB,QAAM,UAAM,kCAAoB,KAAK,WAAW;AAGhD,MAAI,MAAM,SAAS,GAAG,GAAG;AACvB,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC;AAAA,MACrD,UAAU,kBAAAA,QAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA,MACN,MAAM,kBAAAA,QAAG,iBAAiB,MAAM,MAAM,kBAAAA,QAAG,aAAa,MAAM,OAAO,kBAAAA,QAAG,WAAW,IAAI;AAAA,MACrF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAgBA,eAAsB,mBAClB,SACG,UACmC;AACxC,MAAI,SAAwC,EAAE,SAAS,kBAAAA,QAAG,0BAA0B,GAAG,QAAQ,CAAC,EAAE;AAGlG,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,SAAS,QAAQ;AACnB,UAAM,CAAE,WAAW,eAAe,YAAa,IAAI;AACnD,UAAM,UAAU,kBAAAA,QAAG,+BAA+B,WAAW,cAAc,aAAa;AACxF,aAAS,aAAa,QAAQ,OAAO;AAAA,EACvC;AAGA,SAAO;AACT;",
   "names": ["ts"]
 }

package/dist/plugs/tsc/options.mjs

@@ -38,8 +38,7 @@ async function getCompilerOptions(file, ...override) {
   if (file)
     result = mergeResults(result, await loadOptions(file));
   if (override.length) {
-    const [overrides, overridesFile] = override;
-    const overridesDir = getAbsoluteParent(overridesFile);
+    const [overrides, overridesFile, overridesDir] = override;
     const options = ts.convertCompilerOptionsFromJson(overrides, overridesDir, overridesFile);
     result = mergeResults(result, options);
   }

package/dist/plugs/tsc/options.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/plugs/tsc/options.ts"],
-  "mappings": ";AAAA,OAAO,QAAQ;AAEf,SAAuB,mBAAmB,2BAA2B;AACrE,SAAS,gBAAgB;AAWzB,SAAS,aACL,MACA,UAC6B;AAC/B,SAAO;AAAA,IACL,SAAS,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AAAA,IAChD,QAAQ,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AAAA,EAC/C;AACF;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,MAAM,kBAAkB,IAAI;AAGlC,QAAM,OAAO,MAAM,SAAS,MAAM,OAAO;AACzC,QAAM,EAAE,QAAQ,MAAM,IAAI,GAAG,0BAA0B,MAAM,IAAI;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAGnD,QAAM,EAAE,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI;AACvD,QAAM,SAAS,GAAG,+BAA+B,iBAAiB,KAAK,IAAI;AAC3E,MAAI,OAAO,OAAO;AAAQ,WAAO;AAGjC,MAAI,CAAC;AAAa,WAAO;AAGzB,QAAM,MAAM,oBAAoB,KAAK,WAAW;AAGhD,MAAI,MAAM,SAAS,GAAG,GAAG;AACvB,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC;AAAA,MACrD,UAAU,GAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA,MACN,MAAM,GAAG,iBAAiB,MAAM,MAAM,GAAG,aAAa,MAAM,OAAO,GAAG,WAAW,IAAI;AAAA,MACrF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAeA,eAAsB,mBAClB,SACG,UACmC;AACxC,MAAI,SAAwC,EAAE,SAAS,GAAG,0BAA0B,GAAG,QAAQ,CAAC,EAAE;AAGlG,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,SAAS,QAAQ;AACnB,UAAM,CAAE,WAAW,aAAc,IAAI;AACrC,UAAM,eAAe,kBAAkB,aAAa;AACpD,UAAM,UAAU,GAAG,+BAA+B,WAAW,cAAc,aAAa;AACxF,aAAS,aAAa,QAAQ,OAAO;AAAA,EACvC;AAGA,SAAO;AACT;",
+  "mappings": ";AAAA,OAAO,QAAQ;AAEf,SAAuB,mBAAmB,2BAA2B;AACrE,SAAS,gBAAgB;AAWzB,SAAS,aACL,MACA,UAC6B;AAC/B,SAAO;AAAA,IACL,SAAS,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AAAA,IAChD,QAAQ,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AAAA,EAC/C;AACF;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,MAAM,kBAAkB,IAAI;AAGlC,QAAM,OAAO,MAAM,SAAS,MAAM,OAAO;AACzC,QAAM,EAAE,QAAQ,MAAM,IAAI,GAAG,0BAA0B,MAAM,IAAI;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAGnD,QAAM,EAAE,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI;AACvD,QAAM,SAAS,GAAG,+BAA+B,iBAAiB,KAAK,IAAI;AAC3E,MAAI,OAAO,OAAO;AAAQ,WAAO;AAGjC,MAAI,CAAC;AAAa,WAAO;AAGzB,QAAM,MAAM,oBAAoB,KAAK,WAAW;AAGhD,MAAI,MAAM,SAAS,GAAG,GAAG;AACvB,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC;AAAA,MACrD,UAAU,GAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA,MACN,MAAM,GAAG,iBAAiB,MAAM,MAAM,GAAG,aAAa,MAAM,OAAO,GAAG,WAAW,IAAI;AAAA,MACrF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAgBA,eAAsB,mBAClB,SACG,UACmC;AACxC,MAAI,SAAwC,EAAE,SAAS,GAAG,0BAA0B,GAAG,QAAQ,CAAC,EAAE;AAGlG,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,SAAS,QAAQ;AACnB,UAAM,CAAE,WAAW,eAAe,YAAa,IAAI;AACnD,UAAM,UAAU,GAAG,+BAA+B,WAAW,cAAc,aAAa;AACxF,aAAS,aAAa,QAAQ,OAAO;AAAA,EACvC;AAGA,SAAO;AACT;",
   "names": []
 }

package/dist/plugs/tsc/runner.cjs

@@ -46,35 +46,49 @@ var Tsc = class {
     this._options = options;
   }
   async pipe(files, run) {
-    const tsconfig = this._tsconfig ? run.resolve(this._tsconfig) : (0, import_paths.isFile)(files.directory, "tsconfig.json");
-    const overrides = {
-      rootDir: files.directory,
-      ...this._options
-    };
+    const baseDir = run.resolve(".");
+    const report = run.report("TypeScript Report");
+    const overrides = { ...this._options };
+    const sourcesConfig = (0, import_paths.isFile)(files.directory, "tsconfig.json");
+    const tsconfig = this._tsconfig ? run.resolve(this._tsconfig) : sourcesConfig || (0, import_paths.isFile)(run.resolve("tsconfig.json"));
+    let rootDir;
+    if (overrides.rootDir) {
+      rootDir = overrides.rootDir = run.resolve(overrides.rootDir);
+    } else {
+      rootDir = overrides.rootDir = files.directory;
+    }
+    let outDir;
+    if (overrides.outDir) {
+      outDir = overrides.outDir = run.resolve(overrides.outDir);
+    } else {
+      outDir = overrides.outDir = rootDir;
+    }
+    if (overrides.rootDirs) {
+      overrides.rootDirs = overrides.rootDirs.map((dir) => run.resolve(dir));
+    }
+    if (overrides.baseUrl)
+      overrides.baseUrl = run.resolve(overrides.baseUrl);
     const { errors, options } = await (0, import_options2.getCompilerOptions)(
       tsconfig,
       overrides,
-      run.buildFile
+      run.buildFile,
+      baseDir
     );
-    const report = run.report("TypeScript Report");
-    (0, import_report.updateReport)(report, errors, (0, import_paths.getCurrentWorkingDirectory)());
+    (0, import_report.updateReport)(report, errors, baseDir);
     if (report.errors)
       report.done(true);
-    const { rootDir, outDir } = options;
-    const root = rootDir ? run.resolve(rootDir) : files.directory;
-    const out = outDir ? run.resolve(outDir) : root;
-    const host = new import_compiler.TypeScriptHost(root);
     const paths = [...files.absolutePaths()];
     for (const path of paths)
       import_log.log.trace(`Compiling "${(0, import_log.$p)(path)}"`);
     import_log.log.info("Compiling", paths.length, "files");
     import_log.log.debug("Compliation options", options);
+    const host = new import_compiler.TypeScriptHost(rootDir);
     const program = import_typescript.default.createProgram(paths, options, host, void 0, errors);
     const diagnostics = import_typescript.default.getPreEmitDiagnostics(program);
-    (0, import_report.updateReport)(report, diagnostics, root);
+    (0, import_report.updateReport)(report, diagnostics, rootDir);
     if (report.errors)
       report.done(true);
-    const builder = run.files(out);
+    const builder = run.files(outDir);
     const promises = [];
     const result = program.emit(void 0, (fileName, code) => {
       promises.push(builder.write(fileName, code).then((file) => {
@@ -84,13 +98,13 @@ var Tsc = class {
         throw (0, import_assert.failure)();
       }));
     });
-    (0, import_report.updateReport)(report, result.diagnostics, root);
-    if (report.errors)
-      report.done(true);
     const settlements = await Promise.allSettled(promises);
     const failures = settlements.reduce((failures2, s) => failures2 + s.status === "rejected" ? 1 : 0, 0);
     if (failures)
       throw (0, import_assert.failure)();
+    (0, import_report.updateReport)(report, result.diagnostics, rootDir);
+    if (report.errors)
+      report.done(true);
     const outputs = builder.build();
     import_log.log.info("TSC produced", outputs.length, "files into", (0, import_log.$p)(outputs.directory));
     return outputs;

package/dist/plugs/tsc/runner.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/plugs/tsc/runner.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AAEf,oBAAwB;AAExB,iBAAwB;AACxB,mBAAmD;AAGnD,qBAA2C;AAC3C,sBAA+B;AAC/B,IAAAA,kBAAmC;AACnC,oBAA6B;AAM7B,IAAqB,MAArB,MAAgD;AAAA,EAC7B;AAAA,EACA;AAAA,EAOjB,eAAe,MAAwC;AACrD,UAAM,EAAE,QAAQ,CAAE,QAAS,GAAG,QAAQ,QAAI,6BAAa,MAAM,CAAC,CAAC;AAC/D,SAAK,YAAY;AACjB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,KAAK,OAAc,KAA0B;AACjD,UAAM,WAAW,KAAK,YACpB,IAAI,QAAQ,KAAK,SAAS,QAC1B,qBAAO,MAAM,WAAW,eAAe;AAEzC,UAAM,YAAgC;AAAA,MACpC,SAAS,MAAM;AAAA,MACf,GAAG,KAAK;AAAA,IACV;AAEA,UAAM,EAAE,QAAQ,QAAQ,IAAI,UAAM;AAAA,MAC9B;AAAA,MACA;AAAA,MACA,IAAI;AAAA,IAAS;AAEjB,UAAM,SAAS,IAAI,OAAO,mBAAmB;AAG7C,oCAAa,QAAQ,YAAQ,yCAA2B,CAAC;AACzD,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAEnC,UAAM,EAAE,SAAS,OAAO,IAAI;AAC5B,UAAM,OAAO,UAAU,IAAI,QAAQ,OAAO,IAAI,MAAM;AACpD,UAAM,MAAM,SAAS,IAAI,QAAQ,MAAM,IAAI;AAE3C,UAAM,OAAO,IAAI,+BAAe,IAAI;AAEpC,UAAM,QAAQ,CAAE,GAAG,MAAM,cAAc,CAAE;AACzC,eAAW,QAAQ;AAAO,qBAAI,MAAM,kBAAc,eAAG,IAAI,IAAI;AAG7D,mBAAI,KAAK,aAAa,MAAM,QAAQ,OAAO;AAC3C,mBAAI,MAAM,uBAAuB,OAAO;AAExC,UAAM,UAAU,kBAAAC,QAAG,cAAc,OAAO,SAAS,MAAM,QAAW,MAAM;AACxE,UAAM,cAAc,kBAAAA,QAAG,sBAAsB,OAAO;AAGpD,oCAAa,QAAQ,aAAa,IAAI;AACtC,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAEnC,UAAM,UAAU,IAAI,MAAM,GAAG;AAC7B,UAAM,WAA4B,CAAC;AACnC,UAAM,SAAS,QAAQ,KAAK,QAAW,CAAC,UAAU,SAAS;AACzD,eAAS,KAAK,QAAQ,MAAM,UAAU,IAAI,EAAE,KAAK,CAAC,SAAS;AACzD,uBAAI,MAAM,eAAW,eAAG,IAAI,CAAC;AAAA,MAC/B,CAAC,EAAE,MAAM,CAAC,UAAU;AAClB,YAAI,IAAI,MAAM,oBAAoB,UAAU,KAAK;AACjD,kBAAM,uBAAQ;AAAA,MAChB,CAAC,CAAC;AAAA,IACJ,CAAC;AAGD,oCAAa,QAAQ,OAAO,aAAa,IAAI;AAC7C,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAGnC,UAAM,cAAc,MAAM,QAAQ,WAAW,QAAQ;AACrD,UAAM,WAAW,YACZ,OAAO,CAACC,WAAU,MAAMA,YAAW,EAAE,WAAW,aAAa,IAAI,GAAG,CAAC;AAC1E,QAAI;AAAU,gBAAM,uBAAQ;AAG5B,UAAM,UAAU,QAAQ,MAAM;AAC9B,mBAAI,KAAK,gBAAgB,QAAQ,QAAQ,kBAAc,eAAG,QAAQ,SAAS,CAAC;AAC5E,WAAO;AAAA,EACT;AACF;",
+  "mappings": "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",
   "names": ["import_options", "ts", "failures"]
 }

package/dist/plugs/tsc/runner.mjs

@@ -2,7 +2,7 @@
 import ts from "typescript";
 import { failure } from "../../assert.mjs";
 import { $p, log } from "../../log.mjs";
-import { getCurrentWorkingDirectory, isFile } from "../../paths.mjs";
+import { isFile } from "../../paths.mjs";
 import { parseOptions } from "../../utils/options.mjs";
 import { TypeScriptHost } from "./compiler.mjs";
 import { getCompilerOptions } from "./options.mjs";
@@ -16,35 +16,49 @@ var Tsc = class {
     this._options = options;
   }
   async pipe(files, run) {
-    const tsconfig = this._tsconfig ? run.resolve(this._tsconfig) : isFile(files.directory, "tsconfig.json");
-    const overrides = {
-      rootDir: files.directory,
-      ...this._options
-    };
+    const baseDir = run.resolve(".");
+    const report = run.report("TypeScript Report");
+    const overrides = { ...this._options };
+    const sourcesConfig = isFile(files.directory, "tsconfig.json");
+    const tsconfig = this._tsconfig ? run.resolve(this._tsconfig) : sourcesConfig || isFile(run.resolve("tsconfig.json"));
+    let rootDir;
+    if (overrides.rootDir) {
+      rootDir = overrides.rootDir = run.resolve(overrides.rootDir);
+    } else {
+      rootDir = overrides.rootDir = files.directory;
+    }
+    let outDir;
+    if (overrides.outDir) {
+      outDir = overrides.outDir = run.resolve(overrides.outDir);
+    } else {
+      outDir = overrides.outDir = rootDir;
+    }
+    if (overrides.rootDirs) {
+      overrides.rootDirs = overrides.rootDirs.map((dir) => run.resolve(dir));
+    }
+    if (overrides.baseUrl)
+      overrides.baseUrl = run.resolve(overrides.baseUrl);
     const { errors, options } = await getCompilerOptions(
       tsconfig,
       overrides,
-      run.buildFile
+      run.buildFile,
+      baseDir
     );
-    const report = run.report("TypeScript Report");
-    updateReport(report, errors, getCurrentWorkingDirectory());
+    updateReport(report, errors, baseDir);
     if (report.errors)
       report.done(true);
-    const { rootDir, outDir } = options;
-    const root = rootDir ? run.resolve(rootDir) : files.directory;
-    const out = outDir ? run.resolve(outDir) : root;
-    const host = new TypeScriptHost(root);
     const paths = [...files.absolutePaths()];
     for (const path of paths)
       log.trace(`Compiling "${$p(path)}"`);
     log.info("Compiling", paths.length, "files");
     log.debug("Compliation options", options);
+    const host = new TypeScriptHost(rootDir);
     const program = ts.createProgram(paths, options, host, void 0, errors);
     const diagnostics = ts.getPreEmitDiagnostics(program);
-    updateReport(report, diagnostics, root);
+    updateReport(report, diagnostics, rootDir);
     if (report.errors)
       report.done(true);
-    const builder = run.files(out);
+    const builder = run.files(outDir);
     const promises = [];
     const result = program.emit(void 0, (fileName, code) => {
       promises.push(builder.write(fileName, code).then((file) => {
@@ -54,13 +68,13 @@ var Tsc = class {
         throw failure();
       }));
     });
-    updateReport(report, result.diagnostics, root);
-    if (report.errors)
-      report.done(true);
     const settlements = await Promise.allSettled(promises);
     const failures = settlements.reduce((failures2, s) => failures2 + s.status === "rejected" ? 1 : 0, 0);
     if (failures)
       throw failure();
+    updateReport(report, result.diagnostics, rootDir);
+    if (report.errors)
+      report.done(true);
     const outputs = builder.build();
     log.info("TSC produced", outputs.length, "files into", $p(outputs.directory));
     return outputs;

package/dist/plugs/tsc/runner.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/plugs/tsc/runner.ts"],
-  "mappings": ";AAAA,OAAO,QAAQ;AAEf,SAAS,eAAe;AAExB,SAAS,IAAI,WAAW;AACxB,SAAS,4BAA4B,cAAc;AAGnD,SAAS,oBAAkC;AAC3C,SAAS,sBAAsB;AAC/B,SAAS,0BAA0B;AACnC,SAAS,oBAAoB;AAM7B,IAAqB,MAArB,MAAgD;AAAA,EAC7B;AAAA,EACA;AAAA,EAOjB,eAAe,MAAwC;AACrD,UAAM,EAAE,QAAQ,CAAE,QAAS,GAAG,QAAQ,IAAI,aAAa,MAAM,CAAC,CAAC;AAC/D,SAAK,YAAY;AACjB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,KAAK,OAAc,KAA0B;AACjD,UAAM,WAAW,KAAK,YACpB,IAAI,QAAQ,KAAK,SAAS,IAC1B,OAAO,MAAM,WAAW,eAAe;AAEzC,UAAM,YAAgC;AAAA,MACpC,SAAS,MAAM;AAAA,MACf,GAAG,KAAK;AAAA,IACV;AAEA,UAAM,EAAE,QAAQ,QAAQ,IAAI,MAAM;AAAA,MAC9B;AAAA,MACA;AAAA,MACA,IAAI;AAAA,IAAS;AAEjB,UAAM,SAAS,IAAI,OAAO,mBAAmB;AAG7C,iBAAa,QAAQ,QAAQ,2BAA2B,CAAC;AACzD,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAEnC,UAAM,EAAE,SAAS,OAAO,IAAI;AAC5B,UAAM,OAAO,UAAU,IAAI,QAAQ,OAAO,IAAI,MAAM;AACpD,UAAM,MAAM,SAAS,IAAI,QAAQ,MAAM,IAAI;AAE3C,UAAM,OAAO,IAAI,eAAe,IAAI;AAEpC,UAAM,QAAQ,CAAE,GAAG,MAAM,cAAc,CAAE;AACzC,eAAW,QAAQ;AAAO,UAAI,MAAM,cAAc,GAAG,IAAI,IAAI;AAG7D,QAAI,KAAK,aAAa,MAAM,QAAQ,OAAO;AAC3C,QAAI,MAAM,uBAAuB,OAAO;AAExC,UAAM,UAAU,GAAG,cAAc,OAAO,SAAS,MAAM,QAAW,MAAM;AACxE,UAAM,cAAc,GAAG,sBAAsB,OAAO;AAGpD,iBAAa,QAAQ,aAAa,IAAI;AACtC,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAEnC,UAAM,UAAU,IAAI,MAAM,GAAG;AAC7B,UAAM,WAA4B,CAAC;AACnC,UAAM,SAAS,QAAQ,KAAK,QAAW,CAAC,UAAU,SAAS;AACzD,eAAS,KAAK,QAAQ,MAAM,UAAU,IAAI,EAAE,KAAK,CAAC,SAAS;AACzD,YAAI,MAAM,WAAW,GAAG,IAAI,CAAC;AAAA,MAC/B,CAAC,EAAE,MAAM,CAAC,UAAU;AAClB,YAAI,IAAI,MAAM,oBAAoB,UAAU,KAAK;AACjD,cAAM,QAAQ;AAAA,MAChB,CAAC,CAAC;AAAA,IACJ,CAAC;AAGD,iBAAa,QAAQ,OAAO,aAAa,IAAI;AAC7C,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAGnC,UAAM,cAAc,MAAM,QAAQ,WAAW,QAAQ;AACrD,UAAM,WAAW,YACZ,OAAO,CAACA,WAAU,MAAMA,YAAW,EAAE,WAAW,aAAa,IAAI,GAAG,CAAC;AAC1E,QAAI;AAAU,YAAM,QAAQ;AAG5B,UAAM,UAAU,QAAQ,MAAM;AAC9B,QAAI,KAAK,gBAAgB,QAAQ,QAAQ,cAAc,GAAG,QAAQ,SAAS,CAAC;AAC5E,WAAO;AAAA,EACT;AACF;",
+  "mappings": "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",
   "names": ["failures"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/plug",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "type": "commonjs",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "bootstrap": "./bootstrap.sh",
-    "build": "node ./extra/cli.mjs --force-esm",
+    "build": "./runme.sh",
     "dev": "npx nodemon -e .ts -w ./test -w ./src -x ./runme.sh"
   },
   "author": "",

package/src/plugs/tsc/options.ts

@@ -72,12 +72,13 @@ export async function getCompilerOptions(
   file: AbsolutePath | undefined,
   overrides: ts.CompilerOptions,
   overridesFile: AbsolutePath,
+  overridesBasePath: AbsolutePath,
 ): Promise<CompilerOptionsAndDiagnostics>
 
 /** Load compiler options from a JSON file, and merge in the overrides */
 export async function getCompilerOptions(
     file?: AbsolutePath,
-    ...override: [ ts.CompilerOptions, AbsolutePath ] | []
+    ...override: [ ts.CompilerOptions, AbsolutePath, AbsolutePath ] | []
 ): Promise<CompilerOptionsAndDiagnostics> {
   let result: CompilerOptionsAndDiagnostics = { options: ts.getDefaultCompilerOptions(), errors: [] }
 
@@ -86,8 +87,7 @@ export async function getCompilerOptions(
 
   // If we have overrides, merge them
   if (override.length) {
-    const [ overrides, overridesFile ] = override
-    const overridesDir = getAbsoluteParent(overridesFile)
+    const [ overrides, overridesFile, overridesDir ] = override
     const options = ts.convertCompilerOptionsFromJson(overrides, overridesDir, overridesFile)
     result = mergeResults(result, options)
   }

package/src/plugs/tsc/runner.ts

@@ -3,7 +3,7 @@ import ts from 'typescript' // TypeScript does NOT support ESM modules
 import { failure } from '../../assert.js'
 import { Files } from '../../files.js'
 import { $p, log } from '../../log.js'
-import { getCurrentWorkingDirectory, isFile } from '../../paths.js'
+import { AbsolutePath, isFile } from '../../paths.js'
 import { Plug } from '../../pipe.js'
 import { Run } from '../../run.js'
 import { parseOptions, ParseOptions } from '../../utils/options.js'
@@ -31,47 +31,71 @@ export default class Tsc implements Plug<Files> {
   }
 
   async pipe(files: Files, run: Run): Promise<Files> {
-    const tsconfig = this._tsconfig ?
-      run.resolve(this._tsconfig) :
-      isFile(files.directory, 'tsconfig.json')
+    const baseDir = run.resolve('.') // "this" directory, base of all relative paths
+    const report = run.report('TypeScript Report') // report used throughout
+    const overrides = { ...this._options } // clone our options
+
+    /*
+     * The "tsconfig" file is either specified, or (if existing) first checked
+     * alongside the sources, otherwise checked in the current directory.
+     */
+    const sourcesConfig = isFile(files.directory, 'tsconfig.json')
+    const tsconfig = this._tsconfig ? run.resolve(this._tsconfig) :
+      sourcesConfig || isFile(run.resolve('tsconfig.json'))
+
+    /* Root directory must always exist */
+    let rootDir: AbsolutePath
+    if (overrides.rootDir) {
+      rootDir = overrides.rootDir = run.resolve(overrides.rootDir)
+    } else {
+      rootDir = overrides.rootDir = files.directory
+    }
+
+    /* Output directory _also_ must always exist */
+    let outDir: AbsolutePath
+    if (overrides.outDir) {
+      outDir = overrides.outDir = run.resolve(overrides.outDir)
+    } else {
+      outDir = overrides.outDir = rootDir // default to the root directory
+    }
 
-    const overrides: ts.CompilerOptions = {
-      rootDir: files.directory, // by default, our "files" directory
-      ...this._options, // any other options specified in the constructor
+    /* All other root paths */
+    if (overrides.rootDirs) {
+      overrides.rootDirs = overrides.rootDirs.map((dir) => run.resolve(dir))
     }
 
+    /* The baseURL is resolved, as well */
+    if (overrides.baseUrl) overrides.baseUrl = run.resolve(overrides.baseUrl)
+
+    /* We can now get our compiler options, and check any and all overrides */
     const { errors, options } = await getCompilerOptions(
         tsconfig, // resolved tsconfig.json from constructor, might be undefined
         overrides, // overrides from constructor, might be an empty object
-        run.buildFile) // overrides are defined in the build file, sooo.....
-
-    const report = run.report('TypeScript Report')
+        run.buildFile, // the build file where the overrides were specified,
+        baseDir) // base dir where to resolve overrides
 
-    // Update report and fail on errors
-    updateReport(report, errors, getCurrentWorkingDirectory())
+    /* Update report and fail on errors */
+    updateReport(report, errors, baseDir)
     if (report.errors) report.done(true)
 
-    const { rootDir, outDir } = options
-    const root = rootDir ? run.resolve(rootDir) : files.directory
-    const out = outDir ? run.resolve(outDir) : root
-
-    const host = new TypeScriptHost(root)
-
+    /* Prep for compilation */
     const paths = [ ...files.absolutePaths() ]
     for (const path of paths) log.trace(`Compiling "${$p(path)}"`)
 
-    // Get our build file and create the master program
     log.info('Compiling', paths.length, 'files')
     log.debug('Compliation options', options)
 
+    /* Typescript host, create program and compile */
+    const host = new TypeScriptHost(rootDir)
     const program = ts.createProgram(paths, options, host, undefined, errors)
     const diagnostics = ts.getPreEmitDiagnostics(program)
 
-    // Update report and fail on errors
-    updateReport(report, diagnostics, root)
+    /* Update report and fail on errors */
+    updateReport(report, diagnostics, rootDir)
     if (report.errors) report.done(true)
 
-    const builder = run.files(out)
+    /* Write out all files asynchronously */
+    const builder = run.files(outDir)
     const promises: Promise<void>[] = []
     const result = program.emit(undefined, (fileName, code) => {
       promises.push(builder.write(fileName, code).then((file) => {
@@ -82,17 +106,17 @@ export default class Tsc implements Plug<Files> {
       }))
     })
 
-    // Update report and fail on errors
-    updateReport(report, result.diagnostics, root)
-    if (report.errors) report.done(true)
-
-    // Await for all files to be written and check
+    /* 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
 
-    // All done, build our files and return it
+    /* Update report and fail on errors */
+    updateReport(report, result.diagnostics, rootDir)
+    if (report.errors) report.done(true)
+
+    /* All done, build our files and return it */
     const outputs = builder.build()
     log.info('TSC produced', outputs.length, 'files into', $p(outputs.directory))
     return outputs

package/types/plugs/tsc/options.d.ts

@@ -5,4 +5,4 @@ export declare type CompilerOptionsAndDiagnostics = {
     errors: readonly ts.Diagnostic[];
 };
 export declare function getCompilerOptions(file?: AbsolutePath): Promise<CompilerOptionsAndDiagnostics>;
-export declare function getCompilerOptions(file: AbsolutePath | undefined, overrides: ts.CompilerOptions, overridesFile: AbsolutePath): Promise<CompilerOptionsAndDiagnostics>;
+export declare function getCompilerOptions(file: AbsolutePath | undefined, overrides: ts.CompilerOptions, overridesFile: AbsolutePath, overridesBasePath: AbsolutePath): Promise<CompilerOptionsAndDiagnostics>;