@sanity/pkg-utils 1.17.3 → 1.19.0

package/dist/index.esm.js

@@ -1,15 +1,9 @@
 const _excluded = ["_path"];
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import path from 'path';
 import { register } from 'esbuild-register/dist/node';
 import pkgUp from 'pkg-up';
@@ -27,6 +21,8 @@ import mkdirp from 'mkdirp';
 import prettier from 'prettier';
 import { TSDocConfigFile } from '@microsoft/tsdoc-config';
 import { parse } from 'jsonc-parser';
+import { parse as parse$1, print } from 'recast';
+import typeScriptParser from 'recast/parsers/typescript';
 import { rollup, watch as watch$1 } from 'rollup';
 import alias from '@rollup/plugin-alias';
 import { getBabelOutputPlugin } from '@rollup/plugin-babel';
@@ -43,7 +39,7 @@ import prettyBytes from 'pretty-bytes';
 import { scan, startWith, distinctUntilChanged } from 'rxjs/operators';
 import globby from 'globby';
 import chokidar from 'chokidar';
-const _MODULE_EXT = {
+const MODULE_EXT = {
   commonjs: {
     commonjs: ".js",
     esm: ".esm.js"
@@ -53,36 +49,27 @@ const _MODULE_EXT = {
     esm: ".js"
   }
 };
-const _DEFAULTS = {
-  browserslist: ["> 0.2% and supports es6-module and supports es6-module-dynamic-import", "not dead", "not IE 11", "maintained node versions"]
-};
-
-function _isRecord(value) {
+const DEFAULT_BROWSERSLIST_QUERY = ["> 0.2% and supports es6-module and supports es6-module-dynamic-import", "not dead", "not IE 11", "maintained node versions"];
+function isRecord(value) {
   return Boolean(value) && !Array.isArray(value) && typeof value === "object";
 }
-
 const CONFIG_FILE_NAMES = ["package.config.ts", "package.config.js", "package.config.cjs", "package.config.mjs"];
-
-async function _findConfigFile(cwd) {
+async function findConfigFile(cwd) {
   const pkgJsonPath = findConfig("package.json", {
     cwd
   });
   if (!pkgJsonPath) return void 0;
   const pkgPath = path.dirname(pkgJsonPath);
-
   for (const fileName of CONFIG_FILE_NAMES) {
     const configPath = path.resolve(pkgPath, fileName);
-    const exists = await _fileExists$1(configPath);
-
+    const exists = await fileExists$1(configPath);
     if (exists) {
       return configPath;
     }
   }
-
   return void 0;
 }
-
-async function _fileExists$1(filePath) {
+async function fileExists$1(filePath) {
   try {
     await stat(filePath);
     return true;
@@ -90,8 +77,7 @@ async function _fileExists$1(filePath) {
     return false;
   }
 }
-
-async function _loadConfig(options) {
+async function loadConfig(options) {
   const {
     cwd
   } = options;
@@ -100,46 +86,36 @@ async function _loadConfig(options) {
   });
   if (!pkgPath) return void 0;
   const root = path.dirname(pkgPath);
-  const configFile = await _findConfigFile(root);
-
+  const configFile = await findConfigFile(root);
   if (!configFile) {
     return void 0;
   }
-
   if (!configFile.startsWith(cwd)) {
     return void 0;
   }
-
   try {
     const {
       unregister
     } = register({
       extensions: [".js", ".mjs", ".ts"]
     });
-
     const mod = require(configFile);
-
     unregister();
     return (mod == null ? void 0 : mod.default) || mod || void 0;
   } catch (_) {
     return void 0;
   }
 }
-
-function _resolveConfigProperty(prop, initialValue) {
+function resolveConfigProperty(prop, initialValue) {
   if (!prop) return initialValue;
-
   if (typeof prop === "function") {
     return prop(initialValue);
   }
-
   return prop;
 }
-
 function defineConfig(configOptions) {
   return configOptions;
 }
-
 const pkgSchema = z.object({
   type: z.optional(z.enum(["commonjs", "module"])),
   name: z.string(),
@@ -173,15 +149,13 @@ const pkgSchema = z.object({
   })]))),
   browserslist: z.optional(z.array(z.string()))
 });
-
-function _validatePkg(input) {
+function validatePkg(input) {
   const pkg = pkgSchema.parse(input);
   return _objectSpread(_objectSpread({}, pkg), {}, {
     type: pkg.type || "commonjs"
   });
 }
-
-async function _loadPkg(options) {
+async function loadPkg(options) {
   const {
     cwd
   } = options;
@@ -190,64 +164,53 @@ async function _loadPkg(options) {
   });
   if (!pkgPath) throw new Error("no package.json found");
   const buf = await fs.readFile(pkgPath);
-  return _validatePkg(JSON.parse(buf.toString()));
+  return validatePkg(JSON.parse(buf.toString()));
 }
-
-async function _loadPkgWithReporting(options) {
+async function loadPkgWithReporting(options) {
   try {
-    return await _loadPkg(options);
+    return await loadPkg(options);
   } catch (err) {
     if (err instanceof ZodError) {
       for (const issue of err.issues) {
         if (issue.code === "invalid_type") {
-          console.log(["".concat(chalk.red("fail"), "   `").concat(_formatPath(issue.path), "` "), "in ./package.json must be of type ".concat(chalk.magenta(issue.expected), " "), "(received ".concat(chalk.magenta(issue.received), ")")].join(""));
+          console.log(["".concat(chalk.red("fail"), "   `").concat(formatPath(issue.path), "` "), "in ./package.json must be of type ".concat(chalk.magenta(issue.expected), " "), "(received ".concat(chalk.magenta(issue.received), ")")].join(""));
         }
       }
     } else {
       console.error(err);
     }
-
     process.exit(1);
   }
 }
-
-function _formatPath(segments) {
+function formatPath(segments) {
   return segments.map((s, idx) => {
     if (idx === 0) return s;
-
     if (typeof s === "number") {
       return "[".concat(s, "]");
     }
-
     if (s.startsWith(".")) {
       return "[\"".concat(s, "\"]");
     }
-
     return ".".concat(s);
   }).join("");
 }
-
-function _validateExports(_exports, options) {
+function validateExports(_exports, options) {
   const {
     pkg
   } = options;
-  const ext = _MODULE_EXT[pkg.type];
+  const ext = MODULE_EXT[pkg.type];
   const errors = [];
-
   for (const exp of _exports) {
     if (exp.require && !exp.require.endsWith(ext.commonjs)) {
       errors.push("package.json with `type: \"".concat(pkg.type, "\"` - `exports[\"").concat(exp._path, "\"].require` must end with \"").concat(ext.commonjs, "\""));
     }
-
     if (exp.import && !exp.import.endsWith(ext.esm)) {
       errors.push("package.json with `type: \"".concat(pkg.type, "\"` - `exports[\"").concat(exp._path, "\"].import` must end with \"").concat(ext.esm, "\""));
     }
   }
-
   return errors;
 }
-
-function _parseExports(options) {
+function parseExports(options) {
   const {
     pkg,
     strict
@@ -268,12 +231,10 @@ function _parseExports(options) {
   };
   const extraExports = [];
   const errors = [];
-
   if (pkg.exports) {
     if (strict && !pkg.exports["./package.json"]) {
       errors.push('package.json: `exports["./package.json"] must be declared.');
     }
-
     for (const [exportPath, exportEntry] of Object.entries(pkg.exports)) {
       if (exportPath.endsWith(".json")) {
         if (exportPath === "./package.json") {
@@ -281,31 +242,26 @@ function _parseExports(options) {
             errors.push('package.json: `exports["./package.json"] must be "./package.json".');
           }
         }
-      } else if (_isRecord(exportEntry)) {
+      } else if (isRecord(exportEntry)) {
         if (exportPath === ".") {
           if (exportEntry.require && rootExport.require && exportEntry.require !== rootExport.require) {
             errors.push('package.json: mismatch between "main" and "exports.require". These must be equal.');
           }
-
           if (exportEntry.import && rootExport.import && exportEntry.import !== rootExport.import) {
             errors.push('package.json: mismatch between "module" and "exports.import" These must be equal.');
           }
-
           if (exportEntry.types && rootExport.types && exportEntry.types !== rootExport.types) {
             errors.push('package.json: mismatch between "types" and "exports.types". These must be equal.');
           }
-
           if (exportEntry.source && rootExport.source && exportEntry.source !== rootExport.source) {
             errors.push('package.json: mismatch between "source" and "exports.source". These must be equal.');
           }
-
           Object.assign(rootExport, exportEntry);
         } else {
           const extraExport = _objectSpread({
             _exported: true,
             _path: exportPath
           }, exportEntry);
-
           extraExports.push(extraExport);
         }
       } else {
@@ -313,37 +269,29 @@ function _parseExports(options) {
       }
     }
   }
-
   const _exports = [rootExport, ...extraExports];
-  errors.push(..._validateExports(_exports, {
+  errors.push(...validateExports(_exports, {
     pkg
   }));
-
   if (errors.length) {
     throw new Error("\n- " + errors.join("\n- "));
   }
-
   return _exports;
 }
-
-async function _loadTSConfig(options) {
+async function loadTSConfig(options) {
   const {
     cwd,
     tsconfigPath
   } = options;
   const configPath = ts.findConfigFile(cwd, ts.sys.fileExists, tsconfigPath);
-
   if (!configPath) {
     throw new Error("could not find a valid '".concat(tsconfigPath, "'"));
   }
-
   const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
   return ts.parseJsonConfigFileContent(configFile.config, ts.sys, cwd);
 }
-
-function _resolveBuildTasks(ctx) {
+function resolveBuildTasks(ctx) {
   var _a, _b, _c, _d, _e;
-
   const {
     config,
     cwd,
@@ -363,10 +311,8 @@ function _resolveBuildTasks(ctx) {
     entries: []
   };
   const rollupTasks = {};
-
-  function _addRollupTaskEntry(format, runtime, entry) {
+  function addRollupTaskEntry(format, runtime, entry) {
     const buildId = "".concat(format, ":").concat(runtime);
-
     if (rollupTasks[buildId]) {
       rollupTasks[buildId].entries.push(entry);
     } else {
@@ -380,10 +326,8 @@ function _resolveBuildTasks(ctx) {
       };
     }
   }
-
   for (const exp of exports) {
     const importId = path.join(pkg.name, exp._path);
-
     if (exp.types) {
       dtsTask.entries.push({
         importId,
@@ -393,81 +337,67 @@ function _resolveBuildTasks(ctx) {
       });
     }
   }
-
   if (dtsTask.entries.length) {
     tasks.push(dtsTask);
   }
-
   if (!ctx.emitDeclarationOnly) {
     for (const exp of exports) {
       const output = exp.require;
       if (!output) continue;
-
-      _addRollupTaskEntry("commonjs", ctx.runtime, {
+      addRollupTaskEntry("commonjs", ctx.runtime, {
         path: exp._path,
         source: exp.source,
         output
       });
     }
-
     for (const exp of exports) {
       const output = exp.import;
       if (!output) continue;
-
-      _addRollupTaskEntry("esm", ctx.runtime, {
+      addRollupTaskEntry("esm", ctx.runtime, {
         path: exp._path,
         source: exp.source,
         output
       });
     }
-
     for (const exp of exports) {
       const output = (_a = exp.browser) == null ? void 0 : _a.require;
       if (!output) continue;
-
-      _addRollupTaskEntry("commonjs", "browser", {
+      addRollupTaskEntry("commonjs", "browser", {
         path: exp._path,
         source: ((_b = exp.browser) == null ? void 0 : _b.source) || exp.source,
         output
       });
     }
-
     for (const exp of exports) {
       const output = (_c = exp.browser) == null ? void 0 : _c.import;
       if (!output) continue;
-
-      _addRollupTaskEntry("esm", "browser", {
+      addRollupTaskEntry("esm", "browser", {
         path: exp._path,
         source: ((_d = exp.browser) == null ? void 0 : _d.source) || exp.source,
         output
       });
     }
-
     for (const bundle of bundles) {
       if (bundle.require) {
-        _addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
+        addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
           path: "__bundle__",
           source: bundle.source,
           output: bundle.require
         });
       }
-
       if (bundle.import) {
-        _addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
+        addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
           path: "__bundle__",
           source: bundle.source,
           output: bundle.import
         });
       }
     }
-
     tasks.push(...Object.values(rollupTasks));
-
     if (config == null ? void 0 : config.legacyExports) {
       for (const exp of exports) {
         if (exp._exported && exp._path !== ".") {
           const relativeTargetPath = (((_e = exp.browser) == null ? void 0 : _e.import) || exp.import || "").replace(/\.[^/.]+$/, "");
-
           if (relativeTargetPath) {
             fs$1.writeFileSync(path.resolve(cwd, "".concat(exp._path, ".js")), ["// AUTO-GENERATED \u2013 DO NOT EDIT", "export * from '".concat(relativeTargetPath, "'"), ""].join("\n"));
           }
@@ -475,60 +405,47 @@ function _resolveBuildTasks(ctx) {
       }
     }
   }
-
   return tasks;
 }
-
-function _printExtractMessages(ctx, messages) {
+function printExtractMessages(ctx, messages) {
   const {
     cwd,
     logger
   } = ctx;
   const warnings = messages.filter(msg => msg.logLevel === "warning");
-
   if (warnings.length) {
     logger.log();
   }
-
   for (const msg of warnings) {
     const sourceFilePath = msg.sourceFilePath && path.relative(cwd, msg.sourceFilePath);
-
     if (msg.messageId === "TS6307") {
       continue;
     }
-
     logger.log(["".concat(chalk.cyan(sourceFilePath || "?")), ":".concat(chalk.yellow(msg.sourceFileLine), ":").concat(chalk.yellow(msg.sourceFileColumn)), " - ".concat(chalk.yellow("warning"), " ").concat(chalk.gray(msg.messageId), "\n"), msg.text, "\n"].join(""));
   }
-
   const errors = messages.filter(msg => msg.logLevel === "error");
-
   if (!warnings.length && errors.length) {
     logger.log("");
   }
-
   for (const msg of errors) {
     const sourceFilePath = msg.sourceFilePath && path.relative(cwd, msg.sourceFilePath);
     logger.log(["".concat(chalk.cyan(sourceFilePath || "?")), ":".concat(chalk.yellow(msg.sourceFileLine), ":").concat(chalk.yellow(msg.sourceFileColumn)), " - ".concat(chalk.red("error"), " ").concat(chalk.gray(msg.messageId), "\n"), msg.text, "\n"].join(""));
   }
-
   if (errors.length) {
     process.exit(1);
   }
 }
-
 const formatHost = {
   getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
   getNewLine: () => ts.sys.newLine,
   getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? f => f : f => f.toLowerCase()
 };
-
-async function _buildTypes(options) {
+async function buildTypes(options) {
   const {
     outDir,
     tsconfig,
     strict = false
   } = options;
-
   const compilerOptions = _objectSpread(_objectSpread({}, tsconfig.options), {}, {
     declaration: true,
     declarationDir: outDir,
@@ -536,7 +453,6 @@ async function _buildTypes(options) {
     noEmit: false,
     outDir
   });
-
   const program = ts.createProgram(tsconfig.fileNames, compilerOptions);
   const emitResult = program.emit();
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
@@ -552,110 +468,23 @@ async function _buildTypes(options) {
       console.log(ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
     }
   });
-
   if (emitResult.emitSkipped) {
     const errors = allDiagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Error);
-
     if (errors.length) {
       console.error(ts.formatDiagnostics(errors, formatHost));
-
       if (strict) {
         throw new Error("failed to compile TypeScript definitions");
       }
     }
   }
 }
-
-async function _appendModuleBlocks(_ref2) {
-  let {
-    tsOutDir,
-    extractResult,
-    extractTypesOutFile
-  } = _ref2;
-  const moduleBlocks = await _extractModuleBlocksFromTypes({
-    tsOutDir,
-    extractResult
-  });
-
-  if (moduleBlocks.length) {
-    await fs.appendFile(extractTypesOutFile, "\n" + moduleBlocks.join("\n\n"));
-  }
-}
-
-async function _extractModuleBlocksFromTypes(_ref3) {
-  let {
-    tsOutDir,
-    extractResult
-  } = _ref3;
-  const moduleBlocks = [];
-  const program = extractResult.compilerState.program;
-  const allProgramFiles = [...program.getSourceFiles()];
-  const sourceFiles = allProgramFiles.filter(sourceFile => sourceFile.fileName.includes(tsOutDir));
-
-  for (const sourceFile of sourceFiles) {
-    if (sourceFile.text.includes("declare module")) {
-      moduleBlocks.push(..._extractModuleBlocks(sourceFile.text));
-    }
-  }
-
-  return moduleBlocks;
-}
-
-function _extractModuleBlocks(fileContent) {
-  var _a;
-
-  const moduleBlocks = [];
-  let moduleIndentLevel = 0;
-  let insideComment = false;
-  let moduleLines = [];
-  const lines = fileContent.split("\n");
-
-  for (const line of lines) {
-    if (insideComment && line.includes("*/")) {
-      insideComment = false;
-      continue;
-    } else if (!insideComment && line.includes("/*") && line.includes("*/")) {
-      continue;
-    } else if (!insideComment && line.includes("/*")) {
-      insideComment = true;
-    }
-
-    if (insideComment) {
-      continue;
-    }
-
-    if (!moduleLines.length) {
-      const isModuleDeclaration = (_a = line.match(/^\s*declare module.+$/)) == null ? void 0 : _a.length;
-      const moduleIndex = line.indexOf("declare module");
-      const isModuleStart = isModuleDeclaration && moduleIndex > -1;
-
-      if (isModuleStart) {
-        moduleIndentLevel = moduleIndex;
-        moduleLines = [line];
-      }
-    } else {
-      moduleLines.push(line);
-      const blockEndIndex = line.indexOf("}");
-
-      if (blockEndIndex === moduleIndentLevel) {
-        moduleBlocks.push(moduleLines.map(l => l.substring(moduleIndentLevel, l.length)).join("\n"));
-        moduleLines = [];
-      }
-    }
-  }
-
-  return moduleBlocks;
-}
-
-class _DtsError extends Error {
+class DtsError extends Error {
   constructor(message, messages) {
     super(message);
     this.messages = messages;
   }
-
 }
-
-function _createApiExtractorConfig(options) {
+function createApiExtractorConfig(options) {
   const {
     distPath,
     exportPath,
@@ -689,16 +518,13 @@ function _createApiExtractorConfig(options) {
     projectFolder
   };
 }
-
-async function _createTSDocConfig(opts) {
+async function createTSDocConfig(opts) {
   const {
     customTags
   } = opts;
-
   if (customTags.length === 0) {
     return void 0;
   }
-
   const tsDocBaseBuf = await readFile(require.resolve("@microsoft/api-extractor/extends/tsdoc-base.json"));
   const tsDocBaseConfig = parse(tsDocBaseBuf.toString());
   const tagDefinitions = (tsDocBaseConfig.tagDefinitions || []).concat(customTags.map(t => ({
@@ -706,37 +532,52 @@ async function _createTSDocConfig(opts) {
     syntaxKind: t.syntaxKind,
     allowMultiple: t.allowMultiple
   })));
-
   const supportForTags = _objectSpread({}, tsDocBaseConfig.supportForTags);
-
   for (const customTag of customTags) {
     supportForTags["@".concat(customTag.name)] = true;
   }
-
   return TSDocConfigFile.loadFromObject(_objectSpread(_objectSpread({}, tsDocBaseConfig), {}, {
     noStandardTags: false,
     tagDefinitions,
     supportForTags
   }));
 }
-
-const _LOG_LEVELS = {
+async function extractModuleBlocksFromTypes(_ref2) {
+  let {
+    tsOutDir,
+    extractResult
+  } = _ref2;
+  const program = extractResult.compilerState.program;
+  const moduleBlocks = [];
+  const allProgramFiles = [...program.getSourceFiles()];
+  const sourceFiles = allProgramFiles.filter(sourceFile => sourceFile.fileName.includes(tsOutDir));
+  for (const sourceFile of sourceFiles) {
+    if (sourceFile.text.includes("declare module")) {
+      moduleBlocks.push(...extractModuleBlocks(sourceFile.text));
+    }
+  }
+  return moduleBlocks;
+}
+function extractModuleBlocks(fileContent) {
+  const ast = parse$1(fileContent, {
+    parser: typeScriptParser
+  });
+  return ast.program.body.filter(node => node.type === "TSModuleDeclaration").map(node => print(node).code);
+}
+const LOG_LEVELS = {
   error: "error",
   info: "info",
   off: "none",
   warn: "warning"
 };
-
-function _getExtractMessagesConfig(options) {
+function getExtractMessagesConfig(options) {
   const {
     rules
   } = options;
-
-  function _ruleToLogLevel(key, defaultLevel) {
+  function ruleToLogLevel(key, defaultLevel) {
     const r = rules == null ? void 0 : rules[key];
-    return r ? _LOG_LEVELS[r] : defaultLevel || "warning";
+    return r ? LOG_LEVELS[r] : defaultLevel || "warning";
   }
-
   return {
     compilerMessageReporting: {
       default: {
@@ -749,19 +590,19 @@ function _getExtractMessagesConfig(options) {
         addToApiReportFile: false
       },
       "ae-forgotten-export": {
-        logLevel: _ruleToLogLevel("ae-forgotten-export", "error"),
+        logLevel: ruleToLogLevel("ae-forgotten-export", "error"),
         addToApiReportFile: false
       },
       "ae-incompatible-release-tags": {
-        logLevel: _ruleToLogLevel("ae-incompatible-release-tags", "error"),
+        logLevel: ruleToLogLevel("ae-incompatible-release-tags", "error"),
         addToApiReportFile: false
       },
       "ae-internal-missing-underscore": {
-        logLevel: _ruleToLogLevel("ae-internal-missing-underscore"),
+        logLevel: ruleToLogLevel("ae-internal-missing-underscore"),
         addToApiReportFile: false
       },
       "ae-missing-release-tag": {
-        logLevel: _ruleToLogLevel("ae-missing-release-tag", "error"),
+        logLevel: ruleToLogLevel("ae-missing-release-tag", "error"),
         addToApiReportFile: false
       },
       "ae-wrong-input-file-type": {
@@ -775,22 +616,21 @@ function _getExtractMessagesConfig(options) {
         addToApiReportFile: false
       },
       "tsdoc-link-tag-unescaped-text": {
-        logLevel: _ruleToLogLevel("tsdoc-link-tag-unescaped-text", "warning"),
+        logLevel: ruleToLogLevel("tsdoc-link-tag-unescaped-text", "warning"),
         addToApiReportFile: false
       },
       "tsdoc-undefined-tag": {
-        logLevel: _ruleToLogLevel("tsdoc-undefined-tag", "error"),
+        logLevel: ruleToLogLevel("tsdoc-undefined-tag", "error"),
         addToApiReportFile: false
       },
       "tsdoc-unsupported-tag": {
-        logLevel: _ruleToLogLevel("tsdoc-unsupported-tag", "none"),
+        logLevel: ruleToLogLevel("tsdoc-unsupported-tag", "none"),
         addToApiReportFile: false
       }
     }
   };
 }
-
-async function _extractTypes(options) {
+async function extractTypes(options) {
   const {
     customTags,
     distPath,
@@ -800,17 +640,18 @@ async function _extractTypes(options) {
     projectPath,
     rules,
     sourceTypesPath,
+    tmpPath,
     tsconfigPath
   } = options;
-  const tsdocConfigFile = await _createTSDocConfig({
+  const tsdocConfigFile = await createTSDocConfig({
     customTags: customTags || []
   });
   const extractorConfig = ExtractorConfig.prepare({
-    configObject: _createApiExtractorConfig({
+    configObject: createApiExtractorConfig({
       distPath,
       exportPath,
       filePath,
-      messages: _getExtractMessagesConfig({
+      messages: getExtractMessagesConfig({
         rules
       }),
       projectFolder: projectPath,
@@ -825,18 +666,21 @@ async function _extractTypes(options) {
   const extractorResult = Extractor.invoke(extractorConfig, {
     localBuild: true,
     showVerboseMessages: true,
-
     messageCallback(message) {
       messages.push(message);
       message.handled = true;
     }
-
   });
   const typesPath = path.resolve(distPath, filePath);
   const typesBuf = await fs.readFile(typesPath);
   const prettierConfig = await prettier.resolveConfig(typesPath);
   await mkdirp(path.dirname(typesPath));
-  await fs.writeFile(typesPath, prettier.format(typesBuf.toString(), _objectSpread(_objectSpread({}, prettierConfig), {}, {
+  const moduleBlocks = await extractModuleBlocksFromTypes({
+    extractResult: extractorResult,
+    tsOutDir: tmpPath
+  });
+  const code = [typesBuf.toString(), ...moduleBlocks].join("\n\n");
+  await fs.writeFile(typesPath, prettier.format(code, _objectSpread(_objectSpread({}, prettierConfig), {}, {
     filepath: typesPath
   })));
   files.push({
@@ -848,12 +692,9 @@ async function _extractTypes(options) {
     messages
   };
 }
-
 const rimraf = promisify(rimrafCallback);
-
-async function _doExtract(ctx, task) {
+async function doExtract(ctx, task) {
   var _a, _b;
-
   const {
     config,
     cwd,
@@ -861,7 +702,6 @@ async function _doExtract(ctx, task) {
     strict,
     ts
   } = ctx;
-
   if (!ts.config || !ts.configPath) {
     return {
       type: "dts",
@@ -869,18 +709,15 @@ async function _doExtract(ctx, task) {
       results: []
     };
   }
-
   const {
     outDir,
     rootDir = cwd
   } = ts.config.options;
-
   if (!outDir) {
     throw new Error("tsconfig.json is missing `compilerOptions.outDir`");
   }
-
   const tmpPath = path.resolve(outDir, "__tmp__");
-  await _buildTypes({
+  await buildTypes({
     cwd,
     outDir: tmpPath,
     strict,
@@ -888,42 +725,34 @@ async function _doExtract(ctx, task) {
   });
   const messages = [];
   const results = [];
-
   for (const entry of task.entries) {
     const exportPath = entry.exportPath === "." ? "./index" : entry.exportPath;
     const sourceTypesPath = path.resolve(tmpPath, path.relative(rootDir, path.resolve(cwd, entry.sourcePath)).replace(/\.ts$/, ".d.ts"));
     const targetPath = path.resolve(cwd, entry.targetPath);
     const filePath = path.relative(outDir, targetPath);
-    const result = await _extractTypes({
+    const result = await extractTypes({
       customTags: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.customTags,
       cwd,
+      distPath: outDir,
       exportPath,
       files,
       filePath,
       projectPath: cwd,
       rules: (_b = config == null ? void 0 : config.extract) == null ? void 0 : _b.rules,
       sourceTypesPath,
-      tsconfigPath: path.resolve(cwd, ts.configPath || "tsconfig.json"),
-      distPath: outDir
-    });
-    await _appendModuleBlocks({
-      tsOutDir: tmpPath,
-      extractResult: result.extractorResult,
-      extractTypesOutFile: path.resolve(outDir, targetPath)
+      tmpPath,
+      tsconfigPath: path.resolve(cwd, ts.configPath || "tsconfig.json")
     });
     messages.push(...result.messages);
-
     if (result.messages.some(msg => msg.logLevel === "error")) {
       await rimraf(tmpPath);
-      throw new _DtsError("encountered errors when extracting types", result.messages);
+      throw new DtsError("encountered errors when extracting types", result.messages);
     }
-
     results.push({
       sourcePath: path.resolve(cwd, entry.sourcePath),
       filePath: targetPath
     });
   }
-
   await rimraf(tmpPath);
   return {
     type: "dts",
@@ -931,12 +760,11 @@ async function _doExtract(ctx, task) {
     results
   };
 }
-
-const _dtsTask = {
+const dtsTask = {
   name: (_ctx, task) => ["build type definitions", ...task.entries.map(entry => "       ".concat(chalk.blue(entry.importId), ": ").concat(entry.sourcePath, " -> ").concat(entry.targetPath))].join("\n"),
   exec: (ctx, task) => {
     return new Observable(observer => {
-      _doExtract(ctx, task).then(result => {
+      doExtract(ctx, task).then(result => {
         observer.next(result);
         observer.complete();
       }).catch(err => {
@@ -945,25 +773,24 @@ const _dtsTask = {
     });
   },
   complete: (ctx, _task, result) => {
-    _printExtractMessages(ctx, result.messages);
+    printExtractMessages(ctx, result.messages);
   },
   error: (ctx, _task, err) => {
     const {
       logger
     } = ctx;
-
-    if (err instanceof _DtsError) {
-      _printExtractMessages(ctx, err.messages);
+    if (err instanceof DtsError) {
+      printExtractMessages(ctx, err.messages);
     } else if (err instanceof Error) {
       logger.error(err);
     }
   }
 };
-const _dtsWatchTask = {
+const dtsWatchTask = {
   name: (_ctx, task) => ["build type definitions", ...task.entries.map(entry => "       ".concat(chalk.blue(entry.importId), ": ").concat(entry.sourcePath, " -> ").concat(entry.targetPath))].join("\n"),
   exec: (ctx, task) => {
     return new Observable(observer => {
-      _doExtract(ctx, task).then(result => {
+      doExtract(ctx, task).then(result => {
         observer.next(result);
         observer.complete();
       }).catch(err => observer.error(err));
@@ -973,9 +800,7 @@ const _dtsWatchTask = {
     const {
       logger
     } = ctx;
-
-    _printExtractMessages(ctx, result.messages);
-
+    printExtractMessages(ctx, result.messages);
     logger.warn("watching typescript definitions is currently not supported");
     logger.log();
   },
@@ -983,20 +808,16 @@ const _dtsWatchTask = {
     const {
       logger
     } = ctx;
-
-    if (err instanceof _DtsError) {
-      _printExtractMessages(ctx, err.messages);
+    if (err instanceof DtsError) {
+      printExtractMessages(ctx, err.messages);
     } else if (err instanceof Error) {
       logger.error(err);
     }
   }
 };
-
-function _resolveRollupConfig(ctx, buildTask) {
-  var _ref4, _ref7, _ref8, _ref9, _ref10, _ref11;
-
+function resolveRollupConfig(ctx, buildTask) {
+  var _ref3, _ref6, _ref7, _ref8, _ref9, _ref10;
   var _a, _b, _c;
-
   const {
     format,
     runtime,
@@ -1012,14 +833,12 @@ function _resolveRollupConfig(ctx, buildTask) {
     pkg,
     ts
   } = ctx;
-  const outputExt = _MODULE_EXT[pkg.type][format];
-  const minify = (_ref4 = config == null ? void 0 : config.minify) !== null && _ref4 !== void 0 ? _ref4 : true;
+  const outputExt = MODULE_EXT[pkg.type][format];
+  const minify = (_ref3 = config == null ? void 0 : config.minify) !== null && _ref3 !== void 0 ? _ref3 : true;
   const outDir = path.relative(cwd, distPath);
-  const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref5 => {
-    let [key, val] = _ref5;
-
+  const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref4 => {
+    let [key, val] = _ref4;
     var _a2;
-
     return [key, path.resolve(cwd, ((_a2 = ts.config) == null ? void 0 : _a2.options.baseUrl) || ".", val[0])];
   }));
   const entries = buildTask.entries.map(entry => {
@@ -1027,13 +846,10 @@ function _resolveRollupConfig(ctx, buildTask) {
       name: path.relative(outDir, entry.output).replace(/\.[^/.]+$/, "")
     });
   }, {});
-
   const exportIds = _exports && Object.keys(_exports).map(exportPath => path.join(pkg.name, exportPath));
-
   const sourcePaths = _exports && Object.values(_exports).map(e => path.resolve(cwd, e.source));
-
-  const replacements = Object.fromEntries(Object.entries((config == null ? void 0 : config.define) || {}).map(_ref6 => {
-    let [key, val] = _ref6;
+  const replacements = Object.fromEntries(Object.entries((config == null ? void 0 : config.define) || {}).map(_ref5 => {
+    let [key, val] = _ref5;
     return [key, JSON.stringify(val)];
   }));
   const defaultPlugins = [replace({
@@ -1042,12 +858,10 @@ function _resolveRollupConfig(ctx, buildTask) {
       "process.env.PKG_FILE_PATH": arg => {
         const sourcePath = "./" + path.relative(cwd, arg);
         const entry = entries.find(e => e.source === sourcePath);
-
         if (!entry) {
           console.error("could not find source entry: ".concat(sourcePath));
           return "null";
         }
-
         return JSON.stringify(path.relative(cwd, path.resolve(outDir, entry.name + outputExt)));
       },
       "process.env.PKG_FORMAT": JSON.stringify(format),
@@ -1064,34 +878,32 @@ function _resolveRollupConfig(ctx, buildTask) {
     esmExternals: false,
     extensions: [".js"]
   }), json(), esbuild({
-    jsx: (_ref7 = config == null ? void 0 : config.jsx) !== null && _ref7 !== void 0 ? _ref7 : "automatic",
-    jsxFactory: (_ref8 = config == null ? void 0 : config.jsxFactory) !== null && _ref8 !== void 0 ? _ref8 : "createElement",
-    jsxFragment: (_ref9 = config == null ? void 0 : config.jsxFragment) !== null && _ref9 !== void 0 ? _ref9 : "Fragment",
-    jsxImportSource: (_ref10 = config == null ? void 0 : config.jsxImportSource) !== null && _ref10 !== void 0 ? _ref10 : "react",
+    jsx: (_ref6 = config == null ? void 0 : config.jsx) !== null && _ref6 !== void 0 ? _ref6 : "automatic",
+    jsxFactory: (_ref7 = config == null ? void 0 : config.jsxFactory) !== null && _ref7 !== void 0 ? _ref7 : "createElement",
+    jsxFragment: (_ref8 = config == null ? void 0 : config.jsxFragment) !== null && _ref8 !== void 0 ? _ref8 : "Fragment",
+    jsxImportSource: (_ref9 = config == null ? void 0 : config.jsxImportSource) !== null && _ref9 !== void 0 ? _ref9 : "react",
     target,
     tsconfig: ctx.ts.configPath || "tsconfig.json"
   }), getBabelOutputPlugin({
     babelrc: false,
     plugins: ["@babel/plugin-proposal-object-rest-spread"],
     presets: [["@babel/preset-env", {
-      targets: pkg.browserslist || _DEFAULTS.browserslist
+      targets: pkg.browserslist || DEFAULT_BROWSERSLIST_QUERY
     }]]
   }), minify && terser({
     output: {
       comments: (_node, comment) => {
         const text = comment.value;
         const type = comment.type;
-
         if (type == "comment2") {
           return /@preserve|@license|@cc_on/i.test(text);
         }
-
         return false;
       }
     }
   })].filter(Boolean);
   const userPlugins = (_b = config == null ? void 0 : config.rollup) == null ? void 0 : _b.plugins;
-  const plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : _resolveConfigProperty((_c = config == null ? void 0 : config.rollup) == null ? void 0 : _c.plugins, defaultPlugins);
+  const plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : resolveConfigProperty((_c = config == null ? void 0 : config.rollup) == null ? void 0 : _c.plugins, defaultPlugins);
   return {
     inputOptions: {
       context: cwd,
@@ -1099,23 +911,18 @@ function _resolveRollupConfig(ctx, buildTask) {
         if (exportIds == null ? void 0 : exportIds.includes(id)) {
           return true;
         }
-
         if (importer && (id.startsWith(".") || id.startsWith("/"))) {
           const idPath = path.resolve(path.dirname(importer), id);
-
           if (sourcePaths == null ? void 0 : sourcePaths.includes(idPath)) {
             logger.warn("detected self-referencing import \u2013 treating as external: ".concat(path.relative(cwd, idPath)));
             return true;
           }
         }
-
         const idParts = id.split("/");
         const name = idParts[0].startsWith("@") ? "".concat(idParts[0], "/").concat(idParts[1]) : idParts[0];
-
         if (name && external.includes(name)) {
           return true;
         }
-
         return false;
       },
       input: entries.reduce((acc, entry) => {
@@ -1123,13 +930,11 @@ function _resolveRollupConfig(ctx, buildTask) {
           [entry.name]: entry.source
         });
       }, {}),
-
       onwarn(warning, rollupWarn) {
         if (!warning.code || !["CIRCULAR_DEPENDENCY"].includes(warning.code)) {
           rollupWarn(warning);
         }
       },
-
       plugins,
       treeshake: {
         propertyReadSideEffects: false
@@ -1141,16 +946,15 @@ function _resolveRollupConfig(ctx, buildTask) {
       entryFileNames: () => outputExt === ".esm.js" ? "[name].js" : "[name]".concat(outputExt),
       format,
       exports: "auto",
-      sourcemap: (_ref11 = config == null ? void 0 : config.sourcemap) !== null && _ref11 !== void 0 ? _ref11 : true
+      sourcemap: (_ref10 = config == null ? void 0 : config.sourcemap) !== null && _ref10 !== void 0 ? _ref10 : true
     }
   };
 }
-
-const _rollupTask = {
+const rollupTask = {
   name: (ctx, task) => "build javascript files (target ".concat(task.target.join(" + "), ", format ").concat(task.format, ")\n       ").concat(task.entries.map(e => "".concat(chalk.blue(path.join(ctx.pkg.name, e.path)), ": ").concat(e.source, " -> ").concat(e.output)).join("\n       ")),
   exec: (ctx, task) => {
     return new Observable(observer => {
-      _execPromise(ctx, task).then(result => {
+      execPromise(ctx, task).then(result => {
         observer.next(result);
         observer.complete();
       }).catch(err => observer.error(err));
@@ -1163,24 +967,20 @@ const _rollupTask = {
     }
   }
 };
-
-async function _execPromise(ctx, task) {
+async function execPromise(ctx, task) {
   const {
     files,
     distPath
   } = ctx;
   const outDir = path.relative(ctx.cwd, distPath);
-
   const {
     inputOptions,
     outputOptions
-  } = _resolveRollupConfig(ctx, task);
-
+  } = resolveRollupConfig(ctx, task);
   const bundle = await rollup(inputOptions);
   const {
     output
   } = await bundle.generate(outputOptions);
-
   for (const chunkOrAsset of output) {
     if (chunkOrAsset.type === "asset") {
       files.push({
@@ -1194,24 +994,20 @@ async function _execPromise(ctx, task) {
       });
     }
   }
-
   await bundle.write(outputOptions);
   await bundle.close();
 }
-
-const _rollupWatchTask = {
+const rollupWatchTask = {
   name: (ctx, task) => "build javascript files (target ".concat(task.target.join(" + "), ", format ").concat(task.format, ")\n       ").concat(task.entries.map(e => "".concat(chalk.blue(path.join(ctx.pkg.name, e.path)), ": ").concat(e.source, " -> ").concat(e.output)).join("\n       ")),
   exec: (ctx, task) => {
     const {
       inputOptions,
       outputOptions
-    } = _resolveRollupConfig(ctx, task);
-
+    } = resolveRollupConfig(ctx, task);
     return new Observable(observer => {
       const watchOptions = _objectSpread(_objectSpread({}, inputOptions), {}, {
         output: outputOptions
       });
-
       const watcher = watch$1(watchOptions);
       watcher.on("event", event => {
         observer.next(event);
@@ -1225,26 +1021,21 @@ const _rollupWatchTask = {
     const {
       logger
     } = ctx;
-
     if (event.code === "BUNDLE_END") {
       logger.success("build javascript files (target ".concat(task.target.join(" + "), ", format ").concat(task.format, ")\n       ").concat(task.entries.map(e => "".concat(chalk.blue(path.join(ctx.pkg.name, e.path)), ": ").concat(e.source, " -> ").concat(e.output)).join("\n       ")));
       logger.log("");
       return;
     }
-
     if (event.code === "BUNDLE_START") {
       return;
     }
-
     if (event.code === "END") {
       return;
     }
-
     if (event.code === "ERROR") {
       logger.error(event.code, event);
       return;
     }
-
     if (event.code === "START") {
       return;
     }
@@ -1253,62 +1044,50 @@ const _rollupWatchTask = {
     const {
       logger
     } = ctx;
-
     if (err instanceof Error) {
       logger.log(err);
     }
   }
 };
-const _buildTaskHandlers = {
-  "build:dts": _dtsTask,
-  "build:js": _rollupTask
+const buildTaskHandlers = {
+  "build:dts": dtsTask,
+  "build:js": rollupTask
 };
-const _watchTaskHandlers = {
-  "watch:dts": _dtsWatchTask,
-  "watch:js": _rollupWatchTask
+const watchTaskHandlers = {
+  "watch:dts": dtsWatchTask,
+  "watch:js": rollupWatchTask
 };
-
-function _pathContains(containerPath, itemPath) {
+function pathContains(containerPath, itemPath) {
   return !path.relative(containerPath, itemPath).startsWith("..");
 }
-
-function _findCommonDirPath(filePaths) {
+function findCommonDirPath(filePaths) {
   let ret = void 0;
-
   for (const filePath of filePaths) {
     let dirPath = path.dirname(filePath);
-
     if (!ret) {
       ret = dirPath;
       continue;
     }
-
     while (dirPath !== ret) {
       dirPath = path.dirname(dirPath);
-
       if (dirPath === ret) {
         break;
       }
-
-      if (_pathContains(dirPath, ret)) {
+      if (pathContains(dirPath, ret)) {
         ret = dirPath;
         break;
       }
-
       if (dirPath === ".") return void 0;
     }
   }
-
   return ret;
 }
-
-function _sortAsNumber(a, b) {
+function sortAsNumber(a, b) {
   const aVersion = Number(a);
   const bVersion = Number(b);
   return aVersion - bVersion;
 }
-
-function _resolveBrowserslistVersions(query) {
+function resolveBrowserslistVersions(query) {
   const result = browserslist(query);
   const entries = result.map(key => {
     const [name, version] = key.split(" ");
@@ -1335,65 +1114,51 @@ function _resolveBrowserslistVersions(query) {
     opera: opera.map(b => b.version),
     node: node.map(b => b.version)
   };
-  versions.chrome.sort(_sortAsNumber);
-  versions.ff.sort(_sortAsNumber);
-  versions.edge.sort(_sortAsNumber);
-  versions.iosSaf.sort(_sortAsNumber);
-  versions.saf.sort(_sortAsNumber);
-  versions.opera.sort(_sortAsNumber);
-  versions.node.sort(_sortAsNumber);
+  versions.chrome.sort(sortAsNumber);
+  versions.ff.sort(sortAsNumber);
+  versions.edge.sort(sortAsNumber);
+  versions.iosSaf.sort(sortAsNumber);
+  versions.saf.sort(sortAsNumber);
+  versions.opera.sort(sortAsNumber);
+  versions.node.sort(sortAsNumber);
   return versions;
 }
-
-function _resolveBrowserTarget(versions) {
+function resolveBrowserTarget(versions) {
   const target = [];
-
   if (versions.chrome.length) {
     target.push("chrome".concat(versions.chrome[0]));
   }
-
   if (versions.ff.length) {
     target.push("firefox".concat(versions.ff[0]));
   }
-
   if (versions.edge.length) {
     target.push("edge".concat(versions.edge[0]));
   }
-
   if (versions.iosSaf.length) {
     target.push("ios".concat(versions.iosSaf[0]));
   }
-
   if (versions.saf.length) {
     target.push("safari".concat(versions.saf[0]));
   }
-
   if (versions.opera.length) {
     target.push("opera".concat(versions.opera[0]));
   }
-
   if (target.length === 0) {
     return void 0;
   }
-
   return target;
 }
-
-function _resolveNodeTarget(versions) {
+function resolveNodeTarget(versions) {
   const target = [];
-
   if (versions.node.length) {
     target.push("node".concat(versions.node[0]));
   }
-
   if (target.length === 0) {
     return void 0;
   }
-
   return target;
 }
-
-function _createLogger() {
+function createLogger() {
   return {
     log: function () {
       console.log(...arguments);
@@ -1402,36 +1167,30 @@ function _createLogger() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       console.log(chalk.blue("  info"), ...args);
     },
     warn: function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-
       console.log(chalk.yellow("  warn"), ...args);
     },
     error: function () {
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
       }
-
       console.log(chalk.red("  fail"), ...args);
     },
     success: function () {
       for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
         args[_key4] = arguments[_key4];
       }
-
       console.log(chalk.green("  ok  "), ...args);
     }
   };
 }
-
-async function _resolveBuildContext(options) {
-  var _ref12;
-
+async function resolveBuildContext(options) {
+  var _ref11;
   const {
     config,
     cwd,
@@ -1440,81 +1199,60 @@ async function _resolveBuildContext(options) {
     strict,
     tsconfig: tsconfigPath
   } = options;
-
-  const logger = _createLogger();
-
-  const tsconfig = await _loadTSConfig({
+  const logger = createLogger();
+  const tsconfig = await loadTSConfig({
     cwd,
     tsconfigPath
   });
-
-  const targetVersions = _resolveBrowserslistVersions(pkg.browserslist || _DEFAULTS.browserslist);
-
-  const nodeTarget = _resolveNodeTarget(targetVersions);
-
-  const webTarget = _resolveBrowserTarget(targetVersions);
-
+  const targetVersions = resolveBrowserslistVersions(pkg.browserslist || DEFAULT_BROWSERSLIST_QUERY);
+  const nodeTarget = resolveNodeTarget(targetVersions);
+  const webTarget = resolveBrowserTarget(targetVersions);
   if (!nodeTarget) {
     throw new Error("no matching `node` target");
   }
-
   if (!webTarget) {
     throw new Error("no matching `web` target");
   }
-
   const target = {
     "*": webTarget.concat(nodeTarget),
     browser: webTarget,
     node: nodeTarget
   };
-
-  const parsedExports = _parseExports({
+  const parsedExports = parseExports({
     pkg,
     strict
   }).reduce((acc, x) => {
     const {
-      _path: exportPath
-    } = x,
-          exportEntry = _objectWithoutProperties(x, _excluded);
-
+        _path: exportPath
+      } = x,
+      exportEntry = _objectWithoutProperties(x, _excluded);
     return _objectSpread(_objectSpread({}, acc), {}, {
       [exportPath]: exportEntry
     });
   }, {});
-
-  const exports = _resolveConfigProperty(config == null ? void 0 : config.exports, parsedExports);
-
+  const exports = resolveConfigProperty(config == null ? void 0 : config.exports, parsedExports);
   const parsedExternal = [...(pkg.dependencies ? Object.keys(pkg.dependencies) : []), ...(pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : [])];
-  const external = config && Array.isArray(config.external) ? [...parsedExternal, ...config.external] : _resolveConfigProperty(config == null ? void 0 : config.external, parsedExternal);
+  const external = config && Array.isArray(config.external) ? [...parsedExternal, ...config.external] : resolveConfigProperty(config == null ? void 0 : config.external, parsedExternal);
   const outputPaths = Object.values(exports).flatMap(exportEntry => {
     var _a, _b, _c, _d;
-
     return [exportEntry.import, exportEntry.require, (_a = exportEntry.browser) == null ? void 0 : _a.import, (_b = exportEntry.browser) == null ? void 0 : _b.require, (_c = exportEntry.node) == null ? void 0 : _c.import, (_d = exportEntry.node) == null ? void 0 : _d.require].filter(Boolean);
   }).map(p => path.resolve(cwd, p));
-
-  const commonDistPath = _findCommonDirPath(outputPaths);
-
+  const commonDistPath = findCommonDirPath(outputPaths);
   if (commonDistPath === cwd) {
     throw new Error("all output files must share a common parent directory which is not the root package directory");
   }
-
-  if (commonDistPath && !_pathContains(cwd, commonDistPath)) {
+  if (commonDistPath && !pathContains(cwd, commonDistPath)) {
     throw new Error("all output files must be located within the package");
   }
-
   const configDistPath = (config == null ? void 0 : config.dist) ? path.resolve(cwd, config.dist) : void 0;
-
-  if (configDistPath && commonDistPath && configDistPath !== commonDistPath && !_pathContains(configDistPath, commonDistPath)) {
+  if (configDistPath && commonDistPath && configDistPath !== commonDistPath && !pathContains(configDistPath, commonDistPath)) {
     logger.log("did you mean to configure `dist: './".concat(path.relative(cwd, commonDistPath), "'`?"));
     throw new Error("all output files must be located with the configured `dist` path");
   }
-
   const distPath = configDistPath || commonDistPath;
-
   if (!distPath) {
     throw new Error("could not detect `dist` path");
   }
-
   const ctx = {
     config,
     cwd,
@@ -1525,7 +1263,7 @@ async function _resolveBuildContext(options) {
     files: [],
     logger,
     pkg,
-    runtime: (_ref12 = config == null ? void 0 : config.runtime) !== null && _ref12 !== void 0 ? _ref12 : "*",
+    runtime: (_ref11 = config == null ? void 0 : config.runtime) !== null && _ref11 !== void 0 ? _ref11 : "*",
     strict,
     target,
     ts: {
@@ -1535,8 +1273,7 @@ async function _resolveBuildContext(options) {
   };
   return ctx;
 }
-
-function _spinner(msg) {
+function createSpinner(msg) {
   const startTime = Date.now();
   console.log("".concat(chalk.yellow("run   "), " ").concat(msg));
   return {
@@ -1548,7 +1285,6 @@ function _spinner(msg) {
     }
   };
 }
-
 async function build(options) {
   const {
     cwd,
@@ -1556,14 +1292,14 @@ async function build(options) {
     strict = false,
     tsconfig: tsconfigOption
   } = options;
-  const pkg = await _loadPkgWithReporting({
+  const pkg = await loadPkgWithReporting({
     cwd
   });
-  const config = await _loadConfig({
+  const config = await loadConfig({
     cwd
   });
   const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
-  const ctx = await _resolveBuildContext({
+  const ctx = await resolveBuildContext({
     config,
     cwd,
     emitDeclarationOnly,
@@ -1571,15 +1307,11 @@ async function build(options) {
     strict,
     tsconfig
   });
-
-  const buildTasks = _resolveBuildTasks(ctx);
-
+  const buildTasks = resolveBuildTasks(ctx);
   for (const task of buildTasks) {
-    const handler = _buildTaskHandlers[task.type];
+    const handler = buildTaskHandlers[task.type];
     const taskName = handler.name(ctx, task);
-
-    const spinner = _spinner(taskName);
-
+    const spinner = createSpinner(taskName);
     try {
       const result = await handler.exec(ctx, task).toPromise();
       spinner.complete();
@@ -1587,25 +1319,21 @@ async function build(options) {
       handler.complete(ctx, task, result);
     } catch (err) {
       spinner.error();
-
       if (err instanceof Error) {
         const RE_CWD = new RegExp("".concat(cwd), "g");
         ctx.logger.error(err.message.replace(RE_CWD, "."));
         ctx.logger.log();
       }
-
       handler.error(ctx, task, err);
       process.exit(1);
     }
   }
 }
-
-function _getFilesize(file) {
+function getFilesize(file) {
   const stats = statSync(file);
   return prettyBytes(stats.size);
 }
-
-function _fileExists(file) {
+function fileExists(file) {
   try {
     fs$1.accessSync(file);
     return true;
@@ -1613,20 +1341,16 @@ function _fileExists(file) {
     return false;
   }
 }
-
-function _getFileInfo(cwd, filePath) {
+function getFileInfo(cwd, filePath) {
   const p = path.resolve(cwd, filePath);
-
-  const exists = _fileExists(p);
-
-  const size = exists ? _getFilesize(p) : void 0;
+  const exists = fileExists(p);
+  const size = exists ? getFilesize(p) : void 0;
   return {
     exists,
     size
   };
 }
-
-function _printPackageTree(ctx) {
+function printPackageTree(ctx) {
   const {
     cwd,
     exports,
@@ -1636,26 +1360,21 @@ function _printPackageTree(ctx) {
   if (!exports) return;
   logger.log("".concat(chalk.blue(pkg.name), "@").concat(chalk.green(pkg.version)));
   const tree = {};
-
   if (pkg.bin) {
     tree.bin = pkg.bin;
   }
-
-  function _fileInfo(file) {
-    const info = _getFileInfo(cwd, file);
-
+  function fileInfo(file) {
+    const info = getFileInfo(cwd, file);
     if (!info.size) {
       return "".concat(chalk.gray(file), " ").concat(chalk.red("does not exist"));
     }
-
     return "".concat(file, " ").concat(chalk.gray(info.size));
   }
-
-  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref13 => {
-    let [, entry] = _ref13;
+  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref12 => {
+    let [, entry] = _ref12;
     return entry._exported;
-  }).map(_ref14 => {
-    let [exportPath, entry] = _ref14;
+  }).map(_ref13 => {
+    let [exportPath, entry] = _ref13;
     const exp = {
       source: entry.source,
       types: void 0,
@@ -1665,65 +1384,58 @@ function _printPackageTree(ctx) {
       require: void 0,
       default: entry.default
     };
-
     if (entry.types) {
-      exp.types = _fileInfo(entry.types);
+      exp.types = fileInfo(entry.types);
     } else {
       delete exp.types;
     }
-
     if (entry.browser) {
       exp.browser = {
         source: entry.browser.source
       };
-      if (entry.browser.import) exp.browser.import = _fileInfo(entry.browser.import);
-      if (entry.browser.require) exp.browser.require = _fileInfo(entry.browser.require);
+      if (entry.browser.import) exp.browser.import = fileInfo(entry.browser.import);
+      if (entry.browser.require) exp.browser.require = fileInfo(entry.browser.require);
     } else {
       delete exp.browser;
     }
-
     if (entry.node) {
       exp.node = {
         source: entry.node.source
       };
-      if (entry.node.import) exp.node.import = _fileInfo(entry.node.import);
-      if (entry.node.require) exp.node.require = _fileInfo(entry.node.require);
+      if (entry.node.import) exp.node.import = fileInfo(entry.node.import);
+      if (entry.node.require) exp.node.require = fileInfo(entry.node.require);
     } else {
       delete exp.node;
     }
-
     if (entry.import) {
-      exp.import = _fileInfo(entry.import);
+      exp.import = fileInfo(entry.import);
     } else {
       delete exp.import;
     }
-
     if (entry.require) {
-      exp.require = _fileInfo(entry.require);
+      exp.require = fileInfo(entry.require);
     } else {
       delete exp.require;
     }
-
-    exp.default = _fileInfo(entry.default);
+    exp.default = fileInfo(entry.default);
     return [chalk.green(path.join(pkg.name, exportPath)), exp];
   }));
   logger.log(treeify.asTree(tree, true, true));
 }
-
 async function check(options) {
   const {
     cwd,
     strict = false,
     tsconfig: tsconfigOption
   } = options;
-  const pkg = await _loadPkgWithReporting({
+  const pkg = await loadPkgWithReporting({
     cwd
   });
-  const config = await _loadConfig({
+  const config = await loadConfig({
     cwd
   });
   const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
-  const ctx = await _resolveBuildContext({
+  const ctx = await resolveBuildContext({
     config,
     cwd,
     pkg,
@@ -1733,51 +1445,39 @@ async function check(options) {
   const {
     logger
   } = ctx;
-
-  _printPackageTree(ctx);
-
+  printPackageTree(ctx);
   if (strict) {
     const missingFiles = [];
-
     for (const [, exp] of Object.entries(ctx.exports || {})) {
-      if (exp.source && !_fileExists(path.resolve(cwd, exp.source))) {
+      if (exp.source && !fileExists(path.resolve(cwd, exp.source))) {
         missingFiles.push(exp.source);
       }
-
-      if (exp.require && !_fileExists(path.resolve(cwd, exp.require))) {
+      if (exp.require && !fileExists(path.resolve(cwd, exp.require))) {
         missingFiles.push(exp.require);
       }
-
-      if (exp.import && !_fileExists(path.resolve(cwd, exp.import))) {
+      if (exp.import && !fileExists(path.resolve(cwd, exp.import))) {
         missingFiles.push(exp.import);
       }
-
-      if (exp.types && !_fileExists(path.resolve(cwd, exp.types))) {
+      if (exp.types && !fileExists(path.resolve(cwd, exp.types))) {
         missingFiles.push(exp.types);
       }
     }
-
     if (missingFiles.length) {
       logger.error("missing files");
       process.exit(1);
     }
-
     const _paths = {
       require: [],
       import: []
     };
-
     for (const exp of Object.values(ctx.exports || {})) {
       if (!exp._exported) continue;
       if (exp.require) _paths.require.push(exp.require);
       if (exp.import) _paths.import.push(exp.import);
     }
-
     const external = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.devDependencies || {}));
-
     if (_paths.import.length) {
       const code = _paths.import.map(id => "import('".concat(id, "')")).join("\n");
-
       try {
         const esbuildResult = await esbuild$1.build({
           external,
@@ -1792,7 +1492,6 @@ async function check(options) {
           outfile: "/dev/null",
           platform: "node"
         });
-
         if (esbuildResult.warnings.length > 0) {
           logger.warn(...esbuildResult.warnings);
         }
@@ -1800,7 +1499,6 @@ async function check(options) {
         const {
           errors
         } = err;
-
         for (const _err of errors) {
           if (_err.location) {
             logger.error(_err.detail || _err.text);
@@ -1809,17 +1507,13 @@ async function check(options) {
           } else {
             logger.error(_err.detail || _err.text);
           }
-
           logger.log();
         }
-
         process.exit(1);
       }
     }
-
     if (_paths.require.length) {
       const code = _paths.require.map(id => "require('".concat(id, "')")).join("\n");
-
       const esbuildResult = await esbuild$1.build({
         external,
         stdin: {
@@ -1832,22 +1526,18 @@ async function check(options) {
         outfile: "/dev/null",
         platform: "node"
       });
-
       if (esbuildResult.errors.length > 0) {
         logger.error(esbuildResult.errors.join(", "));
         process.exit(1);
       }
-
       if (esbuildResult.warnings.length > 0) {
         logger.warn(...esbuildResult.warnings);
       }
     }
   }
 }
-
-function _resolveWatchTasks(ctx) {
+function resolveWatchTasks(ctx) {
   var _a, _b, _c, _d, _e;
-
   const {
     config,
     cwd,
@@ -1855,8 +1545,8 @@ function _resolveWatchTasks(ctx) {
     target
   } = ctx;
   const tasks = [];
-  const exports = Object.entries(ctx.exports || {}).map(_ref15 => {
-    let [_path, exp] = _ref15;
+  const exports = Object.entries(ctx.exports || {}).map(_ref14 => {
+    let [_path, exp] = _ref14;
     return _objectSpread({
       _path
     }, exp);
@@ -1866,10 +1556,8 @@ function _resolveWatchTasks(ctx) {
     entries: []
   };
   const rollupTasks = {};
-
-  function _addRollupTaskEntry(format, runtime, entry) {
+  function addRollupTaskEntry(format, runtime, entry) {
     const buildId = "".concat(format, ":").concat(runtime);
-
     if (rollupTasks[buildId]) {
       rollupTasks[buildId].entries.push(entry);
     } else {
@@ -1883,10 +1571,8 @@ function _resolveWatchTasks(ctx) {
       };
     }
   }
-
   for (const exp of exports) {
     const importId = path.join(pkg.name, exp._path);
-
     if (exp.types) {
       dtsTask.entries.push({
         importId,
@@ -1896,151 +1582,124 @@ function _resolveWatchTasks(ctx) {
       });
     }
   }
-
   for (const exp of exports) {
     const output = exp.require;
     if (!output) continue;
-
-    _addRollupTaskEntry("commonjs", ctx.runtime, {
+    addRollupTaskEntry("commonjs", ctx.runtime, {
       path: exp._path,
       source: exp.source,
       output
     });
   }
-
   for (const exp of exports) {
     const output = (_a = exp.browser) == null ? void 0 : _a.require;
     if (!output) continue;
-
-    _addRollupTaskEntry("commonjs", "browser", {
+    addRollupTaskEntry("commonjs", "browser", {
       path: exp._path,
       source: ((_b = exp.browser) == null ? void 0 : _b.source) || exp.source,
       output
     });
   }
-
   for (const exp of exports) {
     const output = exp.import;
     if (!output) continue;
-
-    _addRollupTaskEntry("esm", ctx.runtime, {
+    addRollupTaskEntry("esm", ctx.runtime, {
       path: exp._path,
       source: exp.source,
       output
     });
   }
-
   for (const exp of exports) {
     const output = (_c = exp.browser) == null ? void 0 : _c.import;
     if (!output) continue;
-
-    _addRollupTaskEntry("esm", "browser", {
+    addRollupTaskEntry("esm", "browser", {
       path: exp._path,
       source: ((_d = exp.browser) == null ? void 0 : _d.source) || exp.source,
       output
     });
   }
-
   if (dtsTask.entries.length) {
     tasks.push(dtsTask);
   }
-
   tasks.push(...Object.values(rollupTasks));
-
   if (config == null ? void 0 : config.legacyExports) {
     for (const exp of exports) {
       if (exp._exported && exp._path !== ".") {
         const relativeTargetPath = (((_e = exp.browser) == null ? void 0 : _e.import) || exp.import || "").replace(/\.[^/.]+$/, "");
-
         if (relativeTargetPath) {
           fs$1.writeFileSync(path.resolve(cwd, "".concat(exp._path, ".js")), ["// AUTO-GENERATED \u2013 DO NOT EDIT", "export * from '".concat(relativeTargetPath, "'"), ""].join("\n"));
         }
       }
     }
   }
-
   return tasks;
 }
-
-function _globFiles(patterns) {
+function globFiles(patterns) {
   return globby(patterns);
 }
-
-function _watchFiles(patterns) {
+function watchFiles(patterns) {
   return new Observable(observer => {
     const watcher = chokidar.watch(patterns, {
       ignoreInitial: true
     });
-
-    function _handleFileEvent(type, file) {
+    function handleFileEvent(type, file) {
       observer.next({
         type,
         file
       });
     }
-
-    watcher.on("all", _handleFileEvent);
+    watcher.on("all", handleFileEvent);
     return () => {
-      watcher.off("all", _handleFileEvent);
+      watcher.off("all", handleFileEvent);
       watcher.close();
     };
   });
 }
-
-async function _watchConfigFiles(options) {
+async function watchConfigFiles(options) {
   const {
     cwd
   } = options;
-  const initialFiles = await _globFiles([path.resolve(cwd, "package.json"), path.resolve(cwd, "package.config.cjs"), path.resolve(cwd, "package.config.js"), path.resolve(cwd, "package.config.ts")]);
-
-  const fileEvent$ = _watchFiles([path.resolve(cwd, "package.json"), path.resolve(cwd, "package.config.cjs"), path.resolve(cwd, "package.config.js"), path.resolve(cwd, "package.config.ts")]);
-
+  const initialFiles = await globFiles([path.resolve(cwd, "package.json"), path.resolve(cwd, "package.config.cjs"), path.resolve(cwd, "package.config.js"), path.resolve(cwd, "package.config.ts")]);
+  const fileEvent$ = watchFiles([path.resolve(cwd, "package.json"), path.resolve(cwd, "package.config.cjs"), path.resolve(cwd, "package.config.js"), path.resolve(cwd, "package.config.ts")]);
   return fileEvent$.pipe(scan((files, fileEvent) => {
     if (fileEvent.type === "add") {
       return files.concat(fileEvent.file);
     }
-
     if (fileEvent.type === "unlink") {
       return files.filter(f => f !== fileEvent.file);
     }
-
     if (fileEvent.type === "change") {
       console.log("--------------------------------------------------------------------------------");
       console.log(chalk.blue("info  "), path.relative(cwd, fileEvent.file), "changed");
       console.log("");
       return files.slice(0);
     }
-
     return files;
   }, initialFiles), startWith(initialFiles), distinctUntilChanged());
 }
-
 async function watch(options) {
   const {
     cwd,
     strict = false,
     tsconfig: tsconfigOption
   } = options;
-  const configFiles$ = await _watchConfigFiles({
+  const configFiles$ = await watchConfigFiles({
     cwd
   });
   const ctx$ = configFiles$.pipe(switchMap(async configFiles => {
-    const _files = configFiles.map(f => path.relative(cwd, f));
-
-    const packageJsonPath = _files.find(f => f === "package.json");
-
+    const files = configFiles.map(f => path.relative(cwd, f));
+    const packageJsonPath = files.find(f => f === "package.json");
     if (!packageJsonPath) {
       throw new Error("missing package.json");
     }
-
-    const pkg = await _loadPkgWithReporting({
+    const pkg = await loadPkgWithReporting({
       cwd
     });
-    const config = await _loadConfig({
+    const config = await loadConfig({
       cwd
     });
     const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
-    return _resolveBuildContext({
+    return resolveBuildContext({
       config,
       cwd,
       pkg,
@@ -2049,10 +1708,9 @@ async function watch(options) {
     });
   }));
   ctx$.subscribe(async ctx => {
-    const watchTasks = _resolveWatchTasks(ctx);
-
+    const watchTasks = resolveWatchTasks(ctx);
     for (const task of watchTasks) {
-      const handler = _watchTaskHandlers[task.type];
+      const handler = watchTaskHandlers[task.type];
       const result$ = handler.exec(ctx, task);
       result$.subscribe({
         error: err => {
@@ -2071,6 +1729,5 @@ async function watch(options) {
     }
   });
 }
-
-export { _DEFAULTS, _MODULE_EXT, _buildTaskHandlers, _dtsTask, _dtsWatchTask, _getExtractMessagesConfig, _isRecord, _loadConfig, _loadPkg, _loadPkgWithReporting, _loadTSConfig, _parseExports, _resolveBuildTasks, _resolveConfigProperty, _rollupTask, _rollupWatchTask, _watchTaskHandlers, build, check, defineConfig, watch };
+export { DEFAULT_BROWSERSLIST_QUERY, MODULE_EXT, build, buildTaskHandlers, check, defineConfig, dtsTask, dtsWatchTask, getExtractMessagesConfig, isRecord, loadConfig, loadPkg, loadPkgWithReporting, loadTSConfig, parseExports, resolveBuildTasks, resolveConfigProperty, rollupTask, rollupWatchTask, watch, watchTaskHandlers };
 //# sourceMappingURL=index.esm.js.map