@sanity/pkg-utils 2.0.7 → 2.1.1

package/dist/_chunks/{watchAction-218b780d.cjs.map → watchAction-d2c08880.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"watchAction-218b780d.cjs","sources":["../../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\nimport {handleError} from './handleError'\n\nexport async function watchAction(options: {strict?: boolean; tsconfig?: string}): Promise<void> {\n  try {\n    await watch({\n      cwd: process.cwd(),\n      strict: options.strict,\n      tsconfig: options.tsconfig,\n    })\n  } catch (err) {\n    handleError(err)\n  }\n}\n"],"names":["watchAction","options","watch","cwd","process","strict","tsconfig","err","handleError"],"mappings":";;;;AAGA,eAAsBA,YAAYC,OAA+D,EAAA;EAC3F,IAAA;IACF,MAAMC,WAAM,CAAA;MACVC,GAAA,EAAKC,QAAQD,GAAI,EAAA;MACjBE,QAAQJ,OAAQ,CAAAI,MAAA;MAChBC,UAAUL,OAAQ,CAAAK;IAAA,CACnB,CAAA;WACMC,GAAP,EAAA;IACAC,WAAA,CAAAA,WAAA,CAAYD,GAAG,CAAA;EACjB;AACF;"}
+{"version":3,"file":"watchAction-d2c08880.cjs","sources":["../../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\nimport {handleError} from './handleError'\n\nexport async function watchAction(options: {strict?: boolean; tsconfig?: string}): Promise<void> {\n  try {\n    await watch({\n      cwd: process.cwd(),\n      strict: options.strict,\n      tsconfig: options.tsconfig,\n    })\n  } catch (err) {\n    handleError(err)\n  }\n}\n"],"names":["watchAction","options","watch","cwd","process","strict","tsconfig","err","handleError"],"mappings":";;;;AAGA,eAAsBA,YAAYC,OAA+D,EAAA;EAC3F,IAAA;IACF,MAAMC,WAAM,CAAA;MACVC,GAAA,EAAKC,QAAQD,GAAI,EAAA;MACjBE,QAAQJ,OAAQ,CAAAI,MAAA;MAChBC,UAAUL,OAAQ,CAAAK;IAAA,CACnB,CAAA;WACMC,GAAP,EAAA;IACAC,WAAA,CAAAA,WAAA,CAAYD,GAAG,CAAA;EACjB;AACF;"}

package/dist/cli.cjs

@@ -7,13 +7,13 @@ function _interopDefaultCompat(e) {
   };
 }
 var cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
-var version = "2.0.7";
+var version = "2.1.1";
 const cli = cac__default.default();
 cli.command("", "Check").option("--strict", "Strict mode").option("--tsconfig [tsconfig]", "[string] tsconfig.json").action(async options => {
   const {
     checkAction: statusAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/checkAction-fcfe53a1.cjs');
+    return require('./_chunks/checkAction-1aa1fff7.cjs');
   });
   return statusAction(options);
 });
@@ -21,7 +21,7 @@ cli.command("build", "Build package").option("--emitDeclarationOnly", "Emit d.ts
   const {
     buildAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/buildAction-558fce96.cjs');
+    return require('./_chunks/buildAction-9ce9614a.cjs');
   });
   return buildAction(options);
 });
@@ -29,7 +29,7 @@ cli.command("watch", "Watch package").option("--strict", "Strict mode").option("
   const {
     watchAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/watchAction-218b780d.cjs');
+    return require('./_chunks/watchAction-d2c08880.cjs');
   });
   return watchAction(options);
 });

package/dist/index.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var build = require('./_chunks/build-411f01fc.cjs');
-var check = require('./_chunks/check-3bf5eb0d.cjs');
-var resolveBuildContext = require('./_chunks/resolveBuildContext-86a1602c.cjs');
-var index = require('./_chunks/index-5e7d04c4.cjs');
-var watch = require('./_chunks/watch-096666ea.cjs');
+var build = require('./_chunks/build-68e9229a.cjs');
+var check = require('./_chunks/check-745260bc.cjs');
+var resolveBuildContext = require('./_chunks/resolveBuildContext-702e3fb6.cjs');
+var index = require('./_chunks/index-a01cf661.cjs');
+var watch = require('./_chunks/watch-533fe913.cjs');
 function defineConfig(configOptions) {
   return configOptions;
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import {ExtractorMessage} from '@microsoft/api-extractor'
 import {IExtractorMessagesConfig} from '@microsoft/api-extractor'
 import {Observable} from 'rxjs'
+import {PluginItem} from '@babel/core'
 import {Plugin as RollupPlugin} from 'rollup'
 import {RollupWatcherEvent} from 'rollup'
 import ts from 'typescript'
@@ -59,12 +60,13 @@ export declare interface BuildFile {
 }
 
 /** @internal */
-export declare type BuildTask = DtsTask | RollupTask
+export declare type BuildTask = DtsTask | RollupTask | NodeReExportFromCJSTask
 
 /** @internal */
 export declare interface BuildTaskHandlers {
   'build:dts': TaskHandler<DtsTask, DtsResult>
   'build:js': TaskHandler<RollupTask>
+  'node:reexport-cjs': TaskHandler<NodeReExportFromCJSTask>
 }
 
 /** @internal */
@@ -165,6 +167,16 @@ export declare interface Logger {
   success: (...args: unknown[]) => void
 }
 
+/** @internal */
+export declare interface NodeReExportFromCJSTask {
+  type: 'node:reexport-cjs'
+  entries: {
+    importId: string
+    import: string
+    require: string
+  }[]
+}
+
 /** @internal */
 export declare interface PackageJSON {
   type?: 'commonjs' | 'module'
@@ -223,6 +235,10 @@ export declare interface PkgBundle {
 
 /** @public */
 export declare interface PkgConfigOptions {
+  /** @alpha */
+  babel?: {
+    plugins?: PluginItem[] | null | undefined
+  }
   bundles?: PkgBundle[]
   /** @alpha */
   define?: Record<string, string | number | boolean | undefined | null>

package/dist/index.js

@@ -1,22 +1,14 @@
-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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import path from 'path';
 import { register } from 'esbuild-register/dist/node';
 import pkgUp from 'pkg-up';
-import fs, { stat, readFile } from 'fs/promises';
+import fs, { stat, readFile, writeFile } from 'fs/promises';
 import findConfig from 'find-config';
 import { z, ZodError } from 'zod';
 import chalk from 'chalk';
 import ts from 'typescript';
 import browserslist from 'browserslist';
 import fs$1, { statSync } from 'fs';
-import { Observable, switchMap } from 'rxjs';
+import { Observable, from, switchMap } from 'rxjs';
 import { promisify } from 'util';
 import rimrafCallback from 'rimraf';
 import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
@@ -260,10 +252,11 @@ function parseExports(options) {
           }
           Object.assign(rootExport, exportEntry);
         } else {
-          const extraExport = _objectSpread({
+          const extraExport = {
             _exported: true,
-            _path: exportPath
-          }, exportEntry);
+            _path: exportPath,
+            ...exportEntry
+          };
           extraExports.push(extraExport);
         }
       } else {
@@ -295,7 +288,9 @@ function getPkgExtMap(options) {
   const {
     legacyExports
   } = options;
-  const ret = _objectSpread({}, DEFAULT_PKG_EXT_MAP);
+  const ret = {
+    ...DEFAULT_PKG_EXT_MAP
+  };
   if (legacyExports) {
     ret["commonjs"] = {
       commonjs: ".js",
@@ -484,12 +479,13 @@ async function resolveBuildContext(options) {
     strict
   }).reduce((acc, x) => {
     const {
-        _path: exportPath
-      } = x,
-      exportEntry = _objectWithoutProperties(x, _excluded);
-    return _objectSpread(_objectSpread({}, acc), {}, {
+      _path: exportPath,
+      ...exportEntry
+    } = x;
+    return {
+      ...acc,
       [exportPath]: exportEntry
-    });
+    };
   }, {});
   const exports = resolveConfigProperty(config == null ? void 0 : config.exports, parsedExports);
   const parsedExternal = [...(pkg.dependencies ? Object.keys(pkg.dependencies) : []), ...(pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : [])];
@@ -547,9 +543,10 @@ function resolveBuildTasks(ctx) {
   const tasks = [];
   const exports = Object.entries(ctx.exports || {}).map(_ref2 => {
     let [_path, exp] = _ref2;
-    return _objectSpread({
-      _path
-    }, exp);
+    return {
+      _path,
+      ...exp
+    };
   });
   const dtsTask = {
     type: "build:dts",
@@ -650,6 +647,23 @@ function resolveBuildTasks(ctx) {
       }
     }
   }
+  const nodeReexportCjsEntries = [];
+  for (const exp of exports) {
+    if (exp.node && !exp.node.source && exp.node.import && exp.node.require && (exp.node.import.endsWith(".cjs.js") || exp.node.import.endsWith(".cjs.mjs"))) {
+      const importId = path.join(pkg.name, exp._path);
+      nodeReexportCjsEntries.push({
+        importId,
+        import: exp.node.import,
+        require: exp.node.require
+      });
+    }
+  }
+  if (nodeReexportCjsEntries.length) {
+    tasks.push({
+      type: "node:reexport-cjs",
+      entries: nodeReexportCjsEntries
+    });
+  }
   return tasks;
 }
 function createSpinner(msg) {
@@ -730,13 +744,14 @@ async function buildTypes(options) {
     tsconfig,
     strict = false
   } = options;
-  const compilerOptions = _objectSpread(_objectSpread({}, tsconfig.options), {}, {
+  const compilerOptions = {
+    ...tsconfig.options,
     declaration: true,
     declarationDir: outDir,
     emitDeclarationOnly: true,
     noEmit: false,
     outDir
-  });
+  };
   const program = ts.createProgram(tsconfig.fileNames, compilerOptions);
   const emitResult = program.emit();
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
@@ -810,15 +825,18 @@ async function createTSDocConfig(opts) {
     syntaxKind: t.syntaxKind,
     allowMultiple: t.allowMultiple
   })));
-  const supportForTags = _objectSpread({}, tsDocBaseConfig.supportForTags);
+  const supportForTags = {
+    ...tsDocBaseConfig.supportForTags
+  };
   for (const customTag of customTags) {
     supportForTags["@".concat(customTag.name)] = true;
   }
-  return TSDocConfigFile.loadFromObject(_objectSpread(_objectSpread({}, tsDocBaseConfig), {}, {
+  return TSDocConfigFile.loadFromObject({
+    ...tsDocBaseConfig,
     noStandardTags: false,
     tagDefinitions,
     supportForTags
-  }));
+  });
 }
 async function extractModuleBlocksFromTypes(_ref3) {
   let {
@@ -958,9 +976,10 @@ async function extractTypes(options) {
     tsOutDir: tmpPath
   });
   const code = [typesBuf.toString(), ...moduleBlocks].join("\n\n");
-  await fs.writeFile(typesPath, prettier.format(code, _objectSpread(_objectSpread({}, prettierConfig), {}, {
+  await fs.writeFile(typesPath, prettier.format(code, {
+    ...prettierConfig,
     filepath: typesPath
-  })));
+  }));
   files.push({
     type: "types",
     path: typesPath
@@ -1095,6 +1114,34 @@ const dtsWatchTask = {
     }
   }
 };
+const nodeReexportCjsTask = {
+  name: (_ctx, task) => ["Re-export CommonJS module in ESM wrapper\u2026", "  entries:", ...task.entries.map(entry => ["    - ".concat(chalk.cyan(entry.importId), ": "), "".concat(chalk.yellow(entry.require), " ").concat(chalk.gray("\u2192"), " ").concat(chalk.yellow(entry.import))].join(""))].join("\n"),
+  exec: (ctx, task) => {
+    return from(exec(ctx, task));
+  },
+  complete: () => {},
+  error: (_ctx, _task, err) => {
+    console.error(err);
+  }
+};
+async function exec(ctx, task) {
+  const {
+    cwd
+  } = ctx;
+  for (const entry of task.entries) {
+    const sourcePath = path.resolve(cwd, entry.require);
+    const targetPath = path.resolve(cwd, entry.import);
+    const targetDir = path.dirname(targetPath);
+    await mkdirp(targetDir);
+    const mod = require(sourcePath);
+    let relativeImport = "./".concat(path.relative(targetDir, sourcePath));
+    if (relativeImport.startsWith("./.")) {
+      relativeImport = relativeImport.slice(2);
+    }
+    const code = ["import cjs from '".concat(relativeImport, "';"), "", ...Object.keys(mod).map(k => "export const ".concat(k, " = cjs.").concat(k, ";")), ""].join("\n");
+    await writeFile(targetPath, code, "utf8");
+  }
+}
 function createConsoleSpy(options) {
   const {
     onRestored
@@ -1144,7 +1191,7 @@ function createConsoleSpy(options) {
 }
 function resolveRollupConfig(ctx, buildTask) {
   var _ref4, _ref7, _ref8, _ref9, _ref10, _ref11;
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const {
     format,
     runtime,
@@ -1170,9 +1217,10 @@ function resolveRollupConfig(ctx, buildTask) {
     return [key, path.resolve(cwd, ((_a2 = ts.config) == null ? void 0 : _a2.options.baseUrl) || ".", val[0])];
   }));
   const entries = buildTask.entries.map(entry => {
-    return _objectSpread(_objectSpread({}, entry), {}, {
+    return {
+      ...entry,
       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));
@@ -1182,22 +1230,29 @@ function resolveRollupConfig(ctx, buildTask) {
   }));
   const defaultPlugins = [replace({
     preventAssignment: true,
-    values: _objectSpread({}, pkg.name === "@sanity/pkg-utils" ? _objectSpread({}, replacements) : _objectSpread({
-      "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),
-      "process.env.PKG_RUNTIME": JSON.stringify(runtime),
-      "process.env.PKG_VERSION": JSON.stringify(process.env.PKG_VERSION || pkg.version)
-    }, replacements))
+    values: {
+      ...(pkg.name === "@sanity/pkg-utils" ? {
+        ...replacements
+      } : {
+        "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),
+        "process.env.PKG_RUNTIME": JSON.stringify(runtime),
+        "process.env.PKG_VERSION": JSON.stringify(process.env.PKG_VERSION || pkg.version),
+        ...replacements
+      })
+    }
   }), alias({
-    entries: _objectSpread({}, pathAliases)
+    entries: {
+      ...pathAliases
+    }
   }), nodeResolve({
     browser: runtime === "browser",
     extensions: [".cjs", ".mjs", ".js", ".jsx", ".json", ".node"],
@@ -1211,7 +1266,7 @@ function resolveRollupConfig(ctx, buildTask) {
     tsconfig: ctx.ts.configPath || "tsconfig.json"
   }), getBabelOutputPlugin({
     babelrc: false,
-    plugins: ["@babel/plugin-proposal-object-rest-spread"],
+    plugins: (_b = config == null ? void 0 : config.babel) == null ? void 0 : _b.plugins,
     presets: [["@babel/preset-env", {
       targets: pkg.browserslist || DEFAULT_BROWSERSLIST_QUERY,
       modules: false
@@ -1231,8 +1286,8 @@ function resolveRollupConfig(ctx, buildTask) {
       }
     }
   })].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 userPlugins = (_c = config == null ? void 0 : config.rollup) == null ? void 0 : _c.plugins;
+  const plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : resolveConfigProperty((_d = config == null ? void 0 : config.rollup) == null ? void 0 : _d.plugins, defaultPlugins);
   return {
     inputOptions: {
       context: cwd,
@@ -1255,9 +1310,10 @@ function resolveRollupConfig(ctx, buildTask) {
         return false;
       },
       input: entries.reduce((acc, entry) => {
-        return _objectSpread(_objectSpread({}, acc), {}, {
+        return {
+          ...acc,
           [entry.name]: entry.source
-        });
+        };
       }, {}),
       plugins,
       treeshake: {
@@ -1342,7 +1398,8 @@ async function execPromise(ctx, task) {
       inputOptions,
       outputOptions
     } = resolveRollupConfig(ctx, task);
-    const bundle = await rollup(_objectSpread(_objectSpread({}, inputOptions), {}, {
+    const bundle = await rollup({
+      ...inputOptions,
       onwarn(warning) {
         consoleSpy.messages.push({
           type: "warn",
@@ -1350,7 +1407,7 @@ async function execPromise(ctx, task) {
           args: [warning.message]
         });
       }
-    }));
+    });
     const {
       output
     } = await bundle.generate(outputOptions);
@@ -1383,9 +1440,10 @@ const rollupWatchTask = {
       outputOptions
     } = resolveRollupConfig(ctx, task);
     return new Observable(observer => {
-      const watchOptions = _objectSpread(_objectSpread({}, inputOptions), {}, {
+      const watchOptions = {
+        ...inputOptions,
         output: outputOptions
-      });
+      };
       const watcher = watch$1(watchOptions);
       watcher.on("event", event => {
         observer.next(event);
@@ -1429,7 +1487,8 @@ const rollupWatchTask = {
 };
 const buildTaskHandlers = {
   "build:dts": dtsTask,
-  "build:js": rollupTask
+  "build:js": rollupTask,
+  "node:reexport-cjs": nodeReexportCjsTask
 };
 const watchTaskHandlers = {
   "watch:dts": dtsWatchTask,
@@ -1713,9 +1772,10 @@ function resolveWatchTasks(ctx) {
   const tasks = [];
   const exports = Object.entries(ctx.exports || {}).map(_ref17 => {
     let [_path, exp] = _ref17;
-    return _objectSpread({
-      _path
-    }, exp);
+    return {
+      _path,
+      ...exp
+    };
   });
   const dtsTask = {
     type: "watch:dts",