jiek 2.1.12 → 2.1.13

package/dist/rollup/index.cjs

@@ -9,10 +9,10 @@ var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 var commonjs = require('@rollup/plugin-commonjs');
 var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
-var execa = require('execa');
 var require$$0 = require('util');
 var require$$0$1 = require('path');
 var ts = require('typescript');
+var execa = require('execa');
 var node_module = require('node:module');
 var commander = require('commander');
 var jsYaml = require('js-yaml');
@@ -4140,6 +4140,53 @@ function requireMicromatch () {
 
 var micromatchExports = requireMicromatch();
 
+const publish = async (type, data) => {
+  return execa.sendMessage({ type, data });
+};
+
+const {
+  JIEK_ANALYZER
+} = process__default.default.env;
+const ANALYZER = JIEK_ANALYZER != null && JSON.parse(JIEK_ANALYZER);
+function bundleAnalyzer(modulesResolved) {
+  if (!ANALYZER) {
+    return [];
+  }
+  const defaultSizes = {
+    parsed: "parsed",
+    stat: "stat",
+    gzip: "gzip"
+  }[ANALYZER.size ?? "stat"] ?? "parsed";
+  let ana;
+  async function initAna() {
+    const { adapter, analyzer } = await import('vite-bundle-analyzer');
+    ana = ana ?? adapter(analyzer({
+      defaultSizes,
+      analyzerMode: modulesResolved
+    }));
+  }
+  return [
+    (async () => {
+      await initAna();
+      return {
+        name: "jiek:bundle-analyzer",
+        async closeBundle(...args) {
+          if (typeof ana.closeBundle !== "function")
+            return;
+          return ana.closeBundle?.call(this, ...args);
+        }
+      };
+    })(),
+    (async () => {
+      await initAna();
+      return {
+        ...ana,
+        name: "jiek:bundle-analyzer-output"
+      };
+    })()
+  ];
+}
+
 const intersection = (a, b) => new Set([...a].filter((i) => b.has(i)));
 const {
   JIEK_OUT_DIR
@@ -4538,7 +4585,6 @@ function externalResolver(jsonOrPath = process.cwd()) {
 }
 
 const {
-  JIEK_ANALYZER,
   JIEK_ROOT,
   JIEK_NAME,
   JIEK_BUILDER,
@@ -4561,7 +4607,6 @@ const resolveArrayString = (str) => {
   ];
   return arr?.length ? arr : void 0;
 };
-const ANALYZER = JIEK_ANALYZER && JSON.parse(JIEK_ANALYZER);
 const entries = resolveArrayString(JIEK_ENTRIES)?.map((e) => ({ "index": "." })[e] ?? e);
 const commandExternal = resolveArrayString(JIEK_EXTERNAL)?.map((e) => new RegExp(`^${e}$`));
 const WORKSPACE_ROOT = JIEK_ROOT ?? getWorkspaceDir.getWorkspaceDir();
@@ -4636,15 +4681,9 @@ const resolvedMinifyOptions = resolveMinifyOptions(build.output?.minifyOptions ?
 const { type: _resolvedMinifyOptionsType, ...noTypeResolvedMinifyOptions } = resolvedMinifyOptions;
 const resolvedBuilderOptions = resolveBuilderOptions(build.builder ?? BUILDER_OPTIONS);
 const { type: _resolvedBuilderOptionsType, ...noTypeResolvedBuilderOptions } = resolvedBuilderOptions;
-const withMinify = (output, minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE) => {
+const withMinify = (output, onlyOncePlugins = []) => {
+  const minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE;
   output.plugins = output.plugins ?? [];
-  const onlyOncePlugins = [
-    // adapter(analyzer({
-    //   analyzerMode: 'server',
-    //   analyzerPort: 8888,
-    //   reportTitle: 'Bundle Analysis'
-    // }))
-  ];
   if (minify === false) {
     output.plugins.push(...onlyOncePlugins);
     return [output];
@@ -4691,6 +4730,7 @@ const generateConfigs = (context, options = {}) => {
   const isModule = conditionals.includes("import");
   const isCommonJS = conditionals.includes("require");
   const isBrowser = conditionals.includes("browser");
+  const format = isModule ? "esm" : isCommonJS ? "cjs" : isBrowser ? "umd" : pkgIsModule ? "esm" : "cjs";
   const dtsTSConfigPaths = [
     resolveWorkspacePath("tsconfig.json"),
     resolveWorkspacePath("tsconfig.dts.json")
@@ -4728,10 +4768,19 @@ const generateConfigs = (context, options = {}) => {
     delete compilerOptions.composite;
   }
   const exportConditions = [...conditionals, ...compilerOptions.customConditions ?? []];
-  const throughEventProps = {
-    type: "progress",
-    data: { name, path: path$1, exportConditions, input }
-  };
+  const publishInEntry = (type, data) => (
+    // eslint-disable-next-line ts/no-unsafe-argument
+    void publish(type, {
+      ...{
+        type: format,
+        name,
+        path: path$1,
+        exportConditions,
+        input
+      },
+      ...data
+    })
+  );
   const { js: jsPlugins, dts: dtsPlugins } = resolveBuildPlugins(context, build.plugins);
   if (input.includes("**")) {
     throw new Error(
@@ -4769,55 +4818,10 @@ const generateConfigs = (context, options = {}) => {
         ...noTypeResolvedBuilderOptions
       })
     );
-    const ana = ANALYZER ? import('vite-bundle-analyzer').then(({ adapter, analyzer }) => {
-      const defaultSizes = {
-        parsed: "parsed",
-        stat: "stat",
-        gzip: "gzip"
-      }[ANALYZER.size ?? "stat"] ?? "parsed";
-      const title = `${path.join(context.name, context.path)} ${context.conditionals.join(",")}`;
-      const filename = title.replace("/", "_").replace(" ", "_");
-      switch (ANALYZER.mode ?? "server") {
-        case "server":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "server",
-            analyzerPort: ANALYZER.port ?? "auto",
-            openAnalyzer: ANALYZER.open ?? false,
-            reportTitle: `Bundle Analysis ${title}`
-          }));
-        case "json":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "json",
-            fileName: ANALYZER.dir ? path.join(ANALYZER.dir, filename) : filename
-          }));
-        case "static":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "static",
-            analyzerPort: ANALYZER.port ?? "auto",
-            openAnalyzer: ANALYZER.open ?? false,
-            reportTitle: `Bundle Analysis ${title}`,
-            fileName: ANALYZER.dir ? path.join(ANALYZER.dir, filename) : filename
-          }));
-        case void 0: {
-          throw new Error("Not implemented yet: undefined case");
-        }
-        default:
-          void execa.sendMessage(
-            {
-              ...throughEventProps,
-              data: {
-                ...throughEventProps.data,
-                event: "error",
-                message: "ANALYZER.mode not supported",
-                tags: ["js"]
-              }
-            }
-          );
-      }
-    }) : void 0;
+    const [ana, anaOutputPlugin] = bundleAnalyzer((modules) => void publishInEntry("modulesAnalyze", { modules }));
+    const onlyOncePlugins = [
+      anaOutputPlugin
+    ];
     rollupOptions.push({
       input: inputObj,
       external,
@@ -4828,12 +4832,12 @@ const generateConfigs = (context, options = {}) => {
           interop: "auto",
           entryFileNames: (chunkInfo) => Array.isArray(inputObj) ? chunkInfo.facadeModuleId.replace(`${process__default.default.cwd()}/`, "").replace(globCommonDir, pathCommonDir).replace(/(\.[cm]?)ts$/, jsOutputSuffix) : output.replace(`${jsOutdir}/`, ""),
           sourcemap,
-          format: isModule ? "esm" : isCommonJS ? "cjs" : isBrowser ? "umd" : pkgIsModule ? "esm" : "cjs",
+          format,
           strict: typeof options?.output?.strict === "object" ? options.output.strict.js : options?.output?.strict,
           plugins: [
-            isFormatEsm(isModule)
+            isFormatEsm(format === "esm")
           ]
-        })
+        }, onlyOncePlugins)
       ],
       plugins: [
         ...commonPlugins,
@@ -4848,12 +4852,7 @@ const generateConfigs = (context, options = {}) => {
         builder,
         ana,
         progress({
-          onEvent: (event, message) => void execa.sendMessage(
-            {
-              ...throughEventProps,
-              data: { ...throughEventProps.data, event, message, tags: ["js"] }
-            }
-          )
+          onEvent: (event, message) => void publishInEntry("progress", { event, message, tags: ["js"] })
         }),
         jsPlugins
       ]
@@ -4890,12 +4889,7 @@ const generateConfigs = (context, options = {}) => {
           tsconfig: dtsTSConfigPath
         }),
         progress({
-          onEvent: (event, message) => void execa.sendMessage(
-            {
-              ...throughEventProps,
-              data: { ...throughEventProps.data, event, message, tags: ["dts"] }
-            }
-          )
+          onEvent: (event, message) => void publishInEntry("progress", { event, message, tags: ["dts"] })
         }),
         dtsPlugins
       ]
@@ -4905,12 +4899,7 @@ const generateConfigs = (context, options = {}) => {
     rollupOptions[0].plugins = [
       {
         name: "jiek-plugin-watcher",
-        watchChange: (id) => void execa.sendMessage(
-          {
-            type: "watchChange",
-            data: { id, name: JIEK_NAME, path: path$1, input }
-          }
-        )
+        watchChange: (id) => void publishInEntry("watchChange", { id })
       },
       ...rollupOptions[0].plugins
     ];
@@ -4982,15 +4971,7 @@ function template(packageJSON) {
       }
     })
   );
-  void execa.sendMessage(
-    {
-      type: "init",
-      data: {
-        leafMap,
-        targetsLength: configs.length
-      }
-    }
-  );
+  void publish("init", { leafMap, targetsLength: configs.length });
   return configs.map((c) => ({
     ...COMMON_OPTIONS,
     ...c,

package/dist/rollup/index.js

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import path, { isAbsolute, relative, resolve, dirname, extname, join } from 'node:path';
+import path, { isAbsolute, relative, resolve, dirname, extname } from 'node:path';
 import process$1 from 'node:process';
 import { resolveEntrypoints, filterLeafs, DEFAULT_SKIP_VALUES, entrypoints2Exports, getAllLeafs } from '@jiek/pkger/entrypoints';
 import { dts } from '@jiek/rollup-plugin-dts';
@@ -7,10 +7,10 @@ import { isWorkspaceDir, getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
-import { sendMessage } from 'execa';
 import require$$0 from 'util';
 import require$$0$1 from 'path';
 import ts from 'typescript';
+import { sendMessage } from 'execa';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
 import { program } from 'commander';
 import { load } from 'js-yaml';
@@ -4124,6 +4124,53 @@ function requireMicromatch () {
 
 var micromatchExports = requireMicromatch();
 
+const publish = async (type, data) => {
+  return sendMessage({ type, data });
+};
+
+const {
+  JIEK_ANALYZER
+} = process$1.env;
+const ANALYZER = JIEK_ANALYZER != null && JSON.parse(JIEK_ANALYZER);
+function bundleAnalyzer(modulesResolved) {
+  if (!ANALYZER) {
+    return [];
+  }
+  const defaultSizes = {
+    parsed: "parsed",
+    stat: "stat",
+    gzip: "gzip"
+  }[ANALYZER.size ?? "stat"] ?? "parsed";
+  let ana;
+  async function initAna() {
+    const { adapter, analyzer } = await import('vite-bundle-analyzer');
+    ana = ana ?? adapter(analyzer({
+      defaultSizes,
+      analyzerMode: modulesResolved
+    }));
+  }
+  return [
+    (async () => {
+      await initAna();
+      return {
+        name: "jiek:bundle-analyzer",
+        async closeBundle(...args) {
+          if (typeof ana.closeBundle !== "function")
+            return;
+          return ana.closeBundle?.call(this, ...args);
+        }
+      };
+    })(),
+    (async () => {
+      await initAna();
+      return {
+        ...ana,
+        name: "jiek:bundle-analyzer-output"
+      };
+    })()
+  ];
+}
+
 const intersection = (a, b) => new Set([...a].filter((i) => b.has(i)));
 const {
   JIEK_OUT_DIR
@@ -4522,7 +4569,6 @@ function externalResolver(jsonOrPath = process.cwd()) {
 }
 
 const {
-  JIEK_ANALYZER,
   JIEK_ROOT,
   JIEK_NAME,
   JIEK_BUILDER,
@@ -4545,7 +4591,6 @@ const resolveArrayString = (str) => {
   ];
   return arr?.length ? arr : void 0;
 };
-const ANALYZER = JIEK_ANALYZER && JSON.parse(JIEK_ANALYZER);
 const entries = resolveArrayString(JIEK_ENTRIES)?.map((e) => ({ "index": "." })[e] ?? e);
 const commandExternal = resolveArrayString(JIEK_EXTERNAL)?.map((e) => new RegExp(`^${e}$`));
 const WORKSPACE_ROOT = JIEK_ROOT ?? getWorkspaceDir();
@@ -4620,15 +4665,9 @@ const resolvedMinifyOptions = resolveMinifyOptions(build.output?.minifyOptions ?
 const { type: _resolvedMinifyOptionsType, ...noTypeResolvedMinifyOptions } = resolvedMinifyOptions;
 const resolvedBuilderOptions = resolveBuilderOptions(build.builder ?? BUILDER_OPTIONS);
 const { type: _resolvedBuilderOptionsType, ...noTypeResolvedBuilderOptions } = resolvedBuilderOptions;
-const withMinify = (output, minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE) => {
+const withMinify = (output, onlyOncePlugins = []) => {
+  const minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE;
   output.plugins = output.plugins ?? [];
-  const onlyOncePlugins = [
-    // adapter(analyzer({
-    //   analyzerMode: 'server',
-    //   analyzerPort: 8888,
-    //   reportTitle: 'Bundle Analysis'
-    // }))
-  ];
   if (minify === false) {
     output.plugins.push(...onlyOncePlugins);
     return [output];
@@ -4675,6 +4714,7 @@ const generateConfigs = (context, options = {}) => {
   const isModule = conditionals.includes("import");
   const isCommonJS = conditionals.includes("require");
   const isBrowser = conditionals.includes("browser");
+  const format = isModule ? "esm" : isCommonJS ? "cjs" : isBrowser ? "umd" : pkgIsModule ? "esm" : "cjs";
   const dtsTSConfigPaths = [
     resolveWorkspacePath("tsconfig.json"),
     resolveWorkspacePath("tsconfig.dts.json")
@@ -4712,10 +4752,19 @@ const generateConfigs = (context, options = {}) => {
     delete compilerOptions.composite;
   }
   const exportConditions = [...conditionals, ...compilerOptions.customConditions ?? []];
-  const throughEventProps = {
-    type: "progress",
-    data: { name, path, exportConditions, input }
-  };
+  const publishInEntry = (type, data) => (
+    // eslint-disable-next-line ts/no-unsafe-argument
+    void publish(type, {
+      ...{
+        type: format,
+        name,
+        path,
+        exportConditions,
+        input
+      },
+      ...data
+    })
+  );
   const { js: jsPlugins, dts: dtsPlugins } = resolveBuildPlugins(context, build.plugins);
   if (input.includes("**")) {
     throw new Error(
@@ -4753,55 +4802,10 @@ const generateConfigs = (context, options = {}) => {
         ...noTypeResolvedBuilderOptions
       })
     );
-    const ana = ANALYZER ? import('vite-bundle-analyzer').then(({ adapter, analyzer }) => {
-      const defaultSizes = {
-        parsed: "parsed",
-        stat: "stat",
-        gzip: "gzip"
-      }[ANALYZER.size ?? "stat"] ?? "parsed";
-      const title = `${join(context.name, context.path)} ${context.conditionals.join(",")}`;
-      const filename = title.replace("/", "_").replace(" ", "_");
-      switch (ANALYZER.mode ?? "server") {
-        case "server":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "server",
-            analyzerPort: ANALYZER.port ?? "auto",
-            openAnalyzer: ANALYZER.open ?? false,
-            reportTitle: `Bundle Analysis ${title}`
-          }));
-        case "json":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "json",
-            fileName: ANALYZER.dir ? join(ANALYZER.dir, filename) : filename
-          }));
-        case "static":
-          return adapter(analyzer({
-            defaultSizes,
-            analyzerMode: "static",
-            analyzerPort: ANALYZER.port ?? "auto",
-            openAnalyzer: ANALYZER.open ?? false,
-            reportTitle: `Bundle Analysis ${title}`,
-            fileName: ANALYZER.dir ? join(ANALYZER.dir, filename) : filename
-          }));
-        case void 0: {
-          throw new Error("Not implemented yet: undefined case");
-        }
-        default:
-          void sendMessage(
-            {
-              ...throughEventProps,
-              data: {
-                ...throughEventProps.data,
-                event: "error",
-                message: "ANALYZER.mode not supported",
-                tags: ["js"]
-              }
-            }
-          );
-      }
-    }) : void 0;
+    const [ana, anaOutputPlugin] = bundleAnalyzer((modules) => void publishInEntry("modulesAnalyze", { modules }));
+    const onlyOncePlugins = [
+      anaOutputPlugin
+    ];
     rollupOptions.push({
       input: inputObj,
       external,
@@ -4812,12 +4816,12 @@ const generateConfigs = (context, options = {}) => {
           interop: "auto",
           entryFileNames: (chunkInfo) => Array.isArray(inputObj) ? chunkInfo.facadeModuleId.replace(`${process$1.cwd()}/`, "").replace(globCommonDir, pathCommonDir).replace(/(\.[cm]?)ts$/, jsOutputSuffix) : output.replace(`${jsOutdir}/`, ""),
           sourcemap,
-          format: isModule ? "esm" : isCommonJS ? "cjs" : isBrowser ? "umd" : pkgIsModule ? "esm" : "cjs",
+          format,
           strict: typeof options?.output?.strict === "object" ? options.output.strict.js : options?.output?.strict,
           plugins: [
-            isFormatEsm(isModule)
+            isFormatEsm(format === "esm")
           ]
-        })
+        }, onlyOncePlugins)
       ],
       plugins: [
         ...commonPlugins,
@@ -4832,12 +4836,7 @@ const generateConfigs = (context, options = {}) => {
         builder,
         ana,
         progress({
-          onEvent: (event, message) => void sendMessage(
-            {
-              ...throughEventProps,
-              data: { ...throughEventProps.data, event, message, tags: ["js"] }
-            }
-          )
+          onEvent: (event, message) => void publishInEntry("progress", { event, message, tags: ["js"] })
         }),
         jsPlugins
       ]
@@ -4874,12 +4873,7 @@ const generateConfigs = (context, options = {}) => {
           tsconfig: dtsTSConfigPath
         }),
         progress({
-          onEvent: (event, message) => void sendMessage(
-            {
-              ...throughEventProps,
-              data: { ...throughEventProps.data, event, message, tags: ["dts"] }
-            }
-          )
+          onEvent: (event, message) => void publishInEntry("progress", { event, message, tags: ["dts"] })
         }),
         dtsPlugins
       ]
@@ -4889,12 +4883,7 @@ const generateConfigs = (context, options = {}) => {
     rollupOptions[0].plugins = [
       {
         name: "jiek-plugin-watcher",
-        watchChange: (id) => void sendMessage(
-          {
-            type: "watchChange",
-            data: { id, name: JIEK_NAME, path, input }
-          }
-        )
+        watchChange: (id) => void publishInEntry("watchChange", { id })
       },
       ...rollupOptions[0].plugins
     ];
@@ -4966,15 +4955,7 @@ function template(packageJSON) {
       }
     })
   );
-  void sendMessage(
-    {
-      type: "init",
-      data: {
-        leafMap,
-        targetsLength: configs.length
-      }
-    }
-  );
+  void publish("init", { leafMap, targetsLength: configs.length });
   return configs.map((c) => ({
     ...COMMON_OPTIONS,
     ...c,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "description": "A lightweight toolkit for compiling and managing libraries based on `package.json` metadata and suitable for `Monorepo`.",
   "author": "YiJie <yijie4188@gmail.com>",
   "homepage": "https://github.com/NWYLZW/jiek/tree/master/packages/jiek#readme",
@@ -10,6 +10,16 @@
     "directory": "packages/jiek"
   },
   "bugs": "https://github.com/NWYLZW/jiek/issues?q=is%3Aissue+is%3Aopen+jiek",
+  "keywords": [
+    "cli",
+    "zero-config",
+    "bundler",
+    "library",
+    "monorepo",
+    "builder",
+    "rollup",
+    "workspace"
+  ],
   "exports": {
     "./package.json": "./package.json",
     ".": {
@@ -55,7 +65,7 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-swc3": "^0.12.1",
     "typescript": "^4.0.0||^5.0.0",
-    "vite-bundle-analyzer": "^0.15.1"
+    "vite-bundle-analyzer": "^0.15.2"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.1.0",
@@ -71,6 +81,7 @@
     "execa": "~9.3.1",
     "js-yaml": "^4.1.0",
     "jsonc-parser": "^3.2.1",
+    "koa": "^2.15.3",
     "rollup": "^4.0.0",
     "@jiek/pkger": "^0.2.1",
     "@jiek/utils": "^0.2.3"

package/src/bridge.ts

@@ -0,0 +1,42 @@
+import type { Module } from '#~/rollup/bundle-analyzer.ts'
+
+import { sendMessage } from 'execa'
+
+export interface RollupBuildEntryCtx {
+  type: 'esm' | 'cjs'
+  name: string
+  path: string
+  exportConditions: string[]
+  input: string
+}
+
+export interface RollupBuildEventMap {
+  init: {
+    leafMap: Map<string, string[][]>
+    targetsLength: number
+  }
+  progress: RollupBuildEntryCtx & {
+    tags?: string[]
+    event?: string
+    message?: string
+  }
+  watchChange: RollupBuildEntryCtx & {
+    id: string
+  }
+  modulesAnalyze: RollupBuildEntryCtx & {
+    modules: Module[]
+  }
+  debug: unknown
+}
+
+export type RollupBuildEvent = keyof RollupBuildEventMap extends infer K
+  ? K extends infer Item extends keyof RollupBuildEventMap ? {
+      type: Item
+      data: RollupBuildEventMap[Item]
+    }
+  : never
+  : never
+
+export const publish = async <K extends keyof RollupBuildEventMap>(type: K, data: RollupBuildEventMap[K]) => {
+  return sendMessage({ type, data })
+}