@sanity/pkg-utils 2.1.0 → 2.2.0

package/dist/cli.cjs

@@ -7,13 +7,13 @@ function _interopDefaultCompat(e) {
   };
 }
 var cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
-var version = "2.1.0";
+var version = "2.2.0";
 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-59707d6a.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-404437e8.cjs');
+    return require('./_chunks/buildAction-02b78976.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-b72906aa.cjs');
+    return require('./_chunks/watchAction-de3c9fdf.cjs');
   });
   return watchAction(options);
 });

package/dist/index.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var build = require('./_chunks/build-2a47293b.cjs');
-var check = require('./_chunks/check-3bf5eb0d.cjs');
-var resolveBuildContext = require('./_chunks/resolveBuildContext-86a1602c.cjs');
-var index = require('./_chunks/index-58e287aa.cjs');
-var watch = require('./_chunks/watch-86ed07a5.cjs');
+var build = require('./_chunks/build-8d840bfe.cjs');
+var check = require('./_chunks/check-37772bb3.cjs');
+var resolveBuildContext = require('./_chunks/resolveBuildContext-c51eac50.cjs');
+var index = require('./_chunks/index-49daefad.cjs');
+var watch = require('./_chunks/watch-6cfbe78a.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'
@@ -234,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,11 +1,3 @@
-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';
@@ -124,6 +116,7 @@ const pkgSchema = z.object({
   exports: z.optional(z.record(z.union([z.custom(val => /^\.\/.*\.json$/.test(val)), z.object({
     types: z.optional(z.string()),
     source: z.string(),
+    require: z.optional(z.string()),
     browser: z.optional(z.object({
       source: z.string(),
       require: z.optional(z.string()),
@@ -134,7 +127,6 @@ const pkgSchema = z.object({
       require: z.optional(z.string()),
       import: z.optional(z.string())
     })),
-    require: z.optional(z.string()),
     import: z.optional(z.string()),
     default: z.string()
   })]))),
@@ -152,7 +144,31 @@ 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()));
+  const raw = JSON.parse(buf.toString());
+  validatePkg(raw);
+  return raw;
+}
+function assertFirst(a, arr) {
+  const aIdx = arr.indexOf(a);
+  if (aIdx === -1) {
+    return true;
+  }
+  return aIdx === 0;
+}
+function assertLast(a, arr) {
+  const aIdx = arr.indexOf(a);
+  if (aIdx === -1) {
+    return true;
+  }
+  return aIdx === arr.length - 1;
+}
+function assertOrder(a, b, arr) {
+  const aIdx = arr.indexOf(a);
+  const bIdx = arr.indexOf(b);
+  if (aIdx === -1 || bIdx === -1) {
+    return true;
+  }
+  return aIdx < bIdx;
 }
 async function loadPkgWithReporting(options) {
   const {
@@ -163,8 +179,29 @@ async function loadPkgWithReporting(options) {
     const pkg = await loadPkg({
       cwd
     });
-    if (pkg.type === void 0) {
-      logger.warn('no "type" field in package.json, defaulting to "commonjs"');
+    if (pkg.exports) {
+      const _exports = Object.entries(pkg.exports);
+      for (const [expPath, exp] of _exports) {
+        if (typeof exp === "string") {
+          continue;
+        }
+        const keys = Object.keys(exp);
+        if (!assertFirst("types", keys)) {
+          logger.warn("exports[\"".concat(expPath, "\"]: the `types` property should be the first property"));
+        }
+        if (!assertOrder("require", "import", keys)) {
+          logger.warn("exports[\"".concat(expPath, "\"]: the `require` property should come before the `import` property"));
+        }
+        if (!assertOrder("require", "node", keys)) {
+          logger.warn("exports[\"".concat(expPath, "\"]: the `require` property should come before the `node` property"));
+        }
+        if (!assertOrder("node", "import", keys)) {
+          logger.warn("exports[\"".concat(expPath, "\"]: the `node` property should come before `import` property"));
+        }
+        if (!assertLast("default", keys)) {
+          logger.warn("exports[\"".concat(expPath, "\"]: the `default` property should be the last property"));
+        }
+      }
     }
     return pkg;
   } catch (err) {
@@ -227,8 +264,8 @@ function parseExports(options) {
       require: pkg.main && pkg.browser[pkg.main],
       import: pkg.module && pkg.browser[pkg.module]
     },
-    import: pkg.module,
     require: pkg.main,
+    import: pkg.module,
     default: pkg.module || pkg.main || ""
   };
   const extraExports = [];
@@ -260,10 +297,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 +333,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 +524,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 +588,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",
@@ -747,13 +789,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);
@@ -827,15 +870,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 {
@@ -975,9 +1021,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
@@ -1189,7 +1236,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,
@@ -1215,9 +1262,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));
@@ -1227,22 +1275,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"],
@@ -1256,7 +1311,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
@@ -1276,8 +1331,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,
@@ -1300,9 +1355,10 @@ function resolveRollupConfig(ctx, buildTask) {
         return false;
       },
       input: entries.reduce((acc, entry) => {
-        return _objectSpread(_objectSpread({}, acc), {}, {
+        return {
+          ...acc,
           [entry.name]: entry.source
-        });
+        };
       }, {}),
       plugins,
       treeshake: {
@@ -1387,7 +1443,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",
@@ -1395,7 +1452,7 @@ async function execPromise(ctx, task) {
           args: [warning.message]
         });
       }
-    }));
+    });
     const {
       output
     } = await bundle.generate(outputOptions);
@@ -1428,9 +1485,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);
@@ -1563,9 +1621,10 @@ function printPackageTree(ctx) {
   } = ctx;
   if (!exports) return;
   logger.log("".concat(chalk.blue(pkg.name), "@").concat(chalk.green(pkg.version)));
-  const tree = {
-    type: chalk.yellow(pkg.type)
-  };
+  const tree = {};
+  if (pkg.type) {
+    tree.type = chalk.yellow(pkg.type);
+  }
   if (pkg.bin) {
     tree.bin = Object.fromEntries(Object.entries(pkg.bin).map(_ref13 => {
       let [name, file] = _ref13;
@@ -1588,9 +1647,9 @@ function printPackageTree(ctx) {
       types: void 0,
       source: fileInfo(entry.source),
       browser: void 0,
+      require: void 0,
       node: void 0,
       import: void 0,
-      require: void 0,
       default: fileInfo(entry.default)
     };
     if (entry.types) {
@@ -1607,6 +1666,11 @@ function printPackageTree(ctx) {
     } else {
       delete exp.browser;
     }
+    if (entry.require) {
+      exp.require = fileInfo(entry.require);
+    } else {
+      delete exp.require;
+    }
     if (entry.node) {
       exp.node = {};
       if (entry.node.source) exp.node.source = fileInfo(entry.node.source);
@@ -1620,11 +1684,6 @@ function printPackageTree(ctx) {
     } else {
       delete exp.import;
     }
-    if (entry.require) {
-      exp.require = fileInfo(entry.require);
-    } else {
-      delete exp.require;
-    }
     return [chalk.cyan(path.join(pkg.name, exportPath)), exp];
   }));
   logger.log(treeify.asTree(tree, true, true));
@@ -1759,9 +1818,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",