jiek 2.0.2 → 2.1.1

package/dist/cli.js

@@ -1,7 +1,7 @@
 import * as childProcess from 'node:child_process';
 import fs from 'node:fs';
-import path, { isAbsolute, relative, resolve as resolve$1 } from 'node:path';
-import { bump, TAGS } from '@jiek/utils/bumper';
+import path, { isAbsolute, relative, resolve } from 'node:path';
+import { TAGS, bump } from '@jiek/utils/bumper';
 import { program } from 'commander';
 import detectIndent from 'detect-indent';
 import { applyEdits, modify } from 'jsonc-parser';
@@ -14,14 +14,6 @@ import require$$0 from 'util';
 import require$$0$1 from 'path';
 import 'jiek/cli-only-build';
 
-let resolve;
-function actionDone() {
-  resolve();
-}
-function actionRestore() {
-  new Promise((r) => resolve = r);
-}
-
 let root;
 function getRoot() {
   if (root)
@@ -4240,7 +4232,7 @@ function getOutDirs({
       js: "dts",
       dts: "js"
     }[type]] : outdir) ?? defaultOutdir;
-    return (isAbsolute(dir) ? dir : `./${relative(cwd, resolve$1(cwd, dir))}`).replace("{{PKG_NAME}}", pkgName);
+    return (isAbsolute(dir) ? dir : `./${relative(cwd, resolve(cwd, dir))}`).replace("{{PKG_NAME}}", pkgName);
   }
   return {
     js: resolveOutdir("js"),
@@ -4424,14 +4416,59 @@ Support with variables: 'PKG_NAME',
 .e.g. 'dist/{{PKG_NAME}}'.
 `.trim();
 
-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 description = `
+Publish package to npm registry, and auto generate exports field and other fields in published package.json.
+If you want to through the options to the \`pnpm publish\` command, you can pass the options after '--'.
+`.trim();
+async function forEachSelectedProjectsGraphEntries(callback) {
   const { value = {} } = await getSelectedProjectsGraph() ?? {};
   const selectedProjectsGraphEntries = Object.entries(value);
   if (selectedProjectsGraphEntries.length === 0) {
     throw new Error("no packages selected");
   }
-  const manifests = selectedProjectsGraphEntries.map(([dir, manifest]) => {
+  for (const [dir, manifest] of selectedProjectsGraphEntries) {
+    callback(dir, manifest);
+  }
+}
+program.command("publish").description(description).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").action(async ({ outdir, bumper }) => {
+  let shouldPassThrough = false;
+  const passThroughOptions = process.argv.reduce(
+    (acc, value) => {
+      if (shouldPassThrough) {
+        acc.push(value);
+      }
+      if (value === "--") {
+        shouldPassThrough = true;
+      }
+      return acc;
+    },
+    []
+  );
+  await forEachSelectedProjectsGraphEntries((dir) => {
+    const args = ["pnpm", "publish", "--access", "public", "--no-git-checks"];
+    if (bumper && TAGS.includes(bumper)) {
+      args.push("--tag", bumper);
+    }
+    args.push(...passThroughOptions);
+    childProcess.execSync(args.join(" "), {
+      cwd: dir,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
+        JIEK_PUBLISH_BUMPER: JSON.stringify(bumper)
+      }
+    });
+  });
+});
+async function prepublish() {
+  const {
+    JIEK_PUBLISH_OUTDIR: outdirEnv,
+    JIEK_PUBLISH_BUMPER: bumperEnv
+  } = process.env;
+  const outdir = outdirEnv ? JSON.parse(outdirEnv) : "dist";
+  const bumper = bumperEnv ? JSON.parse(bumperEnv) : false;
+  const generateNewManifest = (dir, manifest) => {
     const { name, type, exports: entrypoints = {} } = manifest;
     if (!name) {
       throw new Error(`package.json in ${dir} must have a name field`);
@@ -4452,35 +4489,38 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
       ...resolvedEntrypoints,
       ...exports
     };
-    return [dir, newManifest, resolvedOutdir];
-  });
-  const passArgs = Object.entries(options).reduce((acc, [key, value2]) => {
-    if (value2) {
-      acc.push(`--${key}`, value2);
-    }
-    return acc;
-  }, []);
-  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;
-    const { indent = "    " } = detectIndent(oldJSONString);
-    const formattingOptions = {
-      tabSize: indent.length,
-      insertSpaces: true
-    };
+    return [newManifest, resolvedOutdir];
+  };
+  const generateNewPackageJSONString = ({
+    oldJSONString,
+    oldJSON,
+    manifest,
+    formattingOptions
+  }) => {
     let newJSONString = oldJSONString;
     newJSONString = applyEdits(
       newJSONString,
       modify(
         newJSONString,
-        ["version"],
-        newVersion,
+        ["publishConfig", "typesVersions"],
+        {
+          "<5.0": {
+            "*": [
+              "*",
+              `./*`,
+              `./*/index.d.ts`,
+              `./*/index.d.mts`,
+              `./*/index.d.cts`
+            ]
+          }
+        },
         { formattingOptions }
       )
     );
-    for (const [key, value2] of Object.entries(manifest)) {
-      if (JSON.stringify(value2) === JSON.stringify(oldJSON[key]))
+    for (const [key, value] of Object.entries(manifest)) {
+      if (key === "version")
+        continue;
+      if (JSON.stringify(value) === JSON.stringify(oldJSON[key]))
         continue;
       if (key !== "exports") {
         newJSONString = applyEdits(
@@ -4488,12 +4528,12 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
           modify(
             newJSONString,
             ["publishConfig", key],
-            value2,
+            value,
             { formattingOptions }
           )
         );
       } else {
-        const exports = value2;
+        const exports = value;
         for (const [k, v] of Object.entries(exports)) {
           newJSONString = applyEdits(
             newJSONString,
@@ -4535,46 +4575,180 @@ 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`
-            ]
-          }
+    if (oldJSON["peerDependencies"]) {
+      const peerDependenciesMeta = Object.keys(oldJSON["peerDependencies"]).reduce(
+        (acc, key) => {
+          acc[key] = { optional: true };
+          return acc;
         },
-        { formattingOptions }
-      )
+        {}
+      );
+      newJSONString = applyEdits(
+        newJSONString,
+        modify(
+          newJSONString,
+          ["peerDependenciesMeta"],
+          peerDependenciesMeta,
+          { formattingOptions }
+        )
+      );
+    }
+    if (oldJSON["files"]) {
+      newJSONString = applyEdits(
+        newJSONString,
+        modify(
+          newJSONString,
+          ["files"],
+          void 0,
+          { formattingOptions }
+        )
+      );
+    }
+    return newJSONString;
+  };
+  await forEachSelectedProjectsGraphEntries((dir, originalManifest) => {
+    const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest);
+    const resolveByDir = (...paths) => path.resolve(dir, ...paths);
+    const oldJSONString = fs.readFileSync(resolveByDir("package.json"), "utf-8");
+    const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
+    if (typeof oldJSON.version !== "string") {
+      throw new Error(`${dir}/package.json must have a version field with a string value`);
+    }
+    const { indent = "    " } = detectIndent(oldJSONString);
+    const formattingOptions = {
+      tabSize: indent.length,
+      insertSpaces: true
+    };
+    const newVersion = bumper ? bump(oldJSON.version, bumper) : oldJSON.version;
+    const modifyVersionPackageJSON = applyEdits(
+      oldJSONString,
+      modify(oldJSONString, ["version"], newVersion, { 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) {
+    const newJSONString = generateNewPackageJSONString({
+      oldJSONString: modifyVersionPackageJSON,
+      oldJSON: {
+        ...oldJSON,
+        version: newVersion
+      },
+      manifest,
+      formattingOptions
+    });
+    const withPublishConfigDirectoryOldJSONString = applyEdits(
+      modifyVersionPackageJSON,
+      modify(modifyVersionPackageJSON, ["publishConfig", "directory"], resolvedOutdir, { formattingOptions })
+    );
+    if (!fs.existsSync(resolveByDir(resolvedOutdir))) {
+      fs.mkdirSync(resolveByDir(resolvedOutdir));
+    }
+    const jiekTempDir = resolveByDir("node_modules/.jiek/.tmp");
+    if (!fs.existsSync(resolveByDir(jiekTempDir))) {
+      fs.mkdirSync(resolveByDir(jiekTempDir), { recursive: true });
+    }
+    fs.writeFileSync(resolveByDir(resolvedOutdir, "package.json"), newJSONString);
+    fs.writeFileSync(resolveByDir(jiekTempDir, "package.json"), modifyVersionPackageJSON);
+    fs.writeFileSync(resolveByDir("package.json"), withPublishConfigDirectoryOldJSONString);
+    const allBuildFiles = fs.readdirSync(resolveByDir(resolvedOutdir), { recursive: true }).filter((file) => typeof file === "string").filter((file) => file !== "package.json");
+    for (const file of allBuildFiles) {
+      const filepath = resolveByDir(resolvedOutdir, file);
+      const stat = fs.statSync(filepath);
+      if (stat.isDirectory()) {
+        const existsIndexFile = allBuildFiles.some(
+          (f) => [
+            path.join(file, "index.js"),
+            path.join(file, "index.mjs"),
+            path.join(file, "index.cjs")
+          ].includes(f)
+        );
+        if (existsIndexFile) {
+          const cpDistPath = resolveByDir(resolvedOutdir, resolvedOutdir, file);
+          const pkgJSONPath = resolveByDir(resolvedOutdir, file, "package.json");
+          const relativePath = path.relative(filepath, cpDistPath);
+          const { type } = manifest;
+          fs.writeFileSync(
+            pkgJSONPath,
+            JSON.stringify({
+              type,
+              main: [relativePath, `index.${type === "module" ? "c" : ""}js`].join("/"),
+              module: [relativePath, `index.${type === "module" ? "" : "m"}js`].join("/")
+            })
+          );
+        }
+      }
+    }
+    fs.mkdirSync(resolveByDir(resolvedOutdir, resolvedOutdir));
+    for (const file of allBuildFiles) {
+      const filepath = resolveByDir(resolvedOutdir, file);
+      const newFilepath = resolveByDir(resolvedOutdir, resolvedOutdir, file);
+      const stat = fs.statSync(filepath);
+      if (stat.isDirectory()) {
+        fs.mkdirSync(newFilepath, { recursive: true });
         continue;
       }
-      const args = ["pnpm", "publish", "--access", "public", "--no-git-checks", ...passArgs];
-      if (bumper && TAGS.includes(bumper)) {
-        args.push("--tag", bumper);
+      if (stat.isFile()) {
+        fs.cpSync(filepath, newFilepath);
+        fs.rmSync(filepath);
+      }
+    }
+    if (oldJSON.files) {
+      if (!Array.isArray(oldJSON.files)) {
+        throw new Error(`${dir}/package.json files field must be an array`);
+      }
+      if (Array.isArray(oldJSON.files) && oldJSON.files.every((file) => typeof file !== "string")) {
+        throw new Error(`${dir}/package.json files field must be an array of string`);
       }
-      childProcess.execSync(args.join(" "), {
-        cwd: dir,
-        stdio: "inherit"
-      });
-      const modifyVersionPackageJSON = applyEdits(oldJSONString, modify(oldJSONString, ["version"], newVersion, {}));
-      fs.writeFileSync(path.join(dir, "package.json.bak"), modifyVersionPackageJSON);
-    } finally {
-      fs.unlinkSync(path.join(dir, "package.json"));
-      fs.renameSync(path.join(dir, "package.json.bak"), path.join(dir, "package.json"));
     }
+    const resolvedOutdirAbs = resolveByDir(resolvedOutdir);
+    const files = (oldJSON.files ?? fs.readdirSync(resolveByDir("."))).filter((file) => file === "node_modules" || resolveByDir(file) !== resolvedOutdirAbs);
+    for (const file of files) {
+      const path2 = resolveByDir(file);
+      try {
+        const stat = fs.statSync(path2);
+        if (stat.isDirectory()) {
+          fs.cpSync(path2, resolveByDir(resolvedOutdir, file), { recursive: true });
+          continue;
+        }
+        if (stat.isFile()) {
+          fs.cpSync(path2, resolveByDir(resolvedOutdir, file));
+          continue;
+        }
+      } catch (e) {
+        console.warn(String(e));
+        continue;
+      }
+      throw new Error(`file type of ${path2} is not supported`);
+    }
+  });
+}
+async function postpublish() {
+  await forEachSelectedProjectsGraphEntries((dir) => {
+    const jiekTempDir = path.resolve(dir, "node_modules/.jiek/.tmp");
+    const packageJSON = path.resolve(dir, "package.json");
+    const jiekTempPackageJSON = path.resolve(jiekTempDir, "package.json");
+    if (fs.existsSync(jiekTempPackageJSON)) {
+      fs.copyFileSync(jiekTempPackageJSON, packageJSON);
+      fs.rmSync(jiekTempPackageJSON);
+      console.log(`${dir}/package.json has been restored`);
+    } else {
+      throw new Error(
+        `jiek temp \`${dir}/package.json\` not found, please confirm the jiek pre-publish command has been executed`
+      );
+    }
+  });
+}
+program.action(async () => {
+  const {
+    npm_lifecycle_event: NPM_LIFECYCLE_EVENT
+  } = process.env;
+  switch (NPM_LIFECYCLE_EVENT) {
+    case "prepublish":
+      await prepublish();
+      break;
+    case "postpublish":
+      await postpublish();
+      break;
+    default:
+      program.help();
   }
-  actionDone();
 });
+program.command("prepublish").action(prepublish);
+program.command("postpublish").action(postpublish);

package/dist/rollup/index.cjs

@@ -4503,7 +4503,7 @@ const {
   JIEK_WITHOUT_DTS,
   JIEK_WITHOUT_MINIFY,
   JIEK_MINIFY_TYPE,
-  JIEK_NO_CLEAN,
+  JIEK_CLEAN,
   JIEK_ONLY_MINIFY,
   JIEK_TSCONFIG,
   JIEK_DTSCONFIG
@@ -4527,7 +4527,7 @@ const WITHOUT_JS = JIEK_WITHOUT_JS === "true";
 const WITHOUT_DTS = JIEK_WITHOUT_DTS === "true";
 const WITHOUT_MINIFY = JIEK_WITHOUT_MINIFY === "true";
 const ONLY_MINIFY = JIEK_ONLY_MINIFY === "true";
-const CLEAN = JIEK_NO_CLEAN !== "true";
+const CLEAN = JIEK_CLEAN === "true";
 const MINIFY_DEFAULT_VALUE = WITHOUT_MINIFY ? false : ONLY_MINIFY ? "only-minify" : true;
 const BUILDER_OPTIONS = {
   type: JIEK_BUILDER ?? "esbuild"

package/dist/rollup/index.js

@@ -4490,7 +4490,7 @@ const {
   JIEK_WITHOUT_DTS,
   JIEK_WITHOUT_MINIFY,
   JIEK_MINIFY_TYPE,
-  JIEK_NO_CLEAN,
+  JIEK_CLEAN,
   JIEK_ONLY_MINIFY,
   JIEK_TSCONFIG,
   JIEK_DTSCONFIG
@@ -4514,7 +4514,7 @@ const WITHOUT_JS = JIEK_WITHOUT_JS === "true";
 const WITHOUT_DTS = JIEK_WITHOUT_DTS === "true";
 const WITHOUT_MINIFY = JIEK_WITHOUT_MINIFY === "true";
 const ONLY_MINIFY = JIEK_ONLY_MINIFY === "true";
-const CLEAN = JIEK_NO_CLEAN !== "true";
+const CLEAN = JIEK_CLEAN === "true";
 const MINIFY_DEFAULT_VALUE = WITHOUT_MINIFY ? false : ONLY_MINIFY ? "only-minify" : true;
 const BUILDER_OPTIONS = {
   type: JIEK_BUILDER ?? "esbuild"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "A lightweight toolkit for compiling and managing libraries based on `package.json` metadata and suitable for `Monorepo`.",
   "author": "YiJie <yijie4188@gmail.com>",
   "repository": {
@@ -16,13 +16,6 @@
     "jiek-build": "bin/jiek-build.js",
     "jb": "bin/jiek-build.js"
   },
-  "files": [
-    "dist",
-    "src",
-    "bin",
-    "LICENSE",
-    "README.md"
-  ],
   "exports": {
     "./package.json": "./package.json",
     ".": {
@@ -75,6 +68,23 @@
     "rollup-plugin-swc3": "^0.12.1",
     "typescript": "^4.0.0||^5.0.0"
   },
+  "devDependencies": {
+    "@npm/types": "^1.0.2",
+    "@pnpm/filter-workspace-packages": "^7.2.13",
+    "@pnpm/workspace.pkgs-graph": "^2.0.15",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/cli-progress": "^3.11.5",
+    "@types/inquirer": "^9.0.7",
+    "@types/js-yaml": "^4.0.9",
+    "@types/micromatch": "^4.0.6",
+    "esbuild-register": "^3.5.0",
+    "micromatch": "^4.0.5",
+    "node-sass": "^9.0.0",
+    "postcss": "^8.4.47",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-esbuild": "^6.1.0",
+    "rollup-plugin-swc3": "^0.12.1"
+  },
   "peerDependenciesMeta": {
     "@rollup/plugin-terser": {
       "optional": true
@@ -101,37 +111,20 @@
       "optional": true
     }
   },
-  "devDependencies": {
-    "@npm/types": "^1.0.2",
-    "@pnpm/filter-workspace-packages": "^7.2.13",
-    "@pnpm/workspace.pkgs-graph": "^2.0.15",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@types/cli-progress": "^3.11.5",
-    "@types/inquirer": "^9.0.7",
-    "@types/js-yaml": "^4.0.9",
-    "@types/micromatch": "^4.0.6",
-    "esbuild-register": "^3.5.0",
-    "micromatch": "^4.0.5",
-    "node-sass": "^9.0.0",
-    "postcss": "^8.4.47",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-esbuild": "^6.1.0",
-    "rollup-plugin-swc3": "^0.12.1"
-  },
   "scripts": {
-    "prepublish": "jb --noMin"
+    "prepublish": "jb -nm && jk"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
   "typesVersions": {
     "<5.0": {
       "*": [
         "*",
-        "./dist/*",
-        "./dist/*/index.d.ts",
-        "./dist/*/index.d.mts",
-        "./dist/*/index.d.cts"
+        "./*",
+        "./*/index.d.ts",
+        "./*/index.d.mts",
+        "./*/index.d.cts"
       ]
     }
-  }
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js"
 }

package/rollup/package.json

@@ -0,0 +1 @@
+{"type":"module","main":"../dist/rollup/index.cjs","module":"../dist/rollup/index.js"}

package/src/commands/build.ts

@@ -41,7 +41,7 @@ const isDefault = process.env.JIEK_IS_ONLY_BUILD === 'true'
 
 const description = `
 Build the package according to the 'exports' field from the package.json.
-If you want to rewrite the \`rollup\` command options, you can pass the options after '--'.
+If you want to through the options to the \`rollup\` command, you can pass the options after '--'.
 ${isDefault ? 'This command is the default command.' : ''}
 `.trim()
 
@@ -139,24 +139,19 @@ If you pass the --entries option, it will merge into the entries of the command.
 `.trim()
 
 const command = isDefault
-  ? program
-    .name('jb/jiek-build')
-    .helpCommand(false)
+  ? (() => {
+    const c = program
+      .name('jb/jiek-build')
+      .helpCommand(false)
+    if (IS_WORKSPACE) {
+      c.argument('[filters]', buildFilterDescription)
+    } else {
+      c.argument('[entries]', buildEntriesDescription)
+    }
+    return c
+  })()
   : program
-
-if (IS_WORKSPACE) {
-  if (isDefault) {
-    command.argument('[filters]', buildFilterDescription)
-  } else {
-    command.command('build [filters]')
-  }
-} else {
-  if (isDefault) {
-    command.argument('[entries]', buildEntriesDescription)
-  } else {
-    command.command('build [entries]')
-  }
-}
+    .command(`build [${IS_WORKSPACE ? 'filters' : 'entries'}]`)
 
 command
   .description(description)