@plugjs/typescript 0.4.35 → 0.5.0

package/dist/compiler.cjs

@@ -33,8 +33,8 @@ __export(compiler_exports, {
   TypeScriptHost: () => TypeScriptHost
 });
 module.exports = __toCommonJS(compiler_exports);
-var import_typescript = __toESM(require("typescript"), 1);
 var import_paths = require("@plugjs/plug/paths");
+var import_typescript = __toESM(require("typescript"), 1);
 var TypeScriptHost = class {
   constructor(_directory) {
     this._directory = _directory;

package/dist/compiler.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/compiler.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AACf,mBAAoC;AAI7B,IAAM,iBAAN,MACoB;AAAA,EAEzB,YAA6B,YAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA,EAKxD,cACI,UACA,iBACyB;AAC3B,UAAM,OAAO,KAAK,SAAS,QAAQ;AACnC,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,kBAAAA,QAAG,iBAAiB,UAAU,MAAM,eAAe;AAAA,EAC5D;AAAA;AAAA;AAAA,EAIA,UAAU,UAAwB;AAChC,UAAM,IAAI,MAAM,+BAA+B,QAAQ,GAAG;AAAA,EAC5D;AAAA;AAAA,EAGA,sBAAsB,SAAqC;AACzD,WAAO,kBAAAA,QAAG,sBAAsB,OAAO;AAAA,EACzC;AAAA;AAAA,EAGA,4BAAqC;AACnC,WAAO,kBAAAA,QAAG,IAAI;AAAA,EAChB;AAAA;AAAA,EAGA,WAAW,UAA2B;AACpC,WAAO,kBAAAA,QAAG,IAAI,eAAW,kCAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EACpF;AAAA;AAAA,EAGA,SAAS,UAAsC;AAC7C,WAAO,kBAAAA,QAAG,IAAI,aAAS,kCAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EAClF;AAAA;AAAA,EAGA,sBAAoC;AAClC,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,qBAAqB,UAA0B;AAE7C,QAAI,kBAAAA,QAAG,IAAI;AAA2B,aAAO;AAG7C,UAAM,0BAA0B;AAChC,WAAO,wBAAwB,KAAK,QAAQ,IAC1C,SAAS,QAAQ,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,IAChE;AAAA,EACJ;AAAA;AAAA;AAAA,EAIA,aAAqB;AACnB,WAAO,kBAAAA,QAAG,IAAI;AAAA,EAChB;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAoC;AACpC,wBAAe;AAIR,IAAM,iBAAN,MACoB;AAAA,EAEzB,YAA6B,YAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA,EAKxD,cACI,UACA,iBACyB;AAC3B,UAAM,OAAO,KAAK,SAAS,QAAQ;AACnC,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,kBAAAA,QAAG,iBAAiB,UAAU,MAAM,eAAe;AAAA,EAC5D;AAAA;AAAA;AAAA,EAIA,UAAU,UAAwB;AAChC,UAAM,IAAI,MAAM,+BAA+B,QAAQ,GAAG;AAAA,EAC5D;AAAA;AAAA,EAGA,sBAAsB,SAAqC;AACzD,WAAO,kBAAAA,QAAG,sBAAsB,OAAO;AAAA,EACzC;AAAA;AAAA,EAGA,4BAAqC;AACnC,WAAO,kBAAAA,QAAG,IAAI;AAAA,EAChB;AAAA;AAAA,EAGA,WAAW,UAA2B;AACpC,WAAO,kBAAAA,QAAG,IAAI,eAAW,kCAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EACpF;AAAA;AAAA,EAGA,SAAS,UAAsC;AAC7C,WAAO,kBAAAA,QAAG,IAAI,aAAS,kCAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EAClF;AAAA;AAAA,EAGA,sBAAoC;AAClC,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,qBAAqB,UAA0B;AAE7C,QAAI,kBAAAA,QAAG,IAAI;AAA2B,aAAO;AAG7C,UAAM,0BAA0B;AAChC,WAAO,wBAAwB,KAAK,QAAQ,IAC1C,SAAS,QAAQ,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,IAChE;AAAA,EACJ;AAAA;AAAA;AAAA,EAIA,aAAqB;AACnB,WAAO,kBAAAA,QAAG,IAAI;AAAA,EAChB;AACF;",
   "names": ["ts"]
 }

package/dist/compiler.mjs

@@ -1,6 +1,6 @@
 // compiler.ts
-import ts from "typescript";
 import { resolveAbsolutePath } from "@plugjs/plug/paths";
+import ts from "typescript";
 var TypeScriptHost = class {
   constructor(_directory) {
     this._directory = _directory;

package/dist/compiler.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/compiler.ts"],
-  "mappings": ";AAAA,OAAO,QAAQ;AACf,SAAS,2BAA2B;AAI7B,IAAM,iBAAN,MACoB;AAAA,EAEzB,YAA6B,YAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA,EAKxD,cACI,UACA,iBACyB;AAC3B,UAAM,OAAO,KAAK,SAAS,QAAQ;AACnC,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,GAAG,iBAAiB,UAAU,MAAM,eAAe;AAAA,EAC5D;AAAA;AAAA;AAAA,EAIA,UAAU,UAAwB;AAChC,UAAM,IAAI,MAAM,+BAA+B,QAAQ,GAAG;AAAA,EAC5D;AAAA;AAAA,EAGA,sBAAsB,SAAqC;AACzD,WAAO,GAAG,sBAAsB,OAAO;AAAA,EACzC;AAAA;AAAA,EAGA,4BAAqC;AACnC,WAAO,GAAG,IAAI;AAAA,EAChB;AAAA;AAAA,EAGA,WAAW,UAA2B;AACpC,WAAO,GAAG,IAAI,WAAW,oBAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EACpF;AAAA;AAAA,EAGA,SAAS,UAAsC;AAC7C,WAAO,GAAG,IAAI,SAAS,oBAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EAClF;AAAA;AAAA,EAGA,sBAAoC;AAClC,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,qBAAqB,UAA0B;AAE7C,QAAI,GAAG,IAAI;AAA2B,aAAO;AAG7C,UAAM,0BAA0B;AAChC,WAAO,wBAAwB,KAAK,QAAQ,IAC1C,SAAS,QAAQ,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,IAChE;AAAA,EACJ;AAAA;AAAA;AAAA,EAIA,aAAqB;AACnB,WAAO,GAAG,IAAI;AAAA,EAChB;AACF;",
+  "mappings": ";AAAA,SAAS,2BAA2B;AACpC,OAAO,QAAQ;AAIR,IAAM,iBAAN,MACoB;AAAA,EAEzB,YAA6B,YAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA,EAKxD,cACI,UACA,iBACyB;AAC3B,UAAM,OAAO,KAAK,SAAS,QAAQ;AACnC,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,GAAG,iBAAiB,UAAU,MAAM,eAAe;AAAA,EAC5D;AAAA;AAAA;AAAA,EAIA,UAAU,UAAwB;AAChC,UAAM,IAAI,MAAM,+BAA+B,QAAQ,GAAG;AAAA,EAC5D;AAAA;AAAA,EAGA,sBAAsB,SAAqC;AACzD,WAAO,GAAG,sBAAsB,OAAO;AAAA,EACzC;AAAA;AAAA,EAGA,4BAAqC;AACnC,WAAO,GAAG,IAAI;AAAA,EAChB;AAAA;AAAA,EAGA,WAAW,UAA2B;AACpC,WAAO,GAAG,IAAI,WAAW,oBAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EACpF;AAAA;AAAA,EAGA,SAAS,UAAsC;AAC7C,WAAO,GAAG,IAAI,SAAS,oBAAoB,KAAK,oBAAoB,GAAG,QAAQ,CAAC;AAAA,EAClF;AAAA;AAAA,EAGA,sBAAoC;AAClC,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,qBAAqB,UAA0B;AAE7C,QAAI,GAAG,IAAI;AAA2B,aAAO;AAG7C,UAAM,0BAA0B;AAChC,WAAO,wBAAwB,KAAK,QAAQ,IAC1C,SAAS,QAAQ,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,IAChE;AAAA,EACJ;AAAA;AAAA;AAAA,EAIA,aAAqB;AACnB,WAAO,GAAG,IAAI;AAAA,EAChB;AACF;",
   "names": []
 }

package/dist/options.cjs

@@ -33,48 +33,41 @@ __export(options_exports, {
   getCompilerOptions: () => getCompilerOptions
 });
 module.exports = __toCommonJS(options_exports);
-var import_typescript = __toESM(require("typescript"), 1);
 var import_paths = require("@plugjs/plug/paths");
-function mergeResults(base, override) {
-  const options = { ...base.options, ...override.options };
-  const errors = [...base.errors, ...override.errors];
-  return errors.length ? { options: {}, errors } : { options, errors: [] };
-}
-async function loadOptions(file, stack = [file]) {
-  const dir = (0, import_paths.getAbsoluteParent)(file);
+var import_typescript = __toESM(require("typescript"), 1);
+async function getCompilerOptions(file, overrides, inputs) {
+  if (!file) {
+    const options = { ...import_typescript.default.getDefaultCompilerOptions(), ...overrides };
+    return { options, errors: [] };
+  }
+  const host = {
+    useCaseSensitiveFileNames: import_typescript.default.sys.useCaseSensitiveFileNames,
+    readDirectory(rootDir, extensions, excludes, includes, depth) {
+      return import_typescript.default.sys.readDirectory(rootDir, extensions, excludes, includes, depth);
+    },
+    fileExists(path) {
+      return import_typescript.default.sys.fileExists(path);
+    },
+    readFile(path) {
+      return import_typescript.default.sys.readFile(path);
+    }
+  };
   const { config, error } = import_typescript.default.readConfigFile(file, import_typescript.default.sys.readFile);
   if (error)
     return { options: {}, errors: [error] };
-  const { compilerOptions = {}, extends: extendsPath } = config;
-  const result = import_typescript.default.convertCompilerOptionsFromJson(compilerOptions, dir, file);
-  if (result.errors.length)
-    return result;
-  if (!extendsPath)
-    return result;
-  const ext = (0, import_paths.resolveAbsolutePath)(dir, extendsPath);
-  if (stack.includes(ext)) {
-    const data = import_typescript.default.sys.readFile(file);
-    return { options: {}, errors: [{
-      messageText: `Circularity detected extending from "${ext}"`,
-      category: import_typescript.default.DiagnosticCategory.Error,
-      code: 18e3,
-      // copied from typescript internals...
-      file: import_typescript.default.createSourceFile(file, data, import_typescript.default.ScriptTarget.JSON, false, import_typescript.default.ScriptKind.JSON),
-      start: void 0,
-      length: void 0
-    }] };
-  }
-  return mergeResults(await loadOptions(ext, [...stack, ext]), result);
-}
-async function getCompilerOptions(file, overrides) {
-  const options = import_typescript.default.getDefaultCompilerOptions();
-  let result = { options, errors: [] };
-  if (file)
-    result = mergeResults(result, await loadOptions(file));
-  if (overrides) {
-    result = mergeResults(result, { options: overrides, errors: [] });
-  }
-  return result;
+  config.include = inputs;
+  return import_typescript.default.parseJsonConfigFileContent(
+    config,
+    // the parsed JSON
+    host,
+    // our config parser host
+    (0, import_paths.getAbsoluteParent)(file),
+    // directory for path resolution
+    overrides,
+    // overrides (from the TSC plug config)
+    file
+    // the file name for path resolution
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/options.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/options.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AACf,mBAAuD;AAavD,SAAS,aACL,MACA,UAC6B;AAC/B,QAAM,UAAU,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AACvD,QAAM,SAAS,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AACpD,SAAO,OAAO,SAAS,EAAE,SAAS,CAAC,GAAG,OAAO,IAAI,EAAE,SAAS,QAAQ,CAAC,EAAE;AACzE;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,UAAM,gCAAkB,IAAI;AAGlC,QAAM,EAAE,QAAQ,MAAM,IAAI,kBAAAA,QAAG,eAAe,MAAM,kBAAAA,QAAG,IAAI,QAAQ;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,UAAM,OAAO,kBAAAA,QAAG,IAAI,SAAS,IAAI;AACjC,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC,GAAG;AAAA,MACxD,UAAU,kBAAAA,QAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA;AAAA,MACN,MAAM,kBAAAA,QAAG,iBAAiB,MAAM,MAAO,kBAAAA,QAAG,aAAa,MAAM,OAAO,kBAAAA,QAAG,WAAW,IAAI;AAAA,MACtF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAcA,eAAsB,mBAClB,MACA,WACsC;AACxC,QAAM,UAAU,kBAAAA,QAAG,0BAA0B;AAC7C,MAAI,SAAwC,EAAE,SAAS,QAAQ,CAAC,EAAE;AAGlE,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,WAAW;AACb,aAAS,aAAa,QAAQ,EAAE,SAAS,WAAW,QAAQ,CAAC,EAAE,CAAC;AAAA,EAClE;AAGA,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAClC,wBAAe;AA2Ef,eAAsB,mBAClB,MACA,WACA,QACsC;AAExC,MAAI,CAAE,MAAM;AACV,UAAM,UAAU,EAAE,GAAG,kBAAAA,QAAG,0BAA0B,GAAG,GAAG,UAAU;AAClE,WAAO,EAAE,SAAS,QAAQ,CAAC,EAAE;AAAA,EAC/B;AAGA,QAAM,OAA2B;AAAA,IAC/B,2BAA2B,kBAAAA,QAAG,IAAI;AAAA,IAClC,cAAc,SAAS,YAAY,UAAU,UAAU,OAA0B;AAC/E,aAAO,kBAAAA,QAAG,IAAI,cAAc,SAAS,YAAY,UAAU,UAAU,KAAK;AAAA,IAC5E;AAAA,IACA,WAAW,MAAuB;AAChC,aAAO,kBAAAA,QAAG,IAAI,WAAW,IAAI;AAAA,IAC/B;AAAA,IACA,SAAS,MAAkC;AACzC,aAAO,kBAAAA,QAAG,IAAI,SAAS,IAAI;AAAA,IAC7B;AAAA,EACF;AAMA,QAAM,EAAE,QAAQ,MAAM,IAAI,kBAAAA,QAAG,eAAe,MAAM,kBAAAA,QAAG,IAAI,QAAQ;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAInD,SAAO,UAAU;AAEjB,SAAO,kBAAAA,QAAG;AAAA,IACN;AAAA;AAAA,IACA;AAAA;AAAA,QACA,gCAAkB,IAAI;AAAA;AAAA,IACtB;AAAA;AAAA,IACA;AAAA;AAAA,EACJ;AACF;",
   "names": ["ts"]
 }

package/dist/options.d.ts

@@ -4,5 +4,5 @@ export type CompilerOptionsAndDiagnostics = {
     options: ts.CompilerOptions;
     errors: readonly ts.Diagnostic[];
 };
-export declare function getCompilerOptions(file?: AbsolutePath): Promise<CompilerOptionsAndDiagnostics>;
-export declare function getCompilerOptions(file: AbsolutePath | undefined, overrides: ts.CompilerOptions): Promise<CompilerOptionsAndDiagnostics>;
+/** Load compiler options from a JSON file, and merge in the overrides */
+export declare function getCompilerOptions(file: AbsolutePath | undefined, overrides: ts.CompilerOptions, inputs: AbsolutePath[]): Promise<CompilerOptionsAndDiagnostics>;

package/dist/options.mjs

@@ -1,46 +1,39 @@
 // options.ts
+import { getAbsoluteParent } from "@plugjs/plug/paths";
 import ts from "typescript";
-import { getAbsoluteParent, resolveAbsolutePath } from "@plugjs/plug/paths";
-function mergeResults(base, override) {
-  const options = { ...base.options, ...override.options };
-  const errors = [...base.errors, ...override.errors];
-  return errors.length ? { options: {}, errors } : { options, errors: [] };
-}
-async function loadOptions(file, stack = [file]) {
-  const dir = getAbsoluteParent(file);
+async function getCompilerOptions(file, overrides, inputs) {
+  if (!file) {
+    const options = { ...ts.getDefaultCompilerOptions(), ...overrides };
+    return { options, errors: [] };
+  }
+  const host = {
+    useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
+    readDirectory(rootDir, extensions, excludes, includes, depth) {
+      return ts.sys.readDirectory(rootDir, extensions, excludes, includes, depth);
+    },
+    fileExists(path) {
+      return ts.sys.fileExists(path);
+    },
+    readFile(path) {
+      return ts.sys.readFile(path);
+    }
+  };
   const { config, error } = ts.readConfigFile(file, ts.sys.readFile);
   if (error)
     return { options: {}, errors: [error] };
-  const { compilerOptions = {}, extends: extendsPath } = config;
-  const result = ts.convertCompilerOptionsFromJson(compilerOptions, dir, file);
-  if (result.errors.length)
-    return result;
-  if (!extendsPath)
-    return result;
-  const ext = resolveAbsolutePath(dir, extendsPath);
-  if (stack.includes(ext)) {
-    const data = ts.sys.readFile(file);
-    return { options: {}, errors: [{
-      messageText: `Circularity detected extending from "${ext}"`,
-      category: ts.DiagnosticCategory.Error,
-      code: 18e3,
-      // copied from typescript internals...
-      file: ts.createSourceFile(file, data, ts.ScriptTarget.JSON, false, ts.ScriptKind.JSON),
-      start: void 0,
-      length: void 0
-    }] };
-  }
-  return mergeResults(await loadOptions(ext, [...stack, ext]), result);
-}
-async function getCompilerOptions(file, overrides) {
-  const options = ts.getDefaultCompilerOptions();
-  let result = { options, errors: [] };
-  if (file)
-    result = mergeResults(result, await loadOptions(file));
-  if (overrides) {
-    result = mergeResults(result, { options: overrides, errors: [] });
-  }
-  return result;
+  config.include = inputs;
+  return ts.parseJsonConfigFileContent(
+    config,
+    // the parsed JSON
+    host,
+    // our config parser host
+    getAbsoluteParent(file),
+    // directory for path resolution
+    overrides,
+    // overrides (from the TSC plug config)
+    file
+    // the file name for path resolution
+  );
 }
 export {
   getCompilerOptions

package/dist/options.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/options.ts"],
-  "mappings": ";AAAA,OAAO,QAAQ;AACf,SAAS,mBAAmB,2BAA2B;AAavD,SAAS,aACL,MACA,UAC6B;AAC/B,QAAM,UAAU,EAAE,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ;AACvD,QAAM,SAAS,CAAE,GAAG,KAAK,QAAQ,GAAG,SAAS,MAAO;AACpD,SAAO,OAAO,SAAS,EAAE,SAAS,CAAC,GAAG,OAAO,IAAI,EAAE,SAAS,QAAQ,CAAC,EAAE;AACzE;AAIA,eAAe,YACX,MACA,QAAwB,CAAE,IAAK,GACO;AACxC,QAAM,MAAM,kBAAkB,IAAI;AAGlC,QAAM,EAAE,QAAQ,MAAM,IAAI,GAAG,eAAe,MAAM,GAAG,IAAI,QAAQ;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,UAAM,OAAO,GAAG,IAAI,SAAS,IAAI;AACjC,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE;AAAA,MAC9B,aAAa,wCAAwC,GAAG;AAAA,MACxD,UAAU,GAAG,mBAAmB;AAAA,MAChC,MAAM;AAAA;AAAA,MACN,MAAM,GAAG,iBAAiB,MAAM,MAAO,GAAG,aAAa,MAAM,OAAO,GAAG,WAAW,IAAI;AAAA,MACtF,OAAO;AAAA,MACP,QAAQ;AAAA,IACV,CAAE,EAAE;AAAA,EACN;AAGA,SAAO,aAAa,MAAM,YAAY,KAAK,CAAE,GAAG,OAAO,GAAI,CAAC,GAAG,MAAM;AACvE;AAcA,eAAsB,mBAClB,MACA,WACsC;AACxC,QAAM,UAAU,GAAG,0BAA0B;AAC7C,MAAI,SAAwC,EAAE,SAAS,QAAQ,CAAC,EAAE;AAGlE,MAAI;AAAM,aAAS,aAAa,QAAQ,MAAM,YAAY,IAAI,CAAC;AAG/D,MAAI,WAAW;AACb,aAAS,aAAa,QAAQ,EAAE,SAAS,WAAW,QAAQ,CAAC,EAAE,CAAC;AAAA,EAClE;AAGA,SAAO;AACT;",
+  "mappings": ";AAAA,SAAS,yBAAyB;AAClC,OAAO,QAAQ;AA2Ef,eAAsB,mBAClB,MACA,WACA,QACsC;AAExC,MAAI,CAAE,MAAM;AACV,UAAM,UAAU,EAAE,GAAG,GAAG,0BAA0B,GAAG,GAAG,UAAU;AAClE,WAAO,EAAE,SAAS,QAAQ,CAAC,EAAE;AAAA,EAC/B;AAGA,QAAM,OAA2B;AAAA,IAC/B,2BAA2B,GAAG,IAAI;AAAA,IAClC,cAAc,SAAS,YAAY,UAAU,UAAU,OAA0B;AAC/E,aAAO,GAAG,IAAI,cAAc,SAAS,YAAY,UAAU,UAAU,KAAK;AAAA,IAC5E;AAAA,IACA,WAAW,MAAuB;AAChC,aAAO,GAAG,IAAI,WAAW,IAAI;AAAA,IAC/B;AAAA,IACA,SAAS,MAAkC;AACzC,aAAO,GAAG,IAAI,SAAS,IAAI;AAAA,IAC7B;AAAA,EACF;AAMA,QAAM,EAAE,QAAQ,MAAM,IAAI,GAAG,eAAe,MAAM,GAAG,IAAI,QAAQ;AACjE,MAAI;AAAO,WAAO,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAE,KAAM,EAAE;AAInD,SAAO,UAAU;AAEjB,SAAO,GAAG;AAAA,IACN;AAAA;AAAA,IACA;AAAA;AAAA,IACA,kBAAkB,IAAI;AAAA;AAAA,IACtB;AAAA;AAAA,IACA;AAAA;AAAA,EACJ;AACF;",
   "names": []
 }

package/dist/report.cjs

@@ -33,9 +33,9 @@ __export(report_exports, {
   updateReport: () => updateReport
 });
 module.exports = __toCommonJS(report_exports);
-var import_typescript = __toESM(require("typescript"), 1);
 var import_logging = require("@plugjs/plug/logging");
 var import_paths = require("@plugjs/plug/paths");
+var import_typescript = __toESM(require("typescript"), 1);
 function convertMessageChain(chain, indent = 0) {
   const message = `${"".padStart(indent * 2)}${chain.messageText}`;
   if (chain.next) {

package/dist/report.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/report.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AACf,qBAAoC;AACpC,mBAAoC;AAMpC,SAAS,oBAAoB,OAAkC,SAAS,GAAa;AACnF,QAAM,UAAU,GAAG,GAAG,SAAS,SAAS,CAAC,CAAC,GAAG,MAAM,WAAW;AAE9D,MAAI,MAAM,MAAM;AACd,UAAM,OAAO,MAAM,KAAK,IAAI,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC,CAAC;AACrE,WAAO,CAAE,SAAS,GAAG,KAAK,KAAK,CAAC,CAAE;AAAA,EACpC,OAAO;AACL,WAAO,CAAE,OAAQ;AAAA,EACnB;AACF;AAEA,SAAS,mBACL,aACA,WACc;AAChB,SAAO,YAAY,IAAI,CAAC,eAA6B;AAKnD,QAAI;AACJ,YAAQ,WAAW,UAAU;AAAA,MAC3B,KAAK,kBAAAA,QAAG,mBAAmB;AAAO,gBAAQ;AAAO;AAAA,MAEjD,KAAK,kBAAAA,QAAG,mBAAmB;AAAS,gBAAQ;AAAM;AAAA,MAElD;AAAS,gBAAQ;AAAA,IACnB;AAGA,QAAI;AACJ,QAAI,OAAO,WAAW,gBAAgB,UAAU;AAC9C,gBAAU,WAAW;AAAA,IACvB,OAAO;AACL,gBAAU,oBAAoB,WAAW,WAAW;AAAA,IACtD;AAGA,UAAM,OAAO,KAAK,WAAW,IAAI;AAGjC,QAAI,WAAW,MAAM;AACnB,YAAM,EAAE,MAAM,YAAY,OAAO,OAAO,IAAI;AAC5C,YAAM,WAAO,kCAAoB,WAAW,WAAW,QAAQ;AAC/D,YAAM,SAAS,WAAW,YAAY;AAGtC,UAAI,UAAU,QAAW;AACvB,cAAM,WAAW,WAAW,8BAA8B,KAAK;AAC/D,YAAI,EAAE,MAAM,WAAW,OAAO,IAAI;AAClC,kBAAU;AACV,gBAAQ;AAER,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,QAAQ,MAAM,QAAQ,OAAO;AAAA,MACpE,OAAO;AACL,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,OAAO;AAAA,MAC9C;AAAA,IACF,OAAO;AACL,aAAO,EAAE,OAAO,SAAS,KAAK;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAGO,SAAS,aACZ,QACA,aACA,WACI;AACN,QAAM,UAAU,mBAAmB,aAAa,SAAS;AACzD,SAAO,IAAI,GAAG,OAAO;AACvB;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoC;AACpC,mBAAoC;AACpC,wBAAe;AAMf,SAAS,oBAAoB,OAAkC,SAAS,GAAa;AACnF,QAAM,UAAU,GAAG,GAAG,SAAS,SAAS,CAAC,CAAC,GAAG,MAAM,WAAW;AAE9D,MAAI,MAAM,MAAM;AACd,UAAM,OAAO,MAAM,KAAK,IAAI,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC,CAAC;AACrE,WAAO,CAAE,SAAS,GAAG,KAAK,KAAK,CAAC,CAAE;AAAA,EACpC,OAAO;AACL,WAAO,CAAE,OAAQ;AAAA,EACnB;AACF;AAEA,SAAS,mBACL,aACA,WACc;AAChB,SAAO,YAAY,IAAI,CAAC,eAA6B;AAKnD,QAAI;AACJ,YAAQ,WAAW,UAAU;AAAA,MAC3B,KAAK,kBAAAA,QAAG,mBAAmB;AAAO,gBAAQ;AAAO;AAAA,MAEjD,KAAK,kBAAAA,QAAG,mBAAmB;AAAS,gBAAQ;AAAM;AAAA,MAElD;AAAS,gBAAQ;AAAA,IACnB;AAGA,QAAI;AACJ,QAAI,OAAO,WAAW,gBAAgB,UAAU;AAC9C,gBAAU,WAAW;AAAA,IACvB,OAAO;AACL,gBAAU,oBAAoB,WAAW,WAAW;AAAA,IACtD;AAGA,UAAM,OAAO,KAAK,WAAW,IAAI;AAGjC,QAAI,WAAW,MAAM;AACnB,YAAM,EAAE,MAAM,YAAY,OAAO,OAAO,IAAI;AAC5C,YAAM,WAAO,kCAAoB,WAAW,WAAW,QAAQ;AAC/D,YAAM,SAAS,WAAW,YAAY;AAGtC,UAAI,UAAU,QAAW;AACvB,cAAM,WAAW,WAAW,8BAA8B,KAAK;AAC/D,YAAI,EAAE,MAAM,WAAW,OAAO,IAAI;AAClC,kBAAU;AACV,gBAAQ;AAER,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,QAAQ,MAAM,QAAQ,OAAO;AAAA,MACpE,OAAO;AACL,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,OAAO;AAAA,MAC9C;AAAA,IACF,OAAO;AACL,aAAO,EAAE,OAAO,SAAS,KAAK;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAGO,SAAS,aACZ,QACA,aACA,WACI;AACN,QAAM,UAAU,mBAAmB,aAAa,SAAS;AACzD,SAAO,IAAI,GAAG,OAAO;AACvB;",
   "names": ["ts"]
 }

package/dist/report.mjs

@@ -1,7 +1,7 @@
 // report.ts
-import ts from "typescript";
 import { ERROR, NOTICE, WARN } from "@plugjs/plug/logging";
 import { resolveAbsolutePath } from "@plugjs/plug/paths";
+import ts from "typescript";
 function convertMessageChain(chain, indent = 0) {
   const message = `${"".padStart(indent * 2)}${chain.messageText}`;
   if (chain.next) {

package/dist/report.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/report.ts"],
-  "mappings": ";AAAA,OAAO,QAAQ;AACf,SAAS,OAAO,QAAQ,YAAY;AACpC,SAAS,2BAA2B;AAMpC,SAAS,oBAAoB,OAAkC,SAAS,GAAa;AACnF,QAAM,UAAU,GAAG,GAAG,SAAS,SAAS,CAAC,CAAC,GAAG,MAAM,WAAW;AAE9D,MAAI,MAAM,MAAM;AACd,UAAM,OAAO,MAAM,KAAK,IAAI,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC,CAAC;AACrE,WAAO,CAAE,SAAS,GAAG,KAAK,KAAK,CAAC,CAAE;AAAA,EACpC,OAAO;AACL,WAAO,CAAE,OAAQ;AAAA,EACnB;AACF;AAEA,SAAS,mBACL,aACA,WACc;AAChB,SAAO,YAAY,IAAI,CAAC,eAA6B;AAKnD,QAAI;AACJ,YAAQ,WAAW,UAAU;AAAA,MAC3B,KAAK,GAAG,mBAAmB;AAAO,gBAAQ;AAAO;AAAA,MAEjD,KAAK,GAAG,mBAAmB;AAAS,gBAAQ;AAAM;AAAA,MAElD;AAAS,gBAAQ;AAAA,IACnB;AAGA,QAAI;AACJ,QAAI,OAAO,WAAW,gBAAgB,UAAU;AAC9C,gBAAU,WAAW;AAAA,IACvB,OAAO;AACL,gBAAU,oBAAoB,WAAW,WAAW;AAAA,IACtD;AAGA,UAAM,OAAO,KAAK,WAAW,IAAI;AAGjC,QAAI,WAAW,MAAM;AACnB,YAAM,EAAE,MAAM,YAAY,OAAO,OAAO,IAAI;AAC5C,YAAM,OAAO,oBAAoB,WAAW,WAAW,QAAQ;AAC/D,YAAM,SAAS,WAAW,YAAY;AAGtC,UAAI,UAAU,QAAW;AACvB,cAAM,WAAW,WAAW,8BAA8B,KAAK;AAC/D,YAAI,EAAE,MAAM,WAAW,OAAO,IAAI;AAClC,kBAAU;AACV,gBAAQ;AAER,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,QAAQ,MAAM,QAAQ,OAAO;AAAA,MACpE,OAAO;AACL,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,OAAO;AAAA,MAC9C;AAAA,IACF,OAAO;AACL,aAAO,EAAE,OAAO,SAAS,KAAK;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAGO,SAAS,aACZ,QACA,aACA,WACI;AACN,QAAM,UAAU,mBAAmB,aAAa,SAAS;AACzD,SAAO,IAAI,GAAG,OAAO;AACvB;",
+  "mappings": ";AAAA,SAAS,OAAO,QAAQ,YAAY;AACpC,SAAS,2BAA2B;AACpC,OAAO,QAAQ;AAMf,SAAS,oBAAoB,OAAkC,SAAS,GAAa;AACnF,QAAM,UAAU,GAAG,GAAG,SAAS,SAAS,CAAC,CAAC,GAAG,MAAM,WAAW;AAE9D,MAAI,MAAM,MAAM;AACd,UAAM,OAAO,MAAM,KAAK,IAAI,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC,CAAC;AACrE,WAAO,CAAE,SAAS,GAAG,KAAK,KAAK,CAAC,CAAE;AAAA,EACpC,OAAO;AACL,WAAO,CAAE,OAAQ;AAAA,EACnB;AACF;AAEA,SAAS,mBACL,aACA,WACc;AAChB,SAAO,YAAY,IAAI,CAAC,eAA6B;AAKnD,QAAI;AACJ,YAAQ,WAAW,UAAU;AAAA,MAC3B,KAAK,GAAG,mBAAmB;AAAO,gBAAQ;AAAO;AAAA,MAEjD,KAAK,GAAG,mBAAmB;AAAS,gBAAQ;AAAM;AAAA,MAElD;AAAS,gBAAQ;AAAA,IACnB;AAGA,QAAI;AACJ,QAAI,OAAO,WAAW,gBAAgB,UAAU;AAC9C,gBAAU,WAAW;AAAA,IACvB,OAAO;AACL,gBAAU,oBAAoB,WAAW,WAAW;AAAA,IACtD;AAGA,UAAM,OAAO,KAAK,WAAW,IAAI;AAGjC,QAAI,WAAW,MAAM;AACnB,YAAM,EAAE,MAAM,YAAY,OAAO,OAAO,IAAI;AAC5C,YAAM,OAAO,oBAAoB,WAAW,WAAW,QAAQ;AAC/D,YAAM,SAAS,WAAW,YAAY;AAGtC,UAAI,UAAU,QAAW;AACvB,cAAM,WAAW,WAAW,8BAA8B,KAAK;AAC/D,YAAI,EAAE,MAAM,WAAW,OAAO,IAAI;AAClC,kBAAU;AACV,gBAAQ;AAER,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,QAAQ,MAAM,QAAQ,OAAO;AAAA,MACpE,OAAO;AACL,eAAO,EAAE,OAAO,SAAS,MAAM,MAAM,OAAO;AAAA,MAC9C;AAAA,IACF,OAAO;AACL,aAAO,EAAE,OAAO,SAAS,KAAK;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAGO,SAAS,aACZ,QACA,aACA,WACI;AACN,QAAM,UAAU,mBAAmB,aAAa,SAAS;AACzD,SAAO,IAAI,GAAG,OAAO;AACvB;",
   "names": []
 }

package/dist/typescript.cjs

@@ -33,15 +33,24 @@ __export(typescript_exports, {
   Tsc: () => Tsc
 });
 module.exports = __toCommonJS(typescript_exports);
-var import_typescript = __toESM(require("typescript"), 1);
 var import_asserts = require("@plugjs/plug/asserts");
 var import_files = require("@plugjs/plug/files");
 var import_logging = require("@plugjs/plug/logging");
 var import_paths = require("@plugjs/plug/paths");
 var import_utils = require("@plugjs/plug/utils");
+var import_typescript = __toESM(require("typescript"), 1);
 var import_compiler = require("./compiler.cjs");
 var import_options = require("./options.cjs");
 var import_report = require("./report.cjs");
+function defaultRootDir(paths) {
+  const [firstPath, ...restPaths] = paths.filter((path) => {
+    return !path.match(/\.d\.[mc]?ts$/i);
+  });
+  (0, import_asserts.assert)(firstPath, "No non-declaration files found to compile");
+  if (restPaths.length)
+    return (0, import_paths.commonPath)(firstPath, ...restPaths);
+  return (0, import_paths.getAbsoluteParent)(firstPath);
+}
 var Tsc = class {
   _tsconfig;
   _options;
@@ -51,41 +60,43 @@ var Tsc = class {
     this._options = options;
   }
   async pipe(files, context) {
-    const baseDir = context.resolve(".");
+    const paths = [...files.absolutePaths()];
     const report = context.log.report("TypeScript Report");
-    const { extraTypesDir, ...overrides } = { ...this._options };
+    const { extraTypesDir, ...__overrides } = { ...this._options };
+    if (extraTypesDir) {
+      const directory = context.resolve(extraTypesDir);
+      for await (const file of (0, import_utils.walk)(directory, ["**/*.d.ts"])) {
+        const path = (0, import_paths.resolveAbsolutePath)(directory, file);
+        context.log.debug(`Including extra type file "${(0, import_logging.$p)(path)}"`);
+        paths.push(path);
+      }
+    }
     const sourcesConfig = (0, import_paths.resolveFile)(files.directory, "tsconfig.json");
     const tsconfig = this._tsconfig ? context.resolve(this._tsconfig) : sourcesConfig || (0, import_paths.resolveFile)(context.resolve("tsconfig.json"));
-    let rootDir;
-    if (overrides.rootDir) {
-      rootDir = overrides.rootDir = context.resolve(overrides.rootDir);
-    } else {
-      rootDir = overrides.rootDir = files.directory;
+    if (__overrides.rootDir) {
+      __overrides.rootDir = context.resolve(__overrides.rootDir);
     }
-    let outDir;
-    if (overrides.outDir) {
-      outDir = overrides.outDir = context.resolve(overrides.outDir);
-    } else {
-      outDir = overrides.outDir = rootDir;
+    if (__overrides.outDir) {
+      __overrides.outDir = context.resolve(__overrides.outDir);
     }
-    if (overrides.rootDirs) {
-      overrides.rootDirs = overrides.rootDirs.map((dir) => context.resolve(dir));
+    if (__overrides.rootDirs) {
+      __overrides.rootDirs = __overrides.rootDirs.map((dir) => context.resolve(dir));
     }
-    if (overrides.baseUrl)
-      overrides.baseUrl = context.resolve(overrides.baseUrl);
-    if (overrides.outFile)
-      overrides.outFile = context.resolve(overrides.outFile);
+    if (__overrides.baseUrl)
+      __overrides.baseUrl = context.resolve(__overrides.baseUrl);
+    if (__overrides.outFile)
+      __overrides.outFile = context.resolve(__overrides.outFile);
     const { errors, options } = await (0, import_options.getCompilerOptions)(
       tsconfig,
       // resolved tsconfig.json from constructor, might be undefined
-      overrides
+      __overrides,
+      paths
     );
-    (0, import_report.updateReport)(report, errors, baseDir);
+    (0, import_report.updateReport)(report, errors, context.resolve("."));
     if (report.errors)
       report.done(true);
-    const paths = [...files.absolutePaths()];
     for (const path of paths)
-      context.log.trace(`Compiling "${(0, import_logging.$p)(path)}"`);
+      context.log.debug(`Compiling "${(0, import_logging.$p)(path)}"`);
     context.log.info("Compiling", paths.length, "files");
     if (extraTypesDir) {
       const directory = context.resolve(extraTypesDir);
@@ -95,7 +106,13 @@ var Tsc = class {
         paths.push(path);
       }
     }
-    context.log.debug("Compliation options", options);
+    const rootDir = options.rootDir ? context.resolve(options.rootDir) : defaultRootDir(paths);
+    if (!(options.rootDir || options.rootDirs))
+      options.rootDir = rootDir;
+    const outDir = options.outDir ? context.resolve(options.outDir) : rootDir;
+    if (!(options.outDir || options.outFile))
+      options.outDir = outDir;
+    context.log.info("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);

package/dist/typescript.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/typescript.ts"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,qBAAqD;AACrD,mBAAsB;AACtB,qBAAmB;AACnB,mBAAgF;AAChF,mBAAmC;AACnC,wBAAe;AAEf,sBAA+B;AAC/B,qBAAmC;AACnC,oBAA6B;AAW7B,SAAS,eAAe,OAAqC;AAC3D,QAAM,CAAE,WAAW,GAAG,SAAU,IAAI,MAAM,OAAO,CAAC,SAAS;AACzD,WAAO,CAAE,KAAK,MAAM,gBAAgB;AAAA,EACtC,CAAC;AAED,6BAAO,WAAW,2CAA2C;AAC7D,MAAI,UAAU;AAAQ,eAAO,yBAAW,WAAW,GAAG,SAAS;AAC/D,aAAO,gCAAkB,SAAS;AACpC;AAEO,IAAM,MAAN,MAAiC;AAAA,EACrB;AAAA,EACA;AAAA,EAEjB,eAAe,MAA6B;AAC1C,UAAM,EAAE,QAAQ,CAAE,QAAS,GAAG,QAAQ,QAAI,2BAAa,MAAM,CAAC,CAAC;AAC/D,SAAK,YAAY;AACjB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,KAAK,OAAc,SAAkC;AACzD,UAAM,QAAQ,CAAE,GAAG,MAAM,cAAc,CAAE;AAGzC,UAAM,SAAS,QAAQ,IAAI,OAAO,mBAAmB;AAGrD,UAAM,EAAE,eAAe,GAAG,YAAY,IAAI,EAAE,GAAG,KAAK,SAAS;AAE7D,QAAI,eAAe;AACjB,YAAM,YAAY,QAAQ,QAAQ,aAAa;AAE/C,uBAAiB,YAAQ,mBAAK,WAAW,CAAE,WAAY,CAAC,GAAG;AACzD,cAAM,WAAO,kCAAoB,WAAW,IAAI;AAChD,gBAAQ,IAAI,MAAM,kCAA8B,mBAAG,IAAI,CAAC,GAAG;AAC3D,cAAM,KAAK,IAAI;AAAA,MACjB;AAAA,IACF;AAMA,UAAM,oBAAgB,0BAAY,MAAM,WAAW,eAAe;AAClE,UAAM,WAAW,KAAK,YAAY,QAAQ,QAAQ,KAAK,SAAS,IAC9D,qBAAiB,0BAAY,QAAQ,QAAQ,eAAe,CAAC;AAI/D,QAAI,YAAY,SAAS;AACvB,kBAAY,UAAU,QAAQ,QAAQ,YAAY,OAAO;AAAA,IAC3D;AAIA,QAAI,YAAY,QAAQ;AACtB,kBAAY,SAAS,QAAQ,QAAQ,YAAY,MAAM;AAAA,IACzD;AAGA,QAAI,YAAY,UAAU;AACxB,kBAAY,WAAW,YAAY,SAAS,IAAI,CAAC,QAAQ,QAAQ,QAAQ,GAAG,CAAC;AAAA,IAC/E;AAGA,QAAI,YAAY;AAAS,kBAAY,UAAU,QAAQ,QAAQ,YAAY,OAAO;AAGlF,QAAI,YAAY;AAAS,kBAAY,UAAU,QAAQ,QAAQ,YAAY,OAAO;AAGlF,UAAM,EAAE,QAAQ,QAAQ,IAAI,UAAM;AAAA,MAC9B;AAAA;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAGA,oCAAa,QAAQ,QAAQ,QAAQ,QAAQ,GAAG,CAAC;AACjD,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAGnC,eAAW,QAAQ;AAAO,cAAQ,IAAI,MAAM,kBAAc,mBAAG,IAAI,CAAC,GAAG;AACrE,YAAQ,IAAI,KAAK,aAAa,MAAM,QAAQ,OAAO;AAGnD,QAAI,eAAe;AACjB,YAAM,YAAY,QAAQ,QAAQ,aAAa;AAE/C,uBAAiB,YAAQ,mBAAK,WAAW,CAAE,WAAY,CAAC,GAAG;AACzD,cAAM,WAAO,kCAAoB,WAAW,IAAI;AAChD,gBAAQ,IAAI,MAAM,kCAA8B,mBAAG,IAAI,CAAC,GAAG;AAC3D,cAAM,KAAK,IAAI;AAAA,MACjB;AAAA,IACF;AAGA,UAAM,UAAU,QAAQ,UACpB,QAAQ,QAAQ,QAAQ,OAAO,IAC/B,eAAe,KAAK;AACxB,QAAI,EAAE,QAAQ,WAAW,QAAQ;AAAW,cAAQ,UAAU;AAG9D,UAAM,SAAS,QAAQ,SAAS,QAAQ,QAAQ,QAAQ,MAAM,IAAI;AAClE,QAAI,EAAE,QAAQ,UAAU,QAAQ;AAAU,cAAQ,SAAS;AAG3D,YAAQ,IAAI,KAAK,uBAAuB,OAAO;AAG/C,UAAM,OAAO,IAAI,+BAAe,OAAO;AACvC,UAAM,UAAU,kBAAAA,QAAG,cAAc,OAAO,SAAS,MAAM,QAAW,MAAM;AACxE,UAAM,cAAc,kBAAAA,QAAG,sBAAsB,OAAO;AAGpD,oCAAa,QAAQ,aAAa,OAAO;AACzC,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAGnC,UAAM,UAAU,mBAAM,QAAQ,MAAM;AACpC,UAAM,WAA4B,CAAC;AACnC,UAAM,SAAS,QAAQ,KAAK,QAAW,CAAC,UAAU,SAAS;AACzD,eAAS,KAAK,QAAQ,MAAM,UAAU,IAAI,EAAE,KAAK,CAAC,SAAS;AACzD,gBAAQ,IAAI,MAAM,eAAW,mBAAG,IAAI,CAAC;AAAA,MACvC,CAAC,EAAE;AAAA;AAAA,QAAiC,CAAC,UAAU;AAC7C,gBAAM,cAAU,kCAAoB,QAAQ,QAAQ;AACpD,kBAAQ,IAAI,MAAM,wBAAoB,mBAAG,OAAO,GAAG,KAAK;AACxD,gBAAM,4BAAa,KAAK;AAAA,QAC1B;AAAA,MAAC,CAAC;AAAA,IACJ,CAAC;AAGD,cAAM,+BAAe,QAAQ;AAG7B,oCAAa,QAAQ,OAAO,aAAa,OAAO;AAEhD,QAAI,OAAO;AAAQ,aAAO,KAAK,IAAI;AAGnC,UAAM,UAAU,QAAQ,MAAM;AAC9B,YAAQ,IAAI,KAAK,gBAAgB,QAAQ,QAAQ,kBAAc,mBAAG,QAAQ,SAAS,CAAC;AACpF,WAAO;AAAA,EACT;AACF;",
   "names": ["ts"]
 }

package/dist/typescript.mjs

@@ -1,13 +1,22 @@
 // typescript.ts
-import ts from "typescript";
-import { assertPromises, BuildFailure } from "@plugjs/plug/asserts";
+import { assert, assertPromises, BuildFailure } from "@plugjs/plug/asserts";
 import { Files } from "@plugjs/plug/files";
 import { $p } from "@plugjs/plug/logging";
-import { resolveAbsolutePath, resolveFile } from "@plugjs/plug/paths";
+import { commonPath, getAbsoluteParent, resolveAbsolutePath, resolveFile } from "@plugjs/plug/paths";
 import { parseOptions, walk } from "@plugjs/plug/utils";
+import ts from "typescript";
 import { TypeScriptHost } from "./compiler.mjs";
 import { getCompilerOptions } from "./options.mjs";
 import { updateReport } from "./report.mjs";
+function defaultRootDir(paths) {
+  const [firstPath, ...restPaths] = paths.filter((path) => {
+    return !path.match(/\.d\.[mc]?ts$/i);
+  });
+  assert(firstPath, "No non-declaration files found to compile");
+  if (restPaths.length)
+    return commonPath(firstPath, ...restPaths);
+  return getAbsoluteParent(firstPath);
+}
 var Tsc = class {
   _tsconfig;
   _options;
@@ -17,41 +26,43 @@ var Tsc = class {
     this._options = options;
   }
   async pipe(files, context) {
-    const baseDir = context.resolve(".");
+    const paths = [...files.absolutePaths()];
     const report = context.log.report("TypeScript Report");
-    const { extraTypesDir, ...overrides } = { ...this._options };
+    const { extraTypesDir, ...__overrides } = { ...this._options };
+    if (extraTypesDir) {
+      const directory = context.resolve(extraTypesDir);
+      for await (const file of walk(directory, ["**/*.d.ts"])) {
+        const path = resolveAbsolutePath(directory, file);
+        context.log.debug(`Including extra type file "${$p(path)}"`);
+        paths.push(path);
+      }
+    }
     const sourcesConfig = resolveFile(files.directory, "tsconfig.json");
     const tsconfig = this._tsconfig ? context.resolve(this._tsconfig) : sourcesConfig || resolveFile(context.resolve("tsconfig.json"));
-    let rootDir;
-    if (overrides.rootDir) {
-      rootDir = overrides.rootDir = context.resolve(overrides.rootDir);
-    } else {
-      rootDir = overrides.rootDir = files.directory;
+    if (__overrides.rootDir) {
+      __overrides.rootDir = context.resolve(__overrides.rootDir);
     }
-    let outDir;
-    if (overrides.outDir) {
-      outDir = overrides.outDir = context.resolve(overrides.outDir);
-    } else {
-      outDir = overrides.outDir = rootDir;
+    if (__overrides.outDir) {
+      __overrides.outDir = context.resolve(__overrides.outDir);
     }
-    if (overrides.rootDirs) {
-      overrides.rootDirs = overrides.rootDirs.map((dir) => context.resolve(dir));
+    if (__overrides.rootDirs) {
+      __overrides.rootDirs = __overrides.rootDirs.map((dir) => context.resolve(dir));
     }
-    if (overrides.baseUrl)
-      overrides.baseUrl = context.resolve(overrides.baseUrl);
-    if (overrides.outFile)
-      overrides.outFile = context.resolve(overrides.outFile);
+    if (__overrides.baseUrl)
+      __overrides.baseUrl = context.resolve(__overrides.baseUrl);
+    if (__overrides.outFile)
+      __overrides.outFile = context.resolve(__overrides.outFile);
     const { errors, options } = await getCompilerOptions(
       tsconfig,
       // resolved tsconfig.json from constructor, might be undefined
-      overrides
+      __overrides,
+      paths
     );
-    updateReport(report, errors, baseDir);
+    updateReport(report, errors, context.resolve("."));
     if (report.errors)
       report.done(true);
-    const paths = [...files.absolutePaths()];
     for (const path of paths)
-      context.log.trace(`Compiling "${$p(path)}"`);
+      context.log.debug(`Compiling "${$p(path)}"`);
     context.log.info("Compiling", paths.length, "files");
     if (extraTypesDir) {
       const directory = context.resolve(extraTypesDir);
@@ -61,7 +72,13 @@ var Tsc = class {
         paths.push(path);
       }
     }
-    context.log.debug("Compliation options", options);
+    const rootDir = options.rootDir ? context.resolve(options.rootDir) : defaultRootDir(paths);
+    if (!(options.rootDir || options.rootDirs))
+      options.rootDir = rootDir;
+    const outDir = options.outDir ? context.resolve(options.outDir) : rootDir;
+    if (!(options.outDir || options.outFile))
+      options.outDir = outDir;
+    context.log.info("Compliation options", options);
     const host = new TypeScriptHost(rootDir);
     const program = ts.createProgram(paths, options, host, void 0, errors);
     const diagnostics = ts.getPreEmitDiagnostics(program);

package/dist/typescript.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/typescript.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/typescript",
-  "version": "0.4.35",
+  "version": "0.5.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -33,7 +33,7 @@
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "@plugjs/plug": "0.4.35"
+    "@plugjs/plug": "0.5.0"
   },
   "files": [
     "*.md",

package/src/compiler.ts

@@ -1,5 +1,5 @@
-import ts from 'typescript' // TypeScript does NOT support ESM modules
 import { resolveAbsolutePath } from '@plugjs/plug/paths'
+import ts from 'typescript'
 
 import type { AbsolutePath } from '@plugjs/plug/paths'
 

package/src/options.ts

@@ -1,5 +1,5 @@
-import ts from 'typescript' // TypeScript does NOT support ESM modules
-import { getAbsoluteParent, resolveAbsolutePath } from '@plugjs/plug/paths'
+import { getAbsoluteParent } from '@plugjs/plug/paths'
+import ts from 'typescript'
 
 import type { AbsolutePath } from '@plugjs/plug/paths'
 
@@ -12,82 +12,109 @@ export type CompilerOptionsAndDiagnostics = {
 
 /* ========================================================================== */
 
-function mergeResults(
-    base: CompilerOptionsAndDiagnostics,
-    override: CompilerOptionsAndDiagnostics,
-): CompilerOptionsAndDiagnostics {
-  const options = { ...base.options, ...override.options }
-  const errors = [ ...base.errors, ...override.errors ]
-  return errors.length ? { options: {}, errors } : { options, errors: [] }
-}
+// function mergeResults(
+//     base: CompilerOptionsAndDiagnostics,
+//     override: CompilerOptionsAndDiagnostics,
+// ): CompilerOptionsAndDiagnostics {
+//   const options = { ...base.options, ...override.options }
+//   const errors = [ ...base.errors, ...override.errors ]
+//   return errors.length ? { options: {}, errors } : { options, errors: [] }
+// }
 
 /* ========================================================================== */
 
-async function loadOptions(
-    file: AbsolutePath,
-    stack: AbsolutePath[] = [ file ],
-): Promise<CompilerOptionsAndDiagnostics> {
-  const dir = getAbsoluteParent(file)
-
-  // Load up our config file and convert is wicked JSON
-  const { config, error } = ts.readConfigFile(file, ts.sys.readFile)
-  if (error) return { options: {}, errors: [ error ] }
-
-  // Parse up the configuration file as options
-  const { compilerOptions = {}, extends: extendsPath } = config
-  const result = ts.convertCompilerOptionsFromJson(compilerOptions, dir, file)
-  if (result.errors.length) return result
-
-  // If we don't extend, we can return our result
-  if (!extendsPath) return result
-
-  // Resolve the name of the file this config extends
-  const ext = resolveAbsolutePath(dir, extendsPath)
-
-  // Triple check that we are not recursively importing this file
-  if (stack.includes(ext)) {
-    const data = ts.sys.readFile(file)
-    return { options: {}, errors: [ {
-      messageText: `Circularity detected extending from "${ext}"`,
-      category: ts.DiagnosticCategory.Error,
-      code: 18000, // copied from typescript internals...
-      file: ts.createSourceFile(file, data!, ts.ScriptTarget.JSON, false, ts.ScriptKind.JSON),
-      start: undefined,
-      length: undefined,
-    } ] }
-  }
-
-  // Push our file in the stack and load recursively
-  return mergeResults(await loadOptions(ext, [ ...stack, ext ]), result)
-}
+// async function loadOptions(
+//     file: AbsolutePath,
+//     stack: AbsolutePath[] = [ file ],
+// ): Promise<CompilerOptionsAndDiagnostics> {
+//   const dir = getAbsoluteParent(file)
+
+//   // Load up our config file and convert is wicked JSON
+//   const { config, error } = ts.readConfigFile(file, ts.sys.readFile)
+//   if (error) return { options: {}, errors: [ error ] }
+
+//   // Parse up the configuration file as options
+//   const { compilerOptions = {}, extends: extendsPath } = config
+//   const result = ts.convertCompilerOptionsFromJson(compilerOptions, dir, file)
+//   if (result.errors.length) return result
+
+//   // If we don't extend, we can return our result
+//   if (!extendsPath) return result
+
+//   // Resolve the name of the file this config extends
+//   const ext = resolveAbsolutePath(dir, extendsPath)
+
+//   // Triple check that we are not recursively importing this file
+//   if (stack.includes(ext)) {
+//     const data = ts.sys.readFile(file)
+//     return { options: {}, errors: [ {
+//       messageText: `Circularity detected extending from "${ext}"`,
+//       category: ts.DiagnosticCategory.Error,
+//       code: 18000, // copied from typescript internals...
+//       file: ts.createSourceFile(file, data!, ts.ScriptTarget.JSON, false, ts.ScriptKind.JSON),
+//       start: undefined,
+//       length: undefined,
+//     } ] }
+//   }
+
+//   // Push our file in the stack and load recursively
+//   return mergeResults(await loadOptions(ext, [ ...stack, ext ]), result)
+// }
 
 /* ========================================================================== */
 
-export async function getCompilerOptions(
-  file?: AbsolutePath,
-): Promise<CompilerOptionsAndDiagnostics>
+// export async function getCompilerOptions(
+//   file?: AbsolutePath,
+// ): Promise<CompilerOptionsAndDiagnostics>
 
-export async function getCompilerOptions(
-  file: AbsolutePath | undefined,
-  overrides: ts.CompilerOptions,
-): Promise<CompilerOptionsAndDiagnostics>
+// export async function getCompilerOptions(
+//   file: AbsolutePath | undefined,
+//   overrides: ts.CompilerOptions,
+//   inputs: AbsolutePath[],
+// ): Promise<CompilerOptionsAndDiagnostics>
 
 /** Load compiler options from a JSON file, and merge in the overrides */
 export async function getCompilerOptions(
-    file?: AbsolutePath,
-    overrides?: ts.CompilerOptions,
+    file: AbsolutePath | undefined,
+    overrides: ts.CompilerOptions,
+    inputs: AbsolutePath[],
 ): Promise<CompilerOptionsAndDiagnostics> {
-  const options = ts.getDefaultCompilerOptions()
-  let result: CompilerOptionsAndDiagnostics = { options, errors: [] }
-
-  // If we have a file to parse, load it, otherwise try "tsconfig.json"
-  if (file) result = mergeResults(result, await loadOptions(file))
+  // If we don't have a config file, return the merged defaults/overrides
+  if (! file) {
+    const options = { ...ts.getDefaultCompilerOptions(), ...overrides }
+    return { options, errors: [] }
+  }
 
-  // If we have overrides, merge them
-  if (overrides) {
-    result = mergeResults(result, { options: overrides, errors: [] })
+  // Our config parser host
+  const host: ts.ParseConfigHost = {
+    useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
+    readDirectory(rootDir, extensions, excludes, includes, depth): readonly string[] {
+      return ts.sys.readDirectory(rootDir, extensions, excludes, includes, depth)
+    },
+    fileExists(path: string): boolean {
+      return ts.sys.fileExists(path)
+    },
+    readFile(path: string): string | undefined {
+      return ts.sys.readFile(path)
+    },
   }
 
-  // Return all we have
-  return result
+  // The "readJsonConfigFile" / "parseJsonSourceFileConfigFileContent" migth
+  // be better here, but "readJsonConfigFile" doesn't return any errors in
+  // case a file doesn't exist, and "parseJsonSourceFileConfigFileContent"
+  // then fails miserably as it can't really find anything in the source
+  const { config, error } = ts.readConfigFile(file, ts.sys.readFile)
+  if (error) return { options: {}, errors: [ error ] }
+
+  // Inputs will be discarded, but are needed by "parseJsonConfigFileConent"
+  // otherwise it'll complain that we have no inputs in the "tsconfig.json"
+  config.include = inputs
+
+  return ts.parseJsonConfigFileContent(
+      config, // the parsed JSON
+      host, // our config parser host
+      getAbsoluteParent(file), // directory for path resolution
+      overrides, // overrides (from the TSC plug config)
+      file, // the file name for path resolution
+  )
 }

package/src/report.ts

@@ -1,6 +1,6 @@
-import ts from 'typescript' // TypeScript does NOT support ESM modules
 import { ERROR, NOTICE, WARN } from '@plugjs/plug/logging'
 import { resolveAbsolutePath } from '@plugjs/plug/paths'
+import ts from 'typescript'
 
 import type { Report, ReportLevel, ReportRecord } from '@plugjs/plug/logging'
 import type { AbsolutePath } from '@plugjs/plug/paths'

package/src/typescript.ts

@@ -1,12 +1,12 @@
 // Reference ourselves, so that the constructor's parameters are correct
 /// <reference path="./index.ts"/>
 
-import ts from 'typescript' // TypeScript does NOT support ESM modules
-import { assertPromises, BuildFailure } from '@plugjs/plug/asserts'
+import { assert, assertPromises, BuildFailure } from '@plugjs/plug/asserts'
 import { Files } from '@plugjs/plug/files'
 import { $p } from '@plugjs/plug/logging'
-import { resolveAbsolutePath, resolveFile } from '@plugjs/plug/paths'
+import { commonPath, getAbsoluteParent, resolveAbsolutePath, resolveFile } from '@plugjs/plug/paths'
 import { parseOptions, walk } from '@plugjs/plug/utils'
+import ts from 'typescript'
 
 import { TypeScriptHost } from './compiler'
 import { getCompilerOptions } from './options'
@@ -21,6 +21,16 @@ import type { ExtendedCompilerOptions } from './index'
  * WORKER PLUG                                                                *
  * ========================================================================== */
 
+function defaultRootDir(paths: AbsolutePath[]): AbsolutePath {
+  const [ firstPath, ...restPaths ] = paths.filter((path) => {
+    return ! path.match(/\.d\.[mc]?ts$/i)
+  })
+
+  assert(firstPath, 'No non-declaration files found to compile')
+  if (restPaths.length) return commonPath(firstPath, ...restPaths)
+  return getAbsoluteParent(firstPath)
+}
+
 export class Tsc implements Plug<Files> {
   private readonly _tsconfig?: string
   private readonly _options: ExtendedCompilerOptions
@@ -32,9 +42,23 @@ export class Tsc implements Plug<Files> {
   }
 
   async pipe(files: Files, context: Context): Promise<Files> {
-    const baseDir = context.resolve('.') // "this" directory, base of all relative paths
-    const report = context.log.report('TypeScript Report') // report used throughout
-    const { extraTypesDir, ...overrides } = { ...this._options } // clone our options
+    const paths = [ ...files.absolutePaths() ]
+
+    /* Start preparing the report that will be used throughout */
+    const report = context.log.report('TypeScript Report')
+
+    /* Clone our options and add extra types to our sources */
+    const { extraTypesDir, ...__overrides } = { ...this._options }
+
+    if (extraTypesDir) {
+      const directory = context.resolve(extraTypesDir)
+
+      for await (const file of walk(directory, [ '**/*.d.ts' ])) {
+        const path = resolveAbsolutePath(directory, file)
+        context.log.debug(`Including extra type file "${$p(path)}"`)
+        paths.push(path)
+      }
+    }
 
     /*
      * The "tsconfig" file is either specified, or (if existing) first checked
@@ -45,44 +69,41 @@ export class Tsc implements Plug<Files> {
       sourcesConfig || resolveFile(context.resolve('tsconfig.json'))
 
     /* Root directory must always exist */
-    let rootDir: AbsolutePath
-    if (overrides.rootDir) {
-      rootDir = overrides.rootDir = context.resolve(overrides.rootDir)
-    } else {
-      rootDir = overrides.rootDir = files.directory
+    // let rootDir: AbsolutePath
+    if (__overrides.rootDir) {
+      __overrides.rootDir = context.resolve(__overrides.rootDir)
     }
 
     /* Output directory _also_ must always exist */
-    let outDir: AbsolutePath
-    if (overrides.outDir) {
-      outDir = overrides.outDir = context.resolve(overrides.outDir)
-    } else {
-      outDir = overrides.outDir = rootDir // default to the root directory
+    // let outDir: AbsolutePath
+    if (__overrides.outDir) {
+      __overrides.outDir = context.resolve(__overrides.outDir)
     }
 
     /* All other root paths */
-    if (overrides.rootDirs) {
-      overrides.rootDirs = overrides.rootDirs.map((dir) => context.resolve(dir))
+    if (__overrides.rootDirs) {
+      __overrides.rootDirs = __overrides.rootDirs.map((dir) => context.resolve(dir))
     }
 
     /* The baseURL is resolved, as well */
-    if (overrides.baseUrl) overrides.baseUrl = context.resolve(overrides.baseUrl)
+    if (__overrides.baseUrl) __overrides.baseUrl = context.resolve(__overrides.baseUrl)
 
     /* The baseURL is resolved, as well */
-    if (overrides.outFile) overrides.outFile = context.resolve(overrides.outFile)
+    if (__overrides.outFile) __overrides.outFile = context.resolve(__overrides.outFile)
 
     /* 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
+        __overrides,
+        paths,
+    ) // overrides from constructor, might be an empty object
 
     /* Update report and fail on errors */
-    updateReport(report, errors, baseDir)
+    updateReport(report, errors, context.resolve('.'))
     if (report.errors) report.done(true)
 
     /* Prep for compilation */
-    const paths = [ ...files.absolutePaths() ]
-    for (const path of paths) context.log.trace(`Compiling "${$p(path)}"`)
+    for (const path of paths) context.log.debug(`Compiling "${$p(path)}"`)
     context.log.info('Compiling', paths.length, 'files')
 
     /* If we have an extra types directory, add all the .d.ts files in there */
@@ -96,8 +117,18 @@ export class Tsc implements Plug<Files> {
       }
     }
 
+    /* Figure out the root directory, either from the options, or default */
+    const rootDir = options.rootDir ?
+        context.resolve(options.rootDir) :
+        defaultRootDir(paths)
+    if (!(options.rootDir || options.rootDirs)) options.rootDir = rootDir
+
+    /* Figure out the output directory, either from the options or same as root */
+    const outDir = options.outDir ? context.resolve(options.outDir) : rootDir
+    if (!(options.outDir || options.outFile)) options.outDir = outDir
+
     /* Log out what we'll be our final compilation options */
-    context.log.debug('Compliation options', options)
+    context.log.info('Compliation options', options)
 
     /* Typescript host, create program and compile */
     const host = new TypeScriptHost(rootDir)