jiek 1.1.8 → 1.1.9

package/dist/cli.cjs

@@ -149,7 +149,7 @@ async function getSelectedProjectsGraph(filter = commander.program.getOptionValu
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.8";
+var version = "1.1.9";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -162,17 +162,8 @@ var files = [
 	"LICENSE",
 	"README.md"
 ];
-var typesVersions = {
-	"<5.0": {
-		"*": [
-			"*",
-			"./dist/*",
-			"./dist/*/index.d.ts"
-		]
-	}
-};
 var scripts = {
-	prepublish: "jk build"
+	prepublish: "jk build --noMin"
 };
 var exports$1 = {
 	"./package.json": "./package.json",
@@ -243,7 +234,18 @@ var publishConfig = {
 		}
 	},
 	main: "./dist/index.cjs",
-	module: "./dist/index.js"
+	module: "./dist/index.js",
+	typesVersions: {
+		"<5.0": {
+			"*": [
+				"*",
+				"./dist/*",
+				"./dist/*/index.d.ts",
+				"./dist/*/index.d.mts",
+				"./dist/*/index.d.cts"
+			]
+		}
+	}
 };
 var pkg = {
 	name: name,
@@ -252,7 +254,6 @@ var pkg = {
 	description: description$1,
 	bin: bin,
 	files: files,
-	typesVersions: typesVersions,
 	scripts: scripts,
 	exports: exports$1,
 	imports: imports,
@@ -378,6 +379,12 @@ function loadConfig(dirOrOptions) {
   return module.default ?? module;
 }
 
+const outdirDescription = `
+The output directory of the build, which relative to the target subpackage root directory.
+Support with variables: 'PKG_NAME',
+.e.g. 'dist/{{PKG_NAME}}'.
+`.trim();
+
 const FILE_TEMPLATE = (manifest) => `
 module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null, 2)})
 `.trimStart();
@@ -385,16 +392,45 @@ const require$1 = node_module.createRequire((typeof document === 'undefined' ? r
 const description = `
 Build the package according to the 'exports' field in the package.json.
 `.trim();
-commander.program.command("build").description(description).option("-s, --silent", "Don't display logs.").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").option("--without-js", "Do not output js files.").option("--without-dts", "Do not output dts files.").option("-v, --verbose", "Display debug logs.").action(async ({
+function parseBoolean(v) {
+  if (v === void 0)
+    return true;
+  return Boolean(v);
+}
+commander.program.command("build").description(description).option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").option("-nj, --noJs", "Do not output js files.", parseBoolean).option("-nd, --noDts", "Do not output dts files.", parseBoolean).option("-nm, --noMin", "Do not output minify files.", parseBoolean).option("-nc, --noClean", "Do not clean the output directory before building.", parseBoolean).option(
+  "-om, --onlyMin",
+  "Only output minify files, but dts files will still be output, it only replaces the js files.",
+  parseBoolean
+).option("-s, --silent", "Don't display logs.", parseBoolean).option("-v, --verbose", "Display debug logs.", parseBoolean).action(async ({
+  outdir,
   silent,
   entries,
   verbose,
-  withoutJs,
-  withoutDts
+  noJs: withoutJs,
+  noDts: withoutDts,
+  noMin: withoutMin,
+  noClean,
+  onlyMin
 }) => {
   actionRestore();
   const { build } = loadConfig();
   silent = silent ?? build?.silent ?? false;
+  if (withoutMin && onlyMin) {
+    throw new Error("Cannot use both --without-minify and --only-minify");
+  }
+  if (onlyMin && withoutJs) {
+    throw new Error("Cannot use --without-js and --only-minify at the same time");
+  }
+  const env = {
+    ...process.env,
+    JIEK_OUT_DIR: outdir,
+    JIEK_CLEAN: String(!noClean),
+    JIEK_ENTRIES: entries,
+    JIEK_WITHOUT_JS: String(withoutJs),
+    JIEK_WITHOUT_DTS: String(withoutDts),
+    JIEK_WITHOUT_MINIFY: String(withoutMin),
+    JIEK_ONLY_MINIFY: String(onlyMin)
+  };
   const multiBars = new cliProgress.MultiBar({
     clearOnComplete: false,
     hideCursor: true,
@@ -419,7 +455,10 @@ commander.program.command("build").description(description).option("-s, --silent
     let i = 0;
     await Promise.all(
       Object.entries(value).map(async ([dir, manifest]) => {
-        const escapeManifestName = manifest.name?.replace(/^@/g, "").replace(/\//g, "+");
+        if (!manifest.name) {
+          throw new Error("package.json must have a name field");
+        }
+        const escapeManifestName = manifest.name.replace(/^@/g, "").replace(/\//g, "+");
         const configFile = jiekTempDir(
           `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
         );
@@ -433,11 +472,9 @@ commander.program.command("build").description(description).option("-s, --silent
           ipc: true,
           cwd: dir,
           env: {
-            ...process.env,
-            JIEK_ROOT: wd,
-            JIEK_ENTRIES: entries,
-            JIEK_WITHOUT_JS: String(withoutJs),
-            JIEK_WITHOUT_DTS: String(withoutDts)
+            ...env,
+            JIEK_NAME: manifest.name,
+            JIEK_ROOT: wd
           }
         });
         const bars = {};
@@ -4908,17 +4945,43 @@ commander.program.command("init [name]").option("-t, --template <template>", "th
 });
 
 const intersection = (a, b) => new Set([...a].filter((i) => b.has(i)));
+const {
+  JIEK_OUT_DIR
+} = process.env;
+const OUTDIR = JIEK_OUT_DIR ?? "dist";
+function getOutDirs({
+  cwd = process.cwd(),
+  defaultOutdir = OUTDIR,
+  config,
+  pkgName
+}) {
+  const { build = {} } = config ?? {};
+  const outdir = build?.output?.dir;
+  function resolveOutdir(type) {
+    const dir = (typeof outdir === "object" ? outdir[type] ?? outdir[{
+      js: "dts",
+      dts: "js"
+    }[type]] : outdir) ?? defaultOutdir;
+    return (path.isAbsolute(dir) ? dir : `./${path.relative(cwd, path.resolve(cwd, dir))}`).replace("{{PKG_NAME}}", pkgName);
+  }
+  return {
+    js: resolveOutdir("js"),
+    dts: resolveOutdir("dts")
+  };
+}
 function getExports({
   entrypoints: entrypoints$1,
+  pkgName,
   pkgIsModule,
   entries,
   config,
   dir,
+  defaultOutdir = OUTDIR,
+  // FIXME dts support
+  outdir = getOutDirs({ pkgName, defaultOutdir, config, cwd: dir }).js,
   noFilter,
   isPublish
 }) {
-  const dirResolve = (...paths) => path.resolve(dir ?? process.cwd(), ...paths);
-  const dirRelative = (path$1) => path.relative(dir ?? process.cwd(), path$1);
   const {
     build = {},
     publish: {
@@ -4929,9 +4992,6 @@ function getExports({
   const {
     crossModuleConvertor = true
   } = build;
-  const jsOutdir = `./${dirRelative(dirResolve(
-    (typeof build?.output?.dir === "object" ? build.output.dir.js : build?.output?.dir) ?? "dist"
-  ))}`;
   const [, resolvedEntrypoints] = entrypoints.resolveEntrypoints(entrypoints$1);
   if (entries) {
     Object.entries(resolvedEntrypoints).forEach(([key]) => {
@@ -4963,17 +5023,18 @@ function getExports({
   return [
     filteredResolvedEntrypoints,
     entrypoints.entrypoints2Exports(filteredResolvedEntrypoints, {
-      outdir: jsOutdir,
+      outdir,
       withSuffix: isPublish ? withSuffix : void 0,
       withSource: isPublish ? withSource : void 0,
       withConditional: {
         ...crossModuleWithConditional
       }
-    })
+    }),
+    outdir
   ];
 }
 
-commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-s, --silent", "no output").option("-p, --preview", "preview publish").action(async ({ preview, silent, bumper: bumper$1, ...options }) => {
+commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").option("-s, --silent", "no output").option("-p, --preview", "preview publish").action(async ({ outdir, preview, silent, bumper: bumper$1, ...options }) => {
   actionRestore();
   const { value = {} } = await getSelectedProjectsGraph() ?? {};
   const selectedProjectsGraphEntries = Object.entries(value);
@@ -4981,14 +5042,19 @@ commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper
     throw new Error("no packages selected");
   }
   const manifests = selectedProjectsGraphEntries.map(([dir, manifest]) => {
-    const { type, exports: entrypoints = {} } = manifest;
+    const { name, type, exports: entrypoints = {} } = manifest;
+    if (!name) {
+      throw new Error(`package.json in ${dir} must have a name field`);
+    }
     const pkgIsModule = type === "module";
     const newManifest = { ...manifest };
-    const [resolvedEntrypoints, exports] = getExports({
+    const [resolvedEntrypoints, exports, resolvedOutdir] = getExports({
       entrypoints,
       pkgIsModule,
+      pkgName: name,
       config: loadConfig(dir),
       dir,
+      defaultOutdir: outdir,
       noFilter: true,
       isPublish: true
     });
@@ -4996,7 +5062,7 @@ commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper
       ...resolvedEntrypoints,
       ...exports
     };
-    return [dir, newManifest];
+    return [dir, newManifest, resolvedOutdir];
   });
   const passArgs = Object.entries(options).reduce((acc, [key, value2]) => {
     if (value2) {
@@ -5004,7 +5070,7 @@ commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper
     }
     return acc;
   }, []);
-  for (const [dir, manifest] of manifests) {
+  for (const [dir, manifest, resolvedOutdir] of manifests) {
     const oldJSONString = fs__default.default.readFileSync(path__default.default.join(dir, "package.json"), "utf-8");
     const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
     const newVersion = bumper$1 ? bumper.bump(oldJSON.version, bumper$1) : oldJSON.version;
@@ -5079,12 +5145,30 @@ commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper
         }
       }
     }
+    newJSONString = jsoncParser.applyEdits(
+      newJSONString,
+      jsoncParser.modify(
+        newJSONString,
+        ["publishConfig", "typesVersions"],
+        {
+          "<5.0": {
+            "*": [
+              "*",
+              `${resolvedOutdir}/*`,
+              `${resolvedOutdir}/*/index.d.ts`,
+              `${resolvedOutdir}/*/index.d.mts`,
+              `${resolvedOutdir}/*/index.d.cts`
+            ]
+          }
+        },
+        { formattingOptions }
+      )
+    );
     try {
       fs__default.default.renameSync(path__default.default.join(dir, "package.json"), path__default.default.join(dir, "package.json.bak"));
       fs__default.default.writeFileSync(path__default.default.join(dir, "package.json"), newJSONString);
       !silent && console.log(newJSONString);
       if (preview) {
-        !silent && console.warn("preview mode");
         continue;
       }
       const args = ["pnpm", "publish", "--access", "public", "--no-git-checks", ...passArgs];

package/dist/cli.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import { createRequire } from 'node:module';
-import path, { resolve as resolve$1, relative } from 'node:path';
+import path, { isAbsolute, relative, resolve as resolve$1 } from 'node:path';
 import { filterPackagesFromDir } from '@pnpm/filter-workspace-packages';
 import { program } from 'commander';
 import { load } from 'js-yaml';
@@ -118,7 +118,7 @@ async function getSelectedProjectsGraph(filter = program.getOptionValue("filter"
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.8";
+var version = "1.1.9";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -131,17 +131,8 @@ var files = [
 	"LICENSE",
 	"README.md"
 ];
-var typesVersions = {
-	"<5.0": {
-		"*": [
-			"*",
-			"./dist/*",
-			"./dist/*/index.d.ts"
-		]
-	}
-};
 var scripts = {
-	prepublish: "jk build"
+	prepublish: "jk build --noMin"
 };
 var exports = {
 	"./package.json": "./package.json",
@@ -212,7 +203,18 @@ var publishConfig = {
 		}
 	},
 	main: "./dist/index.cjs",
-	module: "./dist/index.js"
+	module: "./dist/index.js",
+	typesVersions: {
+		"<5.0": {
+			"*": [
+				"*",
+				"./dist/*",
+				"./dist/*/index.d.ts",
+				"./dist/*/index.d.mts",
+				"./dist/*/index.d.cts"
+			]
+		}
+	}
 };
 var pkg = {
 	name: name,
@@ -221,7 +223,6 @@ var pkg = {
 	description: description$1,
 	bin: bin,
 	files: files,
-	typesVersions: typesVersions,
 	scripts: scripts,
 	exports: exports,
 	imports: imports,
@@ -347,6 +348,12 @@ function loadConfig(dirOrOptions) {
   return module.default ?? module;
 }
 
+const outdirDescription = `
+The output directory of the build, which relative to the target subpackage root directory.
+Support with variables: 'PKG_NAME',
+.e.g. 'dist/{{PKG_NAME}}'.
+`.trim();
+
 const FILE_TEMPLATE = (manifest) => `
 module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null, 2)})
 `.trimStart();
@@ -354,16 +361,45 @@ const require = createRequire(import.meta.url);
 const description = `
 Build the package according to the 'exports' field in the package.json.
 `.trim();
-program.command("build").description(description).option("-s, --silent", "Don't display logs.").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").option("--without-js", "Do not output js files.").option("--without-dts", "Do not output dts files.").option("-v, --verbose", "Display debug logs.").action(async ({
+function parseBoolean(v) {
+  if (v === void 0)
+    return true;
+  return Boolean(v);
+}
+program.command("build").description(description).option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").option("-nj, --noJs", "Do not output js files.", parseBoolean).option("-nd, --noDts", "Do not output dts files.", parseBoolean).option("-nm, --noMin", "Do not output minify files.", parseBoolean).option("-nc, --noClean", "Do not clean the output directory before building.", parseBoolean).option(
+  "-om, --onlyMin",
+  "Only output minify files, but dts files will still be output, it only replaces the js files.",
+  parseBoolean
+).option("-s, --silent", "Don't display logs.", parseBoolean).option("-v, --verbose", "Display debug logs.", parseBoolean).action(async ({
+  outdir,
   silent,
   entries,
   verbose,
-  withoutJs,
-  withoutDts
+  noJs: withoutJs,
+  noDts: withoutDts,
+  noMin: withoutMin,
+  noClean,
+  onlyMin
 }) => {
   actionRestore();
   const { build } = loadConfig();
   silent = silent ?? build?.silent ?? false;
+  if (withoutMin && onlyMin) {
+    throw new Error("Cannot use both --without-minify and --only-minify");
+  }
+  if (onlyMin && withoutJs) {
+    throw new Error("Cannot use --without-js and --only-minify at the same time");
+  }
+  const env = {
+    ...process.env,
+    JIEK_OUT_DIR: outdir,
+    JIEK_CLEAN: String(!noClean),
+    JIEK_ENTRIES: entries,
+    JIEK_WITHOUT_JS: String(withoutJs),
+    JIEK_WITHOUT_DTS: String(withoutDts),
+    JIEK_WITHOUT_MINIFY: String(withoutMin),
+    JIEK_ONLY_MINIFY: String(onlyMin)
+  };
   const multiBars = new MultiBar({
     clearOnComplete: false,
     hideCursor: true,
@@ -388,7 +424,10 @@ program.command("build").description(description).option("-s, --silent", "Don't
     let i = 0;
     await Promise.all(
       Object.entries(value).map(async ([dir, manifest]) => {
-        const escapeManifestName = manifest.name?.replace(/^@/g, "").replace(/\//g, "+");
+        if (!manifest.name) {
+          throw new Error("package.json must have a name field");
+        }
+        const escapeManifestName = manifest.name.replace(/^@/g, "").replace(/\//g, "+");
         const configFile = jiekTempDir(
           `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
         );
@@ -402,11 +441,9 @@ program.command("build").description(description).option("-s, --silent", "Don't
           ipc: true,
           cwd: dir,
           env: {
-            ...process.env,
-            JIEK_ROOT: wd,
-            JIEK_ENTRIES: entries,
-            JIEK_WITHOUT_JS: String(withoutJs),
-            JIEK_WITHOUT_DTS: String(withoutDts)
+            ...env,
+            JIEK_NAME: manifest.name,
+            JIEK_ROOT: wd
           }
         });
         const bars = {};
@@ -4877,17 +4914,43 @@ program.command("init [name]").option("-t, --template <template>", "the package.
 });
 
 const intersection = (a, b) => new Set([...a].filter((i) => b.has(i)));
+const {
+  JIEK_OUT_DIR
+} = process.env;
+const OUTDIR = JIEK_OUT_DIR ?? "dist";
+function getOutDirs({
+  cwd = process.cwd(),
+  defaultOutdir = OUTDIR,
+  config,
+  pkgName
+}) {
+  const { build = {} } = config ?? {};
+  const outdir = build?.output?.dir;
+  function resolveOutdir(type) {
+    const dir = (typeof outdir === "object" ? outdir[type] ?? outdir[{
+      js: "dts",
+      dts: "js"
+    }[type]] : outdir) ?? defaultOutdir;
+    return (isAbsolute(dir) ? dir : `./${relative(cwd, resolve$1(cwd, dir))}`).replace("{{PKG_NAME}}", pkgName);
+  }
+  return {
+    js: resolveOutdir("js"),
+    dts: resolveOutdir("dts")
+  };
+}
 function getExports({
   entrypoints,
+  pkgName,
   pkgIsModule,
   entries,
   config,
   dir,
+  defaultOutdir = OUTDIR,
+  // FIXME dts support
+  outdir = getOutDirs({ pkgName, defaultOutdir, config, cwd: dir }).js,
   noFilter,
   isPublish
 }) {
-  const dirResolve = (...paths) => resolve$1(dir ?? process.cwd(), ...paths);
-  const dirRelative = (path) => relative(dir ?? process.cwd(), path);
   const {
     build = {},
     publish: {
@@ -4898,9 +4961,6 @@ function getExports({
   const {
     crossModuleConvertor = true
   } = build;
-  const jsOutdir = `./${dirRelative(dirResolve(
-    (typeof build?.output?.dir === "object" ? build.output.dir.js : build?.output?.dir) ?? "dist"
-  ))}`;
   const [, resolvedEntrypoints] = resolveEntrypoints(entrypoints);
   if (entries) {
     Object.entries(resolvedEntrypoints).forEach(([key]) => {
@@ -4932,17 +4992,18 @@ function getExports({
   return [
     filteredResolvedEntrypoints,
     entrypoints2Exports(filteredResolvedEntrypoints, {
-      outdir: jsOutdir,
+      outdir,
       withSuffix: isPublish ? withSuffix : void 0,
       withSource: isPublish ? withSource : void 0,
       withConditional: {
         ...crossModuleWithConditional
       }
-    })
+    }),
+    outdir
   ];
 }
 
-program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-s, --silent", "no output").option("-p, --preview", "preview publish").action(async ({ preview, silent, bumper, ...options }) => {
+program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").option("-s, --silent", "no output").option("-p, --preview", "preview publish").action(async ({ outdir, preview, silent, bumper, ...options }) => {
   actionRestore();
   const { value = {} } = await getSelectedProjectsGraph() ?? {};
   const selectedProjectsGraphEntries = Object.entries(value);
@@ -4950,14 +5011,19 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
     throw new Error("no packages selected");
   }
   const manifests = selectedProjectsGraphEntries.map(([dir, manifest]) => {
-    const { type, exports: entrypoints = {} } = manifest;
+    const { name, type, exports: entrypoints = {} } = manifest;
+    if (!name) {
+      throw new Error(`package.json in ${dir} must have a name field`);
+    }
     const pkgIsModule = type === "module";
     const newManifest = { ...manifest };
-    const [resolvedEntrypoints, exports] = getExports({
+    const [resolvedEntrypoints, exports, resolvedOutdir] = getExports({
       entrypoints,
       pkgIsModule,
+      pkgName: name,
       config: loadConfig(dir),
       dir,
+      defaultOutdir: outdir,
       noFilter: true,
       isPublish: true
     });
@@ -4965,7 +5031,7 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
       ...resolvedEntrypoints,
       ...exports
     };
-    return [dir, newManifest];
+    return [dir, newManifest, resolvedOutdir];
   });
   const passArgs = Object.entries(options).reduce((acc, [key, value2]) => {
     if (value2) {
@@ -4973,7 +5039,7 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
     }
     return acc;
   }, []);
-  for (const [dir, manifest] of manifests) {
+  for (const [dir, manifest, resolvedOutdir] of manifests) {
     const oldJSONString = fs.readFileSync(path.join(dir, "package.json"), "utf-8");
     const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
     const newVersion = bumper ? bump(oldJSON.version, bumper) : oldJSON.version;
@@ -5048,12 +5114,30 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
         }
       }
     }
+    newJSONString = applyEdits(
+      newJSONString,
+      modify(
+        newJSONString,
+        ["publishConfig", "typesVersions"],
+        {
+          "<5.0": {
+            "*": [
+              "*",
+              `${resolvedOutdir}/*`,
+              `${resolvedOutdir}/*/index.d.ts`,
+              `${resolvedOutdir}/*/index.d.mts`,
+              `${resolvedOutdir}/*/index.d.cts`
+            ]
+          }
+        },
+        { formattingOptions }
+      )
+    );
     try {
       fs.renameSync(path.join(dir, "package.json"), path.join(dir, "package.json.bak"));
       fs.writeFileSync(path.join(dir, "package.json"), newJSONString);
       !silent && console.log(newJSONString);
       if (preview) {
-        !silent && console.warn("preview mode");
         continue;
       }
       const args = ["pnpm", "publish", "--access", "public", "--no-git-checks", ...passArgs];