@sanity/pkg-utils 1.13.0 → 1.15.0

package/dist/index.esm.js

@@ -504,7 +504,8 @@ const formatHost = {
 async function _buildTypes(options) {
   const {
     outDir,
-    tsconfig
+    tsconfig,
+    strict = false
   } = options;
 
   const compilerOptions = _objectSpread(_objectSpread({}, tsconfig.options), {}, {
@@ -536,7 +537,10 @@ async function _buildTypes(options) {
 
     if (errors.length) {
       console.error(ts.formatDiagnostics(errors, formatHost));
-      throw new Error("failed to compile");
+
+      if (strict) {
+        throw new Error("failed to compile TypeScript definitions");
+      }
     }
   }
 }
@@ -621,27 +625,17 @@ const _LOG_LEVELS = {
   warn: "warning"
 };
 
-async function _extractTypes(options) {
+function _getExtractMessagesConfig(options) {
   const {
-    distPath,
-    exportPath,
-    files,
-    filePath,
-    projectPath,
-    rules,
-    sourceTypesPath,
-    tsconfigPath
+    rules
   } = options;
-  const tsdocConfigFile = await _createTSDocConfig({
-    customTags: []
-  });
 
   function _ruleToLogLevel(key, defaultLevel) {
     const r = rules == null ? void 0 : rules[key];
     return r ? _LOG_LEVELS[r] : defaultLevel || "warning";
   }
 
-  const messagesConfig = {
+  return {
     compilerMessageReporting: {
       default: {
         logLevel: "warning"
@@ -692,12 +686,31 @@ async function _extractTypes(options) {
       }
     }
   };
+}
+
+async function _extractTypes(options) {
+  const {
+    customTags,
+    distPath,
+    exportPath,
+    files,
+    filePath,
+    projectPath,
+    rules,
+    sourceTypesPath,
+    tsconfigPath
+  } = options;
+  const tsdocConfigFile = await _createTSDocConfig({
+    customTags: customTags || []
+  });
   const extractorConfig = ExtractorConfig.prepare({
     configObject: _createApiExtractorConfig({
       distPath,
       exportPath,
       filePath,
-      messages: messagesConfig,
+      messages: _getExtractMessagesConfig({
+        rules
+      }),
       projectFolder: projectPath,
       mainEntryPointFilePath: sourceTypesPath,
       tsconfigPath
@@ -737,12 +750,13 @@ async function _extractTypes(options) {
 const rimraf = promisify(rimrafCallback);
 
 async function _doExtract(ctx, task) {
-  var _a;
+  var _a, _b;
 
   const {
     config,
     cwd,
     files,
+    strict,
     ts
   } = ctx;
 
@@ -767,6 +781,7 @@ async function _doExtract(ctx, task) {
   await _buildTypes({
     cwd,
     outDir: tmpPath,
+    strict,
     tsconfig: ts.config
   });
   const messages = [];
@@ -777,12 +792,13 @@ async function _doExtract(ctx, task) {
     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 result = await _extractTypes({
+      customTags: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.customTags,
       cwd,
       exportPath,
       files,
       filePath: path.relative(outDir, targetPath),
       projectPath: cwd,
-      rules: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.rules,
+      rules: (_b = config == null ? void 0 : config.extract) == null ? void 0 : _b.rules,
       sourceTypesPath,
       tsconfigPath: path.resolve(cwd, ts.configPath || "tsconfig.json"),
       distPath: outDir
@@ -869,9 +885,9 @@ const _dtsWatchTask = {
 };
 
 function _resolveRollupConfig(ctx, buildTask) {
-  var _ref2, _ref4, _ref5, _ref6, _ref7, _ref8;
+  var _ref2, _ref5, _ref6, _ref7, _ref8, _ref9;
 
-  var _a, _b;
+  var _a, _b, _c;
 
   const {
     format,
@@ -908,6 +924,66 @@ 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;
+    return [key, JSON.stringify(val)];
+  }));
+  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))
+  }), alias({
+    entries: _objectSpread({}, pathAliases)
+  }), nodeResolve({
+    browser: runtime === "browser",
+    extensions: [".cjs", ".mjs", ".js", ".jsx", ".json", ".node"],
+    preferBuiltins: true
+  }), commonjs({
+    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",
+    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
+    }]]
+  }), minify && terser({
+    output: {
+      comments: (_node, comment) => {
+        const text = comment.value;
+        const type = comment.type;
+
+        if (type == "comment2") {
+          return /@preserve|@license|@cc_on/i.test(text);
+        }
+
+        return false;
+      }
+    }
+  })].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);
   return {
     inputOptions: {
       context: cwd,
@@ -946,59 +1022,7 @@ function _resolveRollupConfig(ctx, buildTask) {
         }
       },
 
-      plugins: [replace({
-        preventAssignment: true,
-        values: _objectSpread({}, pkg.name === "@sanity/pkg-utils" ? {} : {
-          "process.env.PKG_FILE_PATH": arg => {
-            const sourcePath = "./" + path.relative(cwd, arg);
-            const entry = entries.find(e => e.source === sourcePath);
-
-            if (!entry) {
-              throw new Error("could not find source entry: ".concat(sourcePath));
-            }
-
-            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)
-        })
-      }), alias({
-        entries: _objectSpread({}, pathAliases)
-      }), nodeResolve({
-        browser: runtime === "browser",
-        extensions: [".cjs", ".mjs", ".js", ".jsx", ".json", ".node"],
-        preferBuiltins: true
-      }), commonjs({
-        esmExternals: false,
-        extensions: [".js"]
-      }), json(), esbuild({
-        jsx: (_ref4 = config == null ? void 0 : config.jsx) !== null && _ref4 !== void 0 ? _ref4 : "automatic",
-        jsxFactory: (_ref5 = config == null ? void 0 : config.jsxFactory) !== null && _ref5 !== void 0 ? _ref5 : "createElement",
-        jsxFragment: (_ref6 = config == null ? void 0 : config.jsxFragment) !== null && _ref6 !== void 0 ? _ref6 : "Fragment",
-        jsxImportSource: (_ref7 = config == null ? void 0 : config.jsxImportSource) !== null && _ref7 !== void 0 ? _ref7 : "react",
-        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
-        }]]
-      }), minify && terser({
-        output: {
-          comments: (_node, comment) => {
-            const text = comment.value;
-            const type = comment.type;
-
-            if (type == "comment2") {
-              return /@preserve|@license|@cc_on/i.test(text);
-            }
-
-            return false;
-          }
-        }
-      }), ...(((_b = config == null ? void 0 : config.rollup) == null ? void 0 : _b.plugins) || [])].filter(Boolean),
+      plugins,
       treeshake: {
         propertyReadSideEffects: false
       }
@@ -1009,7 +1033,7 @@ function _resolveRollupConfig(ctx, buildTask) {
       entryFileNames: () => outputExt === ".esm.js" ? "[name].js" : "[name]".concat(outputExt),
       format,
       exports: "auto",
-      sourcemap: (_ref8 = config == null ? void 0 : config.sourcemap) !== null && _ref8 !== void 0 ? _ref8 : true
+      sourcemap: (_ref9 = config == null ? void 0 : config.sourcemap) !== null && _ref9 !== void 0 ? _ref9 : true
     }
   };
 }
@@ -1298,12 +1322,13 @@ function _createLogger() {
 }
 
 async function _resolveBuildContext(options) {
-  var _ref9;
+  var _ref10;
 
   const {
     config,
     cwd,
     pkg,
+    strict,
     tsconfig: tsconfigPath
   } = options;
 
@@ -1391,7 +1416,8 @@ async function _resolveBuildContext(options) {
     files: [],
     logger,
     pkg,
-    runtime: (_ref9 = config == null ? void 0 : config.runtime) !== null && _ref9 !== void 0 ? _ref9 : "*",
+    runtime: (_ref10 = config == null ? void 0 : config.runtime) !== null && _ref10 !== void 0 ? _ref10 : "*",
+    strict,
     target,
     ts: {
       config: tsconfig,
@@ -1417,7 +1443,8 @@ function _spinner(msg) {
 async function build(options) {
   const {
     cwd,
-    tsconfig = "tsconfig.json"
+    strict = false,
+    tsconfig: tsconfigOption
   } = options;
   const pkg = await _loadPkgWithReporting({
     cwd
@@ -1425,10 +1452,12 @@ async function build(options) {
   const config = await _loadConfig({
     cwd
   });
+  const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
   const ctx = await _resolveBuildContext({
     config,
     cwd,
     pkg,
+    strict,
     tsconfig
   });
 
@@ -1511,11 +1540,11 @@ function _printPackageTree(ctx) {
     return "".concat(file, " ").concat(chalk.gray(info.size));
   }
 
-  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref10 => {
-    let [, entry] = _ref10;
+  tree.exports = Object.fromEntries(Object.entries(exports).filter(_ref11 => {
+    let [, entry] = _ref11;
     return entry._exported;
-  }).map(_ref11 => {
-    let [exportPath, entry] = _ref11;
+  }).map(_ref12 => {
+    let [exportPath, entry] = _ref12;
     const exp = {
       source: entry.source,
       types: void 0,
@@ -1573,8 +1602,8 @@ function _printPackageTree(ctx) {
 async function check(options) {
   const {
     cwd,
-    strict,
-    tsconfig = "tsconfig.json"
+    strict = false,
+    tsconfig: tsconfigOption
   } = options;
   const pkg = await _loadPkgWithReporting({
     cwd
@@ -1582,10 +1611,12 @@ async function check(options) {
   const config = await _loadConfig({
     cwd
   });
+  const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
   const ctx = await _resolveBuildContext({
     config,
     cwd,
     pkg,
+    strict,
     tsconfig
   });
   const {
@@ -1713,8 +1744,8 @@ function _resolveWatchTasks(ctx) {
     target
   } = ctx;
   const tasks = [];
-  const exports = Object.entries(ctx.exports || {}).map(_ref12 => {
-    let [_path, exp] = _ref12;
+  const exports = Object.entries(ctx.exports || {}).map(_ref13 => {
+    let [_path, exp] = _ref13;
     return _objectSpread({
       _path
     }, exp);
@@ -1876,7 +1907,8 @@ async function _watchConfigFiles(options) {
 async function watch(options) {
   const {
     cwd,
-    tsconfig = "tsconfig.json"
+    strict = false,
+    tsconfig: tsconfigOption
   } = options;
   const configFiles$ = await _watchConfigFiles({
     cwd
@@ -1896,10 +1928,12 @@ async function watch(options) {
     const config = await _loadConfig({
       cwd
     });
+    const tsconfig = tsconfigOption || (config == null ? void 0 : config.tsconfig) || "tsconfig.json";
     return _resolveBuildContext({
       config,
       cwd,
       pkg,
+      strict,
       tsconfig
     });
   }));
@@ -1927,5 +1961,5 @@ async function watch(options) {
   });
 }
 
-export { _DEFAULTS, _MODULE_EXT, _buildTaskHandlers, _dtsTask, _dtsWatchTask, _isRecord, _loadConfig, _loadPkg, _loadPkgWithReporting, _loadTSConfig, _parseExports, _resolveBuildTasks, _resolveConfigProperty, _rollupTask, _rollupWatchTask, _watchTaskHandlers, build, check, defineConfig, watch };
+export { _DEFAULTS, _MODULE_EXT, _buildTaskHandlers, _dtsTask, _dtsWatchTask, _getExtractMessagesConfig, _isRecord, _loadConfig, _loadPkg, _loadPkgWithReporting, _loadTSConfig, _parseExports, _resolveBuildTasks, _resolveConfigProperty, _rollupTask, _rollupWatchTask, _watchTaskHandlers, build, check, defineConfig, watch };
 //# sourceMappingURL=index.esm.js.map