jiek 2.2.1 → 2.2.3

package/dist/cli-only-build.cjs

@@ -7,9 +7,9 @@ var commander = require('commander');
 var jsYaml = require('js-yaml');
 var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 var process$1 = require('node:process');
-var prompts = require('@inquirer/prompts');
 var cliProgress = require('cli-progress');
 var execa = require('execa');
+var prompts = require('@inquirer/prompts');
 var Koa = require('koa');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -22,8 +22,7 @@ var Koa__default = /*#__PURE__*/_interopDefault(Koa);
 
 let root;
 function getRoot() {
-  if (root)
-    return root;
+  if (root) return root;
   const rootOption = process.env.JIEK_ROOT;
   root = rootOption ? path__default.default.isAbsolute(rootOption) ? rootOption : path__default.default.resolve(process.cwd(), rootOption) : void 0;
   return root;
@@ -32,8 +31,7 @@ function getRoot() {
 let wd;
 let notWorkspace$1 = false;
 function getWD() {
-  if (wd)
-    return { wd, notWorkspace: notWorkspace$1 };
+  if (wd) return { wd, notWorkspace: notWorkspace$1 };
   const root = getRoot();
   if (root !== void 0) {
     const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, type$1);
@@ -120,7 +118,7 @@ async function getSelectedProjectsGraph(filter = commander.program.getOptionValu
 
 var name = "jiek";
 var type = "module";
-var version = "2.2.0";
+var version = "2.2.2";
 var description$1 = "A lightweight toolkit for compiling and managing libraries based on `package.json` metadata and suitable for `Monorepo`.";
 var author = "YiJie <yijie4188@gmail.com>";
 var homepage = "https://github.com/NWYLZW/jiek/tree/master/packages/jiek#readme";
@@ -151,7 +149,11 @@ var exports$1 = {
 	"./rollup": "./src/rollup/index.ts"
 };
 var imports = {
-	"#~/*": "./src/*"
+	"#~/*": [
+		"./src/*",
+		"./src/*/index.ts",
+		"./src/*/index.tsx"
+	]
 };
 var bin = {
 	jiek: "bin/jiek.js",
@@ -182,7 +184,7 @@ var peerDependencies = {
 	"rollup-plugin-postcss": "^4.0.2",
 	"rollup-plugin-swc3": "^0.12.1",
 	typescript: "^4.0.0||^5.0.0",
-	"vite-bundle-analyzer": "^0.15.2"
+	"vite-bundle-analyzer": "0.16.0-beta.1"
 };
 var dependencies = {
 	"@inquirer/prompts": "^7.1.0",
@@ -213,6 +215,7 @@ var devDependencies = {
 	"@types/js-yaml": "^4.0.9",
 	"@types/koa": "^2.15.0",
 	"@types/micromatch": "^4.0.6",
+	"@types/react": "^18.3.14",
 	"esbuild-register": "^3.5.0",
 	micromatch: "^4.0.5",
 	"node-sass": "^9.0.0",
@@ -220,7 +223,7 @@ var devDependencies = {
 	"rollup-plugin-esbuild": "^6.1.0",
 	"rollup-plugin-postcss": "^4.0.2",
 	"rollup-plugin-swc3": "^0.12.1",
-	"vite-bundle-analyzer": "^0.15.2"
+	"vite-bundle-analyzer": "0.16.0-beta.1"
 };
 var pkg = {
 	name: name,
@@ -266,6 +269,208 @@ if (type$1 !== "" && IS_WORKSPACE) {
   commander.program.option("-f, --filter <filter>", filterDescription);
 }
 
+function Main() {
+  const { useState, useMemo, useEffect, useCallback } = React;
+  const [path, setPath] = useState(() => location.pathname.replace(/^\/ana\/?/, ""));
+  const [pkgName, entry] = useMemo(() => {
+    const pkgName2 = /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(path)?.[1];
+    return [
+      pkgName2,
+      pkgName2 != null ? path.replace(`${pkgName2}/`, "") : void 0
+    ];
+  }, [path]);
+  const push = useCallback((newPath) => {
+    setPath(newPath);
+    document.title = `${document.title.replace(/ - \/.*/, "")} - /${newPath}`;
+    history.pushState(null, "", `/ana/${newPath}`);
+  }, []);
+  const filterModules = useCallback((startWith) => {
+    const modules = analyzeModule.filter((m) => m.filename.startsWith(startWith));
+    dispatchEvent(new CustomEvent("send:filter", { detail: { analyzeModule: modules } }));
+  }, []);
+  useEffect(() => {
+    if (path !== "") {
+      document.title = `${document.title.replace(/ - \/.*/, "")} - /${path}`;
+    } else {
+      document.title = document.title.replace(/ - \/.*/, "");
+    }
+    filterModules(path);
+  }, [path, filterModules]);
+  useEffect(() => {
+    const offGraphClick = listen("graph:click", ({ detail }) => {
+      if (!detail) return;
+      let root = detail.node;
+      while (root.parent) {
+        root = root.parent;
+      }
+      if (root.filename === path) return;
+      push(root.filename);
+    });
+    return () => {
+      offGraphClick();
+    };
+  }, [push]);
+  function listen(type, listener) {
+    window.addEventListener(type, listener);
+    return () => {
+      window.removeEventListener(type, listener);
+    };
+  }
+  return /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      style: {
+        padding: "12px 55px"
+      }
+    },
+    "/",
+    /* @__PURE__ */ React.createElement(
+      "select",
+      {
+        style: {
+          appearance: "none",
+          border: "none",
+          background: "none"
+        },
+        value: pkgName,
+        onChange: (e) => push(e.target.value)
+      },
+      /* @__PURE__ */ React.createElement("option", { value: "" }, "All"),
+      analyzeModule.map((m) => /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(m.filename)?.[1]).filter((v, i, a) => a.indexOf(v) === i).map((v) => /* @__PURE__ */ React.createElement("option", { key: v, value: v }, v))
+    ),
+    pkgName != null && /* @__PURE__ */ React.createElement(React.Fragment, null, "/", /* @__PURE__ */ React.createElement(
+      "select",
+      {
+        style: {
+          appearance: "none",
+          border: "none",
+          background: "none"
+        },
+        value: entry,
+        onChange: (e) => push(`${pkgName}/${e.target.value}`)
+      },
+      /* @__PURE__ */ React.createElement("option", { value: "" }, "All"),
+      analyzeModule.filter((m) => m.filename.startsWith(`${pkgName}/`)).map((m) => m.filename.replace(`${pkgName}/`, "")).filter((v, i, a) => a.indexOf(v) === i).map((v) => /* @__PURE__ */ React.createElement("option", { key: v, value: v }, v))
+    ))
+  );
+}
+
+function render() {
+  CUSTOM_SIDE_BAR = true;
+  window.addEventListener("client:ready", () => setTimeout(() => {
+    window.dispatchEvent(
+      new CustomEvent("send:ui", {
+        detail: { type: "Main", Component: __REPLACE_INJECT__ }
+      })
+    );
+  }, 0));
+}
+const CLIENT_CUSTOM_RENDER_SCRIPT = [
+  Main.toString(),
+  render.toString().replace("__REPLACE_INJECT__", Main.name),
+  `(${render.name})()`
+].join("\n");
+
+function parseBoolean(v) {
+  if (v === void 0) return true;
+  return Boolean(v);
+}
+
+async function checkDependency(dependency) {
+  try {
+    require.resolve(dependency);
+  } catch {
+    console.error(`The package '${dependency}' is not installed, please install it first.`);
+    const { notWorkspace } = getWD();
+    const command = `pnpm install -${notWorkspace ? "" : "w"}D ${dependency}`;
+    if (await prompts.confirm({ message: "Do you want to install it now?" })) {
+      await execa.execaCommand(command);
+    } else {
+      console.warn(`You can run the command '${command}' to install it manually.`);
+      process__default.default.exit(1);
+    }
+  }
+}
+
+const registerAnalyzerCommandOptions = (command) => command.option("--ana", "Enable the bundle analyzer.", parseBoolean).option("--ana.dir <DIR>", "The directory of the bundle analyzer.", ".jk-analyses").option(
+  "--ana.mode <MODE>",
+  'The mode of the bundle analyzer, support "static", "json" and "server".',
+  "server"
+).option("--ana.open", "Open the bundle analyzer in the browser.", parseBoolean).option(
+  "--ana.size <SIZE>",
+  'The default size of the bundle analyzer, support "stat", "parsed" and "gzip".',
+  "parsed"
+);
+const useAnalyzer = async (options, server) => {
+  const modules = [];
+  let bundleAnalyzerModule;
+  const analyzer = options.ana ? {
+    dir: options["ana.dir"],
+    mode: options["ana.mode"],
+    open: options["ana.open"],
+    size: options["ana.size"]
+  } : void 0;
+  if (options.ana && ![
+    "stat",
+    "parsed",
+    "gzip"
+  ].includes(analyzer?.size ?? "")) {
+    throw new Error('The value of `ana.size` must be "stat", "parsed" or "gzip"');
+  }
+  if (analyzer) {
+    await checkDependency("vite-bundle-analyzer");
+    bundleAnalyzerModule = await import('vite-bundle-analyzer');
+  }
+  const refreshAnalyzer = async (cwd, applyModules) => {
+    if (!(analyzer && server && bundleAnalyzerModule)) return;
+    if (analyzer.mode === "json") {
+      const anaDir = path__default.default.resolve(cwd, analyzer.dir);
+      if (!fs.existsSync(anaDir)) {
+        fs.mkdirSync(anaDir, { recursive: true });
+      }
+      const gitIgnorePath = path__default.default.resolve(anaDir, ".gitignore");
+      if (!fs.existsSync(gitIgnorePath)) {
+        fs.writeFileSync(gitIgnorePath, "*\n!.gitignore\n");
+      }
+      const npmIgnorePath = path__default.default.resolve(anaDir, ".npmignore");
+      if (!fs.existsSync(npmIgnorePath)) {
+        fs.writeFileSync(npmIgnorePath, "*\n");
+      }
+      if (!fs.statSync(anaDir).isDirectory()) {
+        throw new Error(`The directory '${anaDir}' is not a directory.`);
+      }
+    }
+    const { renderView, injectHTMLTag } = bundleAnalyzerModule;
+    applyModules.forEach((m) => {
+      const index = modules.findIndex(({ filename }) => filename === m.filename);
+      if (index === -1) {
+        modules.push(m);
+      } else {
+        modules[index] = m;
+      }
+    });
+    let html = await renderView(modules, {
+      title: `Jiek Analyzer`,
+      mode: analyzer.size
+    });
+    html = injectHTMLTag({
+      html,
+      injectTo: "body",
+      descriptors: [
+        { kind: "script", text: CLIENT_CUSTOM_RENDER_SCRIPT }
+      ]
+    });
+    void server.renderTo("/ana", html);
+  };
+  return {
+    modules,
+    refreshAnalyzer,
+    ANALYZER_ENV: {
+      JIEK_ANALYZER: analyzer ? JSON.stringify(analyzer) : void 0
+    }
+  };
+};
+
 const BUILDER_TYPES = ["esbuild", "swc"];
 const BUILDER_TYPE_PACKAGE_NAME_MAP = {
   esbuild: "rollup-plugin-esbuild",
@@ -277,7 +482,11 @@ const createServer = (port, host) => {
   app.listen(port, host);
   const streams = /* @__PURE__ */ new Map();
   app.use(async (ctx) => {
-    const stream = streams.get(ctx.path);
+    let stream = streams.get(ctx.path);
+    if (stream == null) {
+      const maybeKey = streams.keys().find((p) => ctx.path.startsWith(p));
+      stream = maybeKey != null ? streams.get(maybeKey) : void 0;
+    }
     if (stream != null) {
       ctx.body = stream;
     }
@@ -390,8 +599,7 @@ function loadConfig(dirOrOptions) {
     default:
       throw new Error(`unsupported config file type: ${ext}`);
   }
-  if (!module)
-    throw new Error("config file is empty");
+  if (!module) throw new Error("config file is empty");
   return module.default ?? module;
 }
 
@@ -405,21 +613,6 @@ Build the package according to the 'exports' field from the package.json.
 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();
-async function checkDependency(dependency) {
-  try {
-    require$1.resolve(dependency);
-  } catch {
-    console.error(`The package '${dependency}' is not installed, please install it first.`);
-    const { notWorkspace } = getWD();
-    const command2 = `pnpm install -${notWorkspace ? "" : "w"}D ${dependency}`;
-    if (await prompts.confirm({ message: "Do you want to install it now?" })) {
-      await execa.execaCommand(command2);
-    } else {
-      console.warn(`You can run the command '${command2}' to install it manually.`);
-      process__default.default.exit(1);
-    }
-  }
-}
 let DEFAULT_BUILDER_TYPE;
 Object.entries(BUILDER_TYPE_PACKAGE_NAME_MAP).forEach(([type, packageName]) => {
   try {
@@ -431,11 +624,6 @@ Object.entries(BUILDER_TYPE_PACKAGE_NAME_MAP).forEach(([type, packageName]) => {
 if (!DEFAULT_BUILDER_TYPE) {
   DEFAULT_BUILDER_TYPE = "esbuild";
 }
-function parseBoolean(v) {
-  if (v === void 0)
-    return true;
-  return Boolean(v);
-}
 const buildFilterDescription = `
 ${filterDescription}
 If you pass the --filter option, it will merge into the filters of the command.
@@ -474,11 +662,7 @@ command = command.description(description).option("-t, --type <TYPE>", `The type
 );
 command = command.option("--tsconfig <TSCONFIG>", "The path of the tsconfig file which is used to generate js and dts files.", String).option("--dtsconfig <DTSCONFIG>", "The path of the tsconfig file which is used to generate dts files.", String);
 command = command.option("-w, --watch", "Watch the file changes.", parseBoolean).option("-p, --port <PORT>", "The port of the server.", Number.parseInt, 8888);
-command = command.option("--ana", "Enable the bundle analyzer.", parseBoolean).option("--ana.dir <DIR>", "The directory of the bundle analyzer.", ".jk-analyses").option("--ana.mode <MODE>", 'The mode of the bundle analyzer, support "static", "json" and "server".', "server").option("--ana.open", "Open the bundle analyzer in the browser.", parseBoolean).option(
-  "--ana.size <SIZE>",
-  'The default size of the bundle analyzer, support "stat", "parsed" and "gzip".',
-  "parsed"
-);
+command = registerAnalyzerCommandOptions(command);
 command = command.option("-s, --silent", "Don't display logs.", parseBoolean).option("-v, --verbose", "Display debug logs.", parseBoolean);
 command.action(async (commandFiltersOrEntries, options) => {
   let {
@@ -526,43 +710,14 @@ command.action(async (commandFiltersOrEntries, options) => {
     },
     []
   );
-  const modules = [];
-  const cjsModules = [];
-  const esmModules = [];
-  let render;
-  const analyzer = options.ana ? {
-    dir: options["ana.dir"],
-    mode: options["ana.mode"],
-    open: options["ana.open"],
-    size: options["ana.size"]
-  } : void 0;
-  if (options.ana && ![
-    "stat",
-    "parsed",
-    "gzip"
-  ].includes(analyzer?.size ?? "")) {
-    throw new Error('The value of `ana.size` must be "stat", "parsed" or "gzip"');
-  }
-  const server = analyzer && createServer(options.port, "localhost");
-  if (analyzer) {
-    await checkDependency("vite-bundle-analyzer");
-    const { renderView } = await import('vite-bundle-analyzer');
-    render = renderView;
-  }
-  const anaPaths = /* @__PURE__ */ new Set();
-  const refreshAnalyzer = async (subPath = "", renderModules = modules) => {
-    if (!(analyzer && server && render))
-      return;
-    const p = `/ana${subPath}`;
-    anaPaths.add(p);
-    void server.renderTo(
-      p,
-      await render(renderModules, {
-        title: `Jiek Analyzer - ${subPath}`,
-        mode: analyzer.size
-      })
-    );
-  };
+  const shouldCreateServer = [
+    options.ana === true && options["ana.mode"] === "server"
+  ].some(Boolean);
+  const server = shouldCreateServer ? createServer(options.port, "localhost") : void 0;
+  const {
+    ANALYZER_ENV,
+    refreshAnalyzer
+  } = await useAnalyzer(options, server);
   const { build } = loadConfig();
   silent = silent ?? build?.silent ?? false;
   if (withoutMin && onlyMin) {
@@ -579,7 +734,7 @@ command.action(async (commandFiltersOrEntries, options) => {
     entries = void 0;
   }
   const env = {
-    JIEK_ANALYZER: analyzer && JSON.stringify(analyzer),
+    ...ANALYZER_ENV,
     JIEK_BUILDER: type,
     JIEK_OUT_DIR: outdir,
     JIEK_CLEAN: String(!noClean),
@@ -621,27 +776,10 @@ command.action(async (commandFiltersOrEntries, options) => {
     const rollupBinaryPath = require$1.resolve("rollup").replace(/dist\/rollup.js$/, "dist/bin/rollup");
     let i = 0;
     await Promise.all(
-      Object.entries(value).map(async ([dir, manifest]) => {
+      Object.entries(value).map(async ([pkgCWD, manifest]) => {
         if (manifest.name == null) {
           throw new Error("package.json must have a name field");
         }
-        if (analyzer) {
-          const anaDir = path__default.default.resolve(dir, analyzer.dir);
-          if (!fs.existsSync(anaDir)) {
-            fs.mkdirSync(anaDir, { recursive: true });
-          }
-          const gitIgnorePath = path__default.default.resolve(anaDir, ".gitignore");
-          if (!fs.existsSync(gitIgnorePath)) {
-            fs.writeFileSync(gitIgnorePath, "*\n!.gitignore\n");
-          }
-          const npmIgnorePath = path__default.default.resolve(anaDir, ".npmignore");
-          if (!fs.existsSync(npmIgnorePath)) {
-            fs.writeFileSync(npmIgnorePath, "*\n");
-          }
-          if (!fs.statSync(anaDir).isDirectory()) {
-            throw new Error(`The directory '${anaDir}' is not a directory.`);
-          }
-        }
         const escapeManifestName = manifest.name.replace(/^@/g, "").replace(/\//g, "+");
         const configFile = resolveByJiekTemp(
           `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
@@ -657,7 +795,7 @@ command.action(async (commandFiltersOrEntries, options) => {
         command2.push(...passThroughOptions);
         const child = execa.execaCommand(command2.join(" "), {
           ipc: true,
-          cwd: dir,
+          cwd: pkgCWD,
           env: {
             ...env,
             JIEK_NAME: manifest.name,
@@ -673,8 +811,7 @@ command.action(async (commandFiltersOrEntries, options) => {
             "init",
             "progress",
             "watchChange"
-          ].includes(e.type))
-            return;
+          ].includes(e.type)) return;
           switch (e.type) {
             case "init": {
               const { leafMap, targetsLength } = e.data;
@@ -695,8 +832,7 @@ command.action(async (commandFiltersOrEntries, options) => {
               });
               leafs.forEach(({ input, path: path2 }) => {
                 const key = `${input}:${path2}`;
-                if (bars[key])
-                  return;
+                if (bars[key]) return;
                 bars[key] = multiBars.create(50, 0, {
                   pkgName: manifest.name,
                   input: input.padEnd(inputMaxLen + 5),
@@ -717,8 +853,7 @@ command.action(async (commandFiltersOrEntries, options) => {
                 message
               } = e.data;
               const bar = bars[`${input}:${path2}`];
-              if (!bar)
-                return;
+              if (!bar) return;
               const time = times[`${input}:${path2}`];
               bar.update(
                 {
@@ -741,8 +876,7 @@ command.action(async (commandFiltersOrEntries, options) => {
               } = e.data;
               const key = `${input}:${path2}`;
               const bar = bars[key];
-              if (!bar)
-                return;
+              if (!bar) return;
               let time = times[key] ?? 1;
               if (!locks[key]) {
                 time += 1;
@@ -763,41 +897,18 @@ command.action(async (commandFiltersOrEntries, options) => {
               const {
                 data: {
                   type: type2,
-                  path: path2,
                   modules: pkgModules
                 }
               } = e;
-              pkgModules.forEach((m) => {
-                const newM = {
+              void refreshAnalyzer(
+                pkgCWD,
+                pkgModules.map((m) => ({
                   ...m,
+                  type: type2,
                   filename: `${manifest.name}/${m.filename}`,
                   label: `${manifest.name}/${m.label}`
-                };
-                const pushOrReplace = (arr) => {
-                  const index = arr.findIndex(({ filename }) => filename === newM.filename);
-                  if (index === -1) {
-                    arr.push(newM);
-                  } else {
-                    arr[index] = newM;
-                  }
-                };
-                pushOrReplace(modules);
-                if (type2 === "esm") {
-                  pushOrReplace(esmModules);
-                }
-                if (type2 === "cjs") {
-                  pushOrReplace(cjsModules);
-                }
-              });
-              void refreshAnalyzer();
-              void refreshAnalyzer(
-                `/${type2}`,
-                {
-                  cjs: cjsModules,
-                  esm: esmModules
-                }[type2]
+                }))
               );
-              void refreshAnalyzer(`/${type2}/${manifest.name}/${path2.slice(2)}`, pkgModules);
               break;
             }
             case "debug": {
@@ -834,17 +945,7 @@ ${errorStr}`)));
     }
   } finally {
     multiBars.stop();
-    let message = "The build is complete";
-    if (analyzer) {
-      message += ` and the analyzer is running at http://localhost:${options.port}/ana in ${analyzer.mode} mode.
-`;
-      message += analyzer.open ? " The browser will open automatically.\n" : "";
-      if (anaPaths.size > 0) {
-        message += `The analyzer has ${anaPaths.size} pages:
-${Array.from(anaPaths).map((p) => `http://localhost:${options.port}${p}`).join("\n")}`;
-      }
-    }
-    !silent && console.log(message);
+    !silent && console.log("Build complete");
   }
 });
 

package/dist/cli-only-build.d.cts

@@ -40,6 +40,17 @@ interface TemplateOptions {
     } & rollup_plugin_esbuild.Options) | ({
         type: 'swc';
     } & rollup_plugin_swc3.PluginOptions);
+    features?: {
+        /**
+         * When use esbuild type builder, it will inject `supported.import-attributes` option.
+         * When use swc type builder, it will inject `jsc.experimental.keepImportAttributes` option.
+         *
+         * And it will auto set the rollup output externalImportAttributes and importAttributesKey options.
+         *
+         * @default true
+         */
+        keepImportAttributes?: boolean | 'assert';
+    };
     output?: {
         /**
          * @default true

package/dist/cli-only-build.d.ts

@@ -40,6 +40,17 @@ interface TemplateOptions {
     } & rollup_plugin_esbuild.Options) | ({
         type: 'swc';
     } & rollup_plugin_swc3.PluginOptions);
+    features?: {
+        /**
+         * When use esbuild type builder, it will inject `supported.import-attributes` option.
+         * When use swc type builder, it will inject `jsc.experimental.keepImportAttributes` option.
+         *
+         * And it will auto set the rollup output externalImportAttributes and importAttributesKey options.
+         *
+         * @default true
+         */
+        keepImportAttributes?: boolean | 'assert';
+    };
     output?: {
         /**
          * @default true