@sanity/pkg-utils 1.7.2 → 1.7.3

package/dist/index.js

@@ -20,8 +20,6 @@ import chalk from 'chalk';
 import ts from 'typescript';
 import fs$1, { statSync } from 'fs';
 import { Observable, switchMap } from 'rxjs';
-import { promisify } from 'util';
-import rimrafCallback from 'rimraf';
 import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
 import mkdirp from 'mkdirp';
 import prettier from 'prettier';
@@ -171,7 +169,7 @@ async function _loadPkgWithReporting(options) {
     if (err instanceof ZodError) {
       for (const issue of err.issues) {
         if (issue.code === "invalid_type") {
-          console.log("".concat(chalk.red("invalid type"), " in ./package.json at ").concat(chalk.magenta("`".concat(issue.path.join(""), "`")), " (expected ").concat(issue.expected, ", received ").concat(issue.received, ")"));
+          console.log("".concat(chalk.red("invalid type"), " in ./package.json at ").concat(chalk.magenta("`".concat(issue.path.join("."), "`")), " (expected ").concat(issue.expected, ", received ").concat(issue.received, ")"));
         }
       }
     } else {
@@ -253,13 +251,18 @@ function _resolveBuildTasks(ctx) {
       _path
     }, exp);
   });
-  const dtsTasks = {};
+  const dtsTask = {
+    type: "build:dts",
+    entries: []
+  };
   const rollupTasks = {};
 
   function _addRollupTaskEntry(format, runtime, entry) {
     const buildId = "".concat(format, ":").concat(runtime);
 
-    if (!rollupTasks[buildId]) {
+    if (rollupTasks[buildId]) {
+      rollupTasks[buildId].entries.push(entry);
+    } else {
       rollupTasks[buildId] = {
         type: "build:js",
         buildId,
@@ -268,8 +271,6 @@ function _resolveBuildTasks(ctx) {
         format,
         target: target[runtime]
       };
-    } else {
-      rollupTasks[buildId].entries.push(entry);
     }
   }
 
@@ -277,15 +278,12 @@ function _resolveBuildTasks(ctx) {
     const importId = path.join(pkg.name, exp._path);
 
     if (exp.types) {
-      if (!dtsTasks[importId]) {
-        dtsTasks[importId] = {
-          type: "build:dts",
-          importId,
-          exportPath: exp._path,
-          sourcePath: exp.source,
-          targetPath: exp.types
-        };
-      }
+      dtsTask.entries.push({
+        importId,
+        exportPath: exp._path,
+        sourcePath: exp.source,
+        targetPath: exp.types
+      });
     }
   }
 
@@ -333,7 +331,10 @@ function _resolveBuildTasks(ctx) {
     });
   }
 
-  tasks.push(...Object.values(dtsTasks));
+  if (dtsTask.entries.length) {
+    tasks.push(dtsTask);
+  }
+
   tasks.push(...Object.values(rollupTasks));
 
   for (const exp of exports) {
@@ -394,9 +395,7 @@ const formatHost = {
 
 async function _buildTypes(options) {
   const {
-    cwd,
     outDir,
-    sourcePath,
     tsconfig
   } = options;
 
@@ -408,15 +407,7 @@ async function _buildTypes(options) {
     outDir
   });
 
-  const rootDir = path.relative(cwd, compilerOptions.rootDir ? path.resolve(cwd, compilerOptions.rootDir) : path.dirname(path.resolve(cwd, sourcePath))) || ".";
   const program = ts.createProgram(tsconfig.fileNames, compilerOptions);
-  const sourceFiles = program.getSourceFiles();
-  const sourceFile = sourceFiles.find(f => f.fileName === path.resolve(cwd, sourcePath));
-
-  if (!sourceFile) {
-    throw new Error("source file not found: ".concat(sourcePath));
-  }
-
   const emitResult = program.emit();
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
   allDiagnostics.forEach(diagnostic => {
@@ -440,11 +431,6 @@ async function _buildTypes(options) {
       throw new Error("failed to compile");
     }
   }
-
-  const typesPath = path.resolve(outDir, path.relative(rootDir, path.resolve(cwd, sourcePath))).replace(/\.[jt]sx?$/, ".d.ts");
-  return {
-    path: typesPath
-  };
 }
 
 class _DtsError extends Error {
@@ -628,8 +614,6 @@ async function _extractTypes(options) {
   };
 }
 
-const rimraf = promisify(rimrafCallback);
-
 async function _doExtract(ctx, task) {
   var _a;
 
@@ -644,38 +628,37 @@ async function _doExtract(ctx, task) {
     type: "dts",
     messages: []
   };
-  const sourcePath = task.sourcePath;
-  const exportPath = task.exportPath === "." ? "./index" : task.exportPath;
   const distPath = path.resolve(cwd, dist);
-  const filePath = path.relative(distPath, path.resolve(cwd, task.targetPath));
-  const tmpDirPath = path.resolve(distPath, "__dts__");
-  const tmpDir = {
-    path: tmpDirPath,
-    removeCallback: () => rimraf(tmpDirPath)
-  };
-  const types = await _buildTypes({
-    cwd,
-    outDir: tmpDir.path,
-    sourcePath,
-    tsconfig: ts.config
-  });
   const {
-    messages
-  } = await _extractTypes({
+    outDir = distPath,
+    rootDir = cwd
+  } = ts.config.options;
+  await _buildTypes({
     cwd,
-    exportPath,
-    files,
-    filePath,
-    projectPath: cwd,
-    rules: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.rules,
-    sourcePath: types.path,
-    tsconfigPath: path.resolve(cwd, ts.configPath),
-    distPath
+    outDir,
+    tsconfig: ts.config
   });
-  await tmpDir.removeCallback();
+  const messages = [];
+
+  for (const entry of task.entries) {
+    const exportPath = entry.exportPath === "." ? "./index" : entry.exportPath;
+    const filePath = path.relative(distPath, path.resolve(cwd, entry.targetPath));
+    const result = await _extractTypes({
+      cwd,
+      exportPath,
+      files,
+      filePath,
+      projectPath: cwd,
+      rules: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.rules,
+      sourcePath: path.resolve(outDir, path.relative(cwd, rootDir), entry.sourcePath.replace(/\.ts$/, ".d.ts")),
+      tsconfigPath: path.resolve(cwd, ts.configPath),
+      distPath
+    });
+    messages.push(...result.messages);
 
-  if (messages.some(msg => msg.logLevel === "error")) {
-    throw new _DtsError("encountered errors when extracting types", messages);
+    if (result.messages.some(msg => msg.logLevel === "error")) {
+      throw new _DtsError("encountered errors when extracting types", result.messages);
+    }
   }
 
   return {
@@ -685,7 +668,7 @@ async function _doExtract(ctx, task) {
 }
 
 const _dtsTask = {
-  name: (_ctx, task) => ["build type definitions", "       ".concat(chalk.blue(task.importId), ": ").concat(task.sourcePath, " -> ").concat(task.targetPath)].join("\n"),
+  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 => {
@@ -712,7 +695,7 @@ const _dtsTask = {
   }
 };
 const _dtsWatchTask = {
-  name: (_ctx, task) => ["build type definitions", "       ".concat(chalk.blue(task.importId), ": ").concat(task.sourcePath, " -> ").concat(task.targetPath)].join("\n"),
+  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 => {
@@ -757,12 +740,14 @@ function _resolveRollupConfig(ctx, buildTask) {
   const {
     config,
     cwd,
+    exports: _exports,
     external,
     dist: outDir,
+    logger,
     pkg,
     ts
   } = ctx;
-  const outputExt = format === "commonjs" ? ".cjs" : pkg.type === "module" ? ".mjs" : ".js";
+  const outputExt = format === "commonjs" ? ".cjs" : ".js";
   const minify = (_ref2 = config == null ? void 0 : config.minify) !== null && _ref2 !== void 0 ? _ref2 : true;
   const pathAliases = Object.fromEntries(Object.entries(((_a = ts.config) == null ? void 0 : _a.options.paths) || {}).map(_ref3 => {
     let [key, val] = _ref3;
@@ -776,10 +761,28 @@ 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));
+
   return {
     inputOptions: {
       context: cwd,
-      external: id => {
+      external: (id, importer) => {
+        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];
 
@@ -835,6 +838,7 @@ function _resolveRollupConfig(ctx, buildTask) {
         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
@@ -1466,13 +1470,18 @@ function _resolveWatchTasks(ctx) {
       _path
     }, exp);
   });
-  const dtsTasks = {};
+  const dtsTask = {
+    type: "watch:dts",
+    entries: []
+  };
   const rollupTasks = {};
 
   function _addRollupTaskEntry(format, runtime, entry) {
     const buildId = "".concat(format, ":").concat(runtime);
 
-    if (!rollupTasks[buildId]) {
+    if (rollupTasks[buildId]) {
+      rollupTasks[buildId].entries.push(entry);
+    } else {
       rollupTasks[buildId] = {
         type: "watch:js",
         buildId,
@@ -1481,8 +1490,6 @@ function _resolveWatchTasks(ctx) {
         format,
         target: target[runtime]
       };
-    } else {
-      rollupTasks[buildId].entries.push(entry);
     }
   }
 
@@ -1490,15 +1497,12 @@ function _resolveWatchTasks(ctx) {
     const importId = path.join(pkg.name, exp._path);
 
     if (exp.types) {
-      if (!dtsTasks[importId]) {
-        dtsTasks[importId] = {
-          type: "watch:dts",
-          importId,
-          exportPath: exp._path,
-          sourcePath: exp.source,
-          targetPath: exp.types
-        };
-      }
+      dtsTask.entries.push({
+        importId,
+        exportPath: exp._path,
+        sourcePath: exp.source,
+        targetPath: exp.types
+      });
     }
   }
 
@@ -1546,7 +1550,10 @@ function _resolveWatchTasks(ctx) {
     });
   }
 
-  tasks.push(...Object.values(dtsTasks));
+  if (dtsTask.entries.length) {
+    tasks.push(dtsTask);
+  }
+
   tasks.push(...Object.values(rollupTasks));
 
   for (const exp of exports) {
@@ -1554,7 +1561,7 @@ function _resolveWatchTasks(ctx) {
       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 {default} from '".concat(relativeTargetPath, "'"), "export * from '".concat(relativeTargetPath, "'"), ""].join("\n"));
+        fs$1.writeFileSync(path.resolve(cwd, "".concat(exp._path, ".js")), ["// AUTO-GENERATED \u2013 DO NOT EDIT", "", "export * from '".concat(relativeTargetPath, "'"), ""].join("\n"));
       }
     }
   }