@sanity/pkg-utils 1.17.0 → 1.17.1

package/dist/cli.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy(e) {
 
 var cac__default = /*#__PURE__*/_interopDefaultLegacy(cac);
 
-var version = "1.17.0";
+var version = "1.17.1";
 const cli = cac__default["default"]();
 cli.command("", "Check").option("--strict", "Strict mode").option("--tsconfig [tsconfig]", "[string] tsconfig.json").action(async options => {
   const {
@@ -24,7 +24,7 @@ cli.command("build", "Build package").option("--emitDeclarationOnly", "Emit d.ts
   const {
     buildAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/buildAction-1f1e18f0.js');
+    return require('./_chunks/buildAction-e362986d.js');
   });
   return buildAction(options);
 });
@@ -32,7 +32,7 @@ cli.command("watch", "Watch package").option("--strict", "Strict mode").option("
   const {
     watchAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/watchAction-9bef2175.js');
+    return require('./_chunks/watchAction-65236621.js');
   });
   return watchAction(options);
 });

package/dist/index.esm.js

@@ -568,59 +568,64 @@ async function _buildTypes(options) {
 async function _appendModuleBlocks(_ref2) {
   let {
     tsOutDir,
+    extractResult,
     extractTypesOutFile
   } = _ref2;
-  const moduleBlocks = await _extractModuleBlocksFromTypes(tsOutDir);
+  const moduleBlocks = await _extractModuleBlocksFromTypes({
+    tsOutDir,
+    extractResult
+  });
 
   if (moduleBlocks.length) {
     await fs.appendFile(extractTypesOutFile, "\n" + moduleBlocks.join("\n\n"));
   }
 }
 
-async function _extractModuleBlocksFromTypes(dirname) {
+async function _extractModuleBlocksFromTypes(_ref3) {
+  let {
+    tsOutDir,
+    extractResult
+  } = _ref3;
   const moduleBlocks = [];
-  const files = await _getFileList(dirname);
-
-  for (const fileName of files) {
-    const content = await fs.readFile(path.resolve(dirname, fileName), {
-      encoding: "utf-8"
-    });
+  const program = extractResult.compilerState.program;
+  const allProgramFiles = [...program.getSourceFiles()];
+  const sourceFiles = allProgramFiles.filter(sourceFile => sourceFile.fileName.includes(tsOutDir));
 
-    if (content.includes("declare module")) {
-      moduleBlocks.push(..._extractModuleBlocks(content));
+  for (const sourceFile of sourceFiles) {
+    if (sourceFile.text.includes("declare module")) {
+      moduleBlocks.push(..._extractModuleBlocks(sourceFile.text));
     }
   }
 
   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) {
+  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;
+    } 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 = moduleIndex > -1;
+      const isModuleStart = isModuleDeclaration && moduleIndex > -1;
 
       if (isModuleStart) {
         moduleIndentLevel = moduleIndex;
@@ -886,12 +891,13 @@ async function _doExtract(ctx, task) {
     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({
       customTags: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.customTags,
       cwd,
       exportPath,
       files,
-      filePath: path.relative(outDir, targetPath),
+      filePath,
       projectPath: cwd,
       rules: (_b = config == null ? void 0 : config.extract) == null ? void 0 : _b.rules,
       sourceTypesPath,
@@ -900,6 +906,7 @@ async function _doExtract(ctx, task) {
     });
     await _appendModuleBlocks({
       tsOutDir: tmpPath,
+      extractResult: result.extractorResult,
       extractTypesOutFile: path.resolve(outDir, targetPath)
     });
     messages.push(...result.messages);
@@ -984,7 +991,7 @@ const _dtsWatchTask = {
 };
 
 function _resolveRollupConfig(ctx, buildTask) {
-  var _ref3, _ref6, _ref7, _ref8, _ref9, _ref10;
+  var _ref4, _ref7, _ref8, _ref9, _ref10, _ref11;
 
   var _a, _b, _c;
 
@@ -1004,10 +1011,10 @@ function _resolveRollupConfig(ctx, buildTask) {
     ts
   } = ctx;
   const outputExt = _MODULE_EXT[pkg.type][format];
-  const minify = (_ref3 = config == null ? void 0 : config.minify) !== null && _ref3 !== void 0 ? _ref3 : true;
+  const minify = (_ref4 = config == null ? void 0 : config.minify) !== null && _ref4 !== void 0 ? _ref4 : true;
   const outDir = path.relative(cwd, distPath);
-  const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref4 => {
-    let [key, val] = _ref4;
+  const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref5 => {
+    let [key, val] = _ref5;
 
     var _a2;
 
@@ -1023,8 +1030,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(_ref5 => {
-    let [key, val] = _ref5;
+  const replacements = Object.fromEntries(Object.entries((config == null ? void 0 : config.define) || {}).map(_ref6 => {
+    let [key, val] = _ref6;
     return [key, JSON.stringify(val)];
   }));
   const defaultPlugins = [replace({
@@ -1055,10 +1062,10 @@ function _resolveRollupConfig(ctx, buildTask) {
     esmExternals: false,
     extensions: [".js"]
   }), json(), esbuild({
-    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",
+    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",
     target,
     tsconfig: ctx.ts.configPath || "tsconfig.json"
   }), getBabelOutputPlugin({
@@ -1132,7 +1139,7 @@ function _resolveRollupConfig(ctx, buildTask) {
       entryFileNames: () => outputExt === ".esm.js" ? "[name].js" : "[name]".concat(outputExt),
       format,
       exports: "auto",
-      sourcemap: (_ref10 = config == null ? void 0 : config.sourcemap) !== null && _ref10 !== void 0 ? _ref10 : true
+      sourcemap: (_ref11 = config == null ? void 0 : config.sourcemap) !== null && _ref11 !== void 0 ? _ref11 : true
     }
   };
 }
@@ -1421,7 +1428,7 @@ function _createLogger() {
 }
 
 async function _resolveBuildContext(options) {
-  var _ref11;
+  var _ref12;
 
   const {
     config,
@@ -1515,7 +1522,7 @@ async function _resolveBuildContext(options) {
     files: [],
     logger,
     pkg,
-    runtime: (_ref11 = config == null ? void 0 : config.runtime) !== null && _ref11 !== void 0 ? _ref11 : "*",
+    runtime: (_ref12 = config == null ? void 0 : config.runtime) !== null && _ref12 !== void 0 ? _ref12 : "*",
     strict,
     target,
     ts: {
@@ -1641,11 +1648,11 @@ function _printPackageTree(ctx) {
     return "".concat(file, " ").concat(chalk.gray(info.size));
   }
 
-  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref12 => {
-    let [, entry] = _ref12;
+  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref13 => {
+    let [, entry] = _ref13;
     return entry._exported;
-  }).map(_ref13 => {
-    let [exportPath, entry] = _ref13;
+  }).map(_ref14 => {
+    let [exportPath, entry] = _ref14;
     const exp = {
       source: entry.source,
       types: void 0,
@@ -1845,8 +1852,8 @@ function _resolveWatchTasks(ctx) {
     target
   } = ctx;
   const tasks = [];
-  const exports = Object.entries(ctx.exports || {}).map(_ref14 => {
-    let [_path, exp] = _ref14;
+  const exports = Object.entries(ctx.exports || {}).map(_ref15 => {
+    let [_path, exp] = _ref15;
     return _objectSpread({
       _path
     }, exp);