@sanity/pkg-utils 1.16.1 → 1.16.2

package/dist/index.esm.js

@@ -555,6 +555,81 @@ async function _buildTypes(options) {
   }
 }
 
+async function _appendModuleBlocks(_ref2) {
+  let {
+    tsOutDir,
+    extractTypesOutFile
+  } = _ref2;
+  const moduleBlocks = await _extractModuleBlocksFromTypes(tsOutDir);
+
+  if (moduleBlocks.length) {
+    await fs.appendFile(extractTypesOutFile, "\n" + moduleBlocks.join("\n\n"));
+  }
+}
+
+async function _extractModuleBlocksFromTypes(dirname) {
+  const moduleBlocks = [];
+  const files = await _getFileList(dirname);
+
+  for (const fileName of files) {
+    const content = await fs.readFile(path.resolve(dirname, fileName), {
+      encoding: "utf-8"
+    });
+
+    if (content.includes("declare module")) {
+      moduleBlocks.push(..._extractModuleBlocks(content));
+    }
+  }
+
+  return moduleBlocks;
+}
+
+async function _getFileList(dirName) {
+  let files = [];
+  const filesInCurrentDir = await fs.readdir(dirName, {
+    withFileTypes: true
+  });
+
+  for (const fileInDir of filesInCurrentDir) {
+    if (fileInDir.isDirectory()) {
+      files = [...files, ...(await _getFileList(path.resolve(dirName, fileInDir.name)))];
+    } else {
+      files.push(path.resolve(dirName, fileInDir.name));
+    }
+  }
+
+  return files;
+}
+
+function _extractModuleBlocks(fileContent) {
+  const moduleBlocks = [];
+  let moduleIndentLevel = 0;
+  let moduleLines = [];
+  const lines = fileContent.split("\n");
+
+  for (const line of lines) {
+    if (!moduleLines.length) {
+      const moduleIndex = line.indexOf("declare module");
+      const isModuleStart = 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 {
   constructor(message, messages) {
     super(message);
@@ -813,6 +888,10 @@ async function _doExtract(ctx, task) {
       tsconfigPath: path.resolve(cwd, ts.configPath || "tsconfig.json"),
       distPath: outDir
     });
+    await _appendModuleBlocks({
+      tsOutDir: tmpPath,
+      extractTypesOutFile: path.resolve(outDir, targetPath)
+    });
     messages.push(...result.messages);
 
     if (result.messages.some(msg => msg.logLevel === "error")) {
@@ -895,7 +974,7 @@ const _dtsWatchTask = {
 };
 
 function _resolveRollupConfig(ctx, buildTask) {
-  var _ref2, _ref5, _ref6, _ref7, _ref8, _ref9;
+  var _ref3, _ref6, _ref7, _ref8, _ref9, _ref10;
 
   var _a, _b, _c;
 
@@ -915,10 +994,10 @@ function _resolveRollupConfig(ctx, buildTask) {
     ts
   } = ctx;
   const outputExt = _MODULE_EXT[pkg.type][format];
-  const minify = (_ref2 = config == null ? void 0 : config.minify) !== null && _ref2 !== void 0 ? _ref2 : true;
+  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(_ref3 => {
-    let [key, val] = _ref3;
+  const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref4 => {
+    let [key, val] = _ref4;
 
     var _a2;
 
@@ -934,8 +1013,8 @@ function _resolveRollupConfig(ctx, buildTask) {
 
   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(_ref4 => {
-    let [key, val] = _ref4;
+  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({
@@ -966,10 +1045,10 @@ function _resolveRollupConfig(ctx, buildTask) {
     esmExternals: false,
     extensions: [".js"]
   }), json(), esbuild({
-    jsx: (_ref5 = config == null ? void 0 : config.jsx) !== null && _ref5 !== void 0 ? _ref5 : "automatic",
-    jsxFactory: (_ref6 = config == null ? void 0 : config.jsxFactory) !== null && _ref6 !== void 0 ? _ref6 : "createElement",
-    jsxFragment: (_ref7 = config == null ? void 0 : config.jsxFragment) !== null && _ref7 !== void 0 ? _ref7 : "Fragment",
-    jsxImportSource: (_ref8 = config == null ? void 0 : config.jsxImportSource) !== null && _ref8 !== void 0 ? _ref8 : "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({
@@ -1043,7 +1122,7 @@ function _resolveRollupConfig(ctx, buildTask) {
       entryFileNames: () => outputExt === ".esm.js" ? "[name].js" : "[name]".concat(outputExt),
       format,
       exports: "auto",
-      sourcemap: (_ref9 = config == null ? void 0 : config.sourcemap) !== null && _ref9 !== void 0 ? _ref9 : true
+      sourcemap: (_ref10 = config == null ? void 0 : config.sourcemap) !== null && _ref10 !== void 0 ? _ref10 : true
     }
   };
 }
@@ -1332,7 +1411,7 @@ function _createLogger() {
 }
 
 async function _resolveBuildContext(options) {
-  var _ref10;
+  var _ref11;
 
   const {
     config,
@@ -1426,7 +1505,7 @@ async function _resolveBuildContext(options) {
     files: [],
     logger,
     pkg,
-    runtime: (_ref10 = config == null ? void 0 : config.runtime) !== null && _ref10 !== void 0 ? _ref10 : "*",
+    runtime: (_ref11 = config == null ? void 0 : config.runtime) !== null && _ref11 !== void 0 ? _ref11 : "*",
     strict,
     target,
     ts: {
@@ -1552,11 +1631,11 @@ function _printPackageTree(ctx) {
     return "".concat(file, " ").concat(chalk.gray(info.size));
   }
 
-  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref11 => {
-    let [, entry] = _ref11;
+  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref12 => {
+    let [, entry] = _ref12;
     return entry._exported;
-  }).map(_ref12 => {
-    let [exportPath, entry] = _ref12;
+  }).map(_ref13 => {
+    let [exportPath, entry] = _ref13;
     const exp = {
       source: entry.source,
       types: void 0,
@@ -1756,8 +1835,8 @@ function _resolveWatchTasks(ctx) {
     target
   } = ctx;
   const tasks = [];
-  const exports = Object.entries(ctx.exports || {}).map(_ref13 => {
-    let [_path, exp] = _ref13;
+  const exports = Object.entries(ctx.exports || {}).map(_ref14 => {
+    let [_path, exp] = _ref14;
     return _objectSpread({
       _path
     }, exp);