jiek 2.2.1 → 2.2.3-alpha.1

package/dist/rollup/index.js

@@ -4155,8 +4155,7 @@ function bundleAnalyzer(modulesResolved) {
       return {
         name: "jiek:bundle-analyzer",
         async closeBundle(...args) {
-          if (typeof ana.closeBundle !== "function")
-            return;
+          if (typeof ana.closeBundle !== "function") return;
           return ana.closeBundle?.call(this, ...args);
         }
       };
@@ -4238,14 +4237,24 @@ function getExports({
     }
   );
   const crossModuleWithConditional = crossModuleConvertor ? {
-    import: (opts) => !pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["import", "module"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".mjs") : false,
-    require: (opts) => pkgIsModule && intersection(
-      new Set(opts.conditionals),
-      /* @__PURE__ */ new Set(["require", "node"])
-    ).size === 0 ? opts.dist.replace(/\.js$/, ".cjs") : false
+    import: (opts) => {
+      if (pkgIsModule) return false;
+      if (opts.src.endsWith(".cts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["import", "module"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".mjs");
+    },
+    require: (opts) => {
+      if (!pkgIsModule) return false;
+      if (opts.src.endsWith(".mts")) return false;
+      if (intersection(
+        new Set(opts.conditionals),
+        /* @__PURE__ */ new Set(["require", "node"])
+      ).size !== 0) return false;
+      return opts.dist.replace(/\.js$/, ".cjs");
+    }
   } : {};
   return [
     filteredResolvedEntrypoints,
@@ -4264,8 +4273,7 @@ function getExports({
 
 let root;
 function getRoot() {
-  if (root)
-    return root;
+  if (root) return root;
   const rootOption = process.env.JIEK_ROOT;
   root = rootOption ? path.isAbsolute(rootOption) ? rootOption : path.resolve(process.cwd(), rootOption) : void 0;
   return root;
@@ -4282,8 +4290,7 @@ try {
 let wd;
 let notWorkspace = false;
 function getWD() {
-  if (wd)
-    return { wd, notWorkspace };
+  if (wd) return { wd, notWorkspace };
   const root = getRoot();
   if (root !== void 0) {
     const isWorkspace = isWorkspaceDir(root, type);
@@ -4405,16 +4412,14 @@ 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;
 }
 
 const recusiveListFiles = (dir) => fs.readdirSync(dir).reduce((acc, file) => {
   const filePath = resolve(dir, file);
   if (fs.statSync(filePath).isDirectory()) {
-    if (filePath.endsWith("/node_modules"))
-      return acc;
+    if (filePath.endsWith("/node_modules")) return acc;
     return [...acc, ...recusiveListFiles(filePath)];
   }
   return [...acc, filePath];
@@ -4427,10 +4432,9 @@ const getExtendTSConfig = (tsconfigPath) => {
   const { extends: exts, ...tsconfig } = getTSConfig(tsconfigPath);
   const resolvePaths = (paths) => paths?.map((p) => resolve(tsconfigPathDirname, p)) ?? [];
   const extendsPaths = resolvePaths(
-    exts ? Array.isArray(exts) ? exts : [exts] : []
+    exts !== void 0 ? Array.isArray(exts) ? exts : [exts] : []
   );
-  if (extendsPaths.length === 0)
-    return tsconfig;
+  if (extendsPaths.length === 0) return tsconfig;
   return extendsPaths.map(getExtendTSConfig).concat(tsconfig).reduce((acc, { compilerOptions = {}, references: _, ...curr }) => ({
     ...acc,
     ...curr,
@@ -4457,24 +4461,20 @@ const getCompilerOptionsByFilePath = (tsconfigPath, filePath) => {
     tsconfig.include,
     tsconfig.exclude
   ].map(resolvePaths);
-  if (exclude.length > 0 && exclude.some((i) => micromatchExports.isMatch(filePath, i)))
-    return;
-  if (tsconfig.files?.length === 0 && tsconfig.include?.length === 0)
-    return;
+  if (exclude.length > 0 && exclude.some((i) => micromatchExports.isMatch(filePath, i))) return;
+  if (tsconfig.files?.length === 0 && tsconfig.include?.length === 0) return;
   let isInclude = false;
   isInclude || (isInclude = files.length > 0 && files.includes(filePath));
   isInclude || (isInclude = include.length > 0 && include.some((i) => micromatchExports.isMatch(filePath, i)));
   if (isInclude) {
     return tsconfig.compilerOptions ?? {};
   } else {
-    if (tsconfig.files && tsconfig.files.length > 0 || tsconfig.include && tsconfig.include.length > 0)
-      return;
+    if (tsconfig.files && tsconfig.files.length > 0 || tsconfig.include && tsconfig.include.length > 0) return;
   }
   references.reverse();
   for (const ref of references) {
     const compilerOptions = getCompilerOptionsByFilePath(ref, filePath);
-    if (compilerOptions)
-      return compilerOptions;
+    if (compilerOptions) return compilerOptions;
   }
   return tsconfig.compilerOptions;
 };
@@ -4653,10 +4653,8 @@ const resolveOutputControls = (context, output) => ({
 const resolveWorkspacePath = (p) => resolve(WORKSPACE_ROOT, p);
 const pascalCase = (str) => str.replace(/[@|/-](\w)/g, (_, $1) => $1.toUpperCase()).replace(/(?:^|-)(\w)/g, (_, $1) => $1.toUpperCase());
 const reveal = (obj, keys) => keys.reduce((acc, key) => {
-  if (typeof acc === "string")
-    throw new Error("key not found in exports");
-  if (!(key in acc))
-    throw new Error(`key ${key} not found in exports`);
+  if (typeof acc === "string") throw new Error("key not found in exports");
+  if (!(key in acc)) throw new Error(`key ${key} not found in exports`);
   return acc[key];
 }, obj);
 const resolveMinifyOptions = (minifyOptions) => typeof minifyOptions === "string" ? { type: minifyOptions } : minifyOptions ?? { type: "esbuild" };
@@ -4676,7 +4674,7 @@ const withMinify = (output, onlyOncePlugins = []) => {
   const minifyPlugin = resolvedMinifyOptions.type === "esbuild" ? import('rollup-plugin-esbuild').then(({ minify: minify2 }) => minify2(noTypeResolvedMinifyOptions)) : resolvedMinifyOptions.type === "swc" ? import('rollup-plugin-swc3').then(({ minify: minify2 }) => minify2(noTypeResolvedMinifyOptions)) : import('@rollup/plugin-terser').then(({ default: minify2 }) => minify2(noTypeResolvedMinifyOptions));
   return minify === "only-minify" ? [{
     ...output,
-    // TODO replace suffix when pubish to npm and the `build.output.minify` is 'only-minify'
+    // TODO replace suffix when publish to npm and the `build.output.minify` is 'only-minify'
     // TODO resolve dts output file name
     entryFileNames: (chunkInfo) => typeof output.entryFileNames === "function" ? output.entryFileNames(chunkInfo) : (() => {
       throw new Error("entryFileNames must be a function");
@@ -4783,15 +4781,48 @@ const generateConfigs = (context, options = {}) => {
   const { js: jsOutput, dts: dtsOutput } = resolveOutputControls(context, build.output);
   const rollupOptions = [];
   const commonPlugins = [
-    nodeResolve({ exportConditions })
+    nodeResolve({
+      exportConditions,
+      extensions: [
+        ".js",
+        ".cjs",
+        ".mjs",
+        ".jsx",
+        ".cjsx",
+        ".mjsx",
+        ".ts",
+        ".cts",
+        ".mts",
+        ".tsx",
+        ".ctsx",
+        ".mtsx"
+      ]
+    })
   ];
   if (jsOutput && !WITHOUT_JS) {
     const sourcemap = typeof options?.output?.sourcemap === "object" ? options.output.sourcemap.js : options?.output?.sourcemap;
+    const features = Object.assign({
+      keepImportAttributes: true
+    }, build.features);
     const builder = resolvedBuilderOptions.type === "esbuild" ? import('rollup-plugin-esbuild').then(
       ({ default: esbuild }) => esbuild({
         sourceMap: sourcemap === "hidden" ? false : !!sourcemap,
         tsconfig: buildTSConfigPath,
-        ...noTypeResolvedBuilderOptions
+        loaders: {
+          cts: "ts",
+          ctsx: "tsx",
+          mts: "ts",
+          mtsx: "tsx",
+          cjs: "js",
+          cjsx: "jsx",
+          mjs: "js",
+          mjsx: "jsx"
+        },
+        ...noTypeResolvedBuilderOptions,
+        supported: {
+          "import-attributes": features.keepImportAttributes !== false,
+          ...resolvedBuilderOptions.supported
+        }
       })
     ) : import('rollup-plugin-swc3').then(
       ({ default: swc }) => swc({
@@ -4800,7 +4831,14 @@ const generateConfigs = (context, options = {}) => {
           inline: "inline"
         }[sourcemap] ?? void 0,
         tsconfig: buildTSConfigPath,
-        ...noTypeResolvedBuilderOptions
+        ...noTypeResolvedBuilderOptions,
+        jsc: {
+          ...resolvedBuilderOptions.jsc,
+          experimental: {
+            ...resolvedBuilderOptions.jsc?.experimental,
+            keepImportAttributes: features.keepImportAttributes !== false
+          }
+        }
       })
     );
     const [ana, anaOutputPlugin] = bundleAnalyzer((modules) => void publishInEntry("modulesAnalyze", { modules }));
@@ -4819,6 +4857,8 @@ const generateConfigs = (context, options = {}) => {
           sourcemap,
           format,
           strict: typeof options?.output?.strict === "object" ? options.output.strict.js : options?.output?.strict,
+          externalImportAttributes: features.keepImportAttributes !== false,
+          importAttributesKey: features.keepImportAttributes === false || features.keepImportAttributes === void 0 ? void 0 : features.keepImportAttributes === true ? "with" : features.keepImportAttributes,
           plugins: [
             isFormatEsm(format === "esm")
           ]
@@ -4894,10 +4934,8 @@ const generateConfigs = (context, options = {}) => {
 function template(packageJSON) {
   const { name, type, exports: entrypoints } = packageJSON;
   const pkgIsModule = type === "module";
-  if (!name)
-    throw new Error("package.json name is required");
-  if (!entrypoints)
-    throw new Error("package.json exports is required");
+  if (!name) throw new Error("package.json name is required");
+  if (!entrypoints) throw new Error("package.json exports is required");
   const packageName = pascalCase(name);
   const external = externalResolver(packageJSON);
   const [filteredResolvedEntrypoints, exports] = getExports({
@@ -4917,6 +4955,7 @@ function template(packageJSON) {
     }
     return false;
   });
+  console.log(exports);
   const configs = [];
   leafMap.forEach(
     (keysArr, input) => keysArr.forEach((keys) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "2.2.1",
+  "version": "2.2.3-alpha.1",
   "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",
@@ -48,7 +48,11 @@
     }
   },
   "imports": {
-    "#~/*": "./src/*"
+    "#~/*": [
+      "./src/*",
+      "./src/*/index.ts",
+      "./src/*/index.tsx"
+    ]
   },
   "bin": {
     "jiek": "bin/jiek.js",
@@ -57,7 +61,7 @@
     "jb": "bin/jiek-build.js"
   },
   "peerDependencies": {
-    "@pnpm/filter-workspace-packages": "^7.2.13||^8.0.0||^9.0.0||^10.0.0",
+    "@pnpm/filter-workspace-packages": "^7.2.13||^8.0.0||^9.0.0||^10.0.0||>=1000.0.0",
     "@rollup/plugin-terser": "^0.4.4",
     "esbuild-register": "^3.5.0",
     "postcss": "^8.4.47",
@@ -65,7 +69,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.2"
+    "vite-bundle-analyzer": "0.16.0-beta.1"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.1.0",
@@ -83,8 +87,8 @@
     "jsonc-parser": "^3.2.1",
     "koa": "^2.15.3",
     "rollup": "^4.0.0",
-    "@jiek/utils": "^0.2.3",
-    "@jiek/pkger": "^0.2.1"
+    "@jiek/pkger": "^0.2.1",
+    "@jiek/utils": "^0.2.3"
   },
   "peerDependenciesMeta": {
     "@pnpm/filter-workspace-packages": {

package/src/commands/build/analyzer.ts

@@ -0,0 +1,122 @@
+import type { Command } from 'commander'
+
+import { CLIENT_CUSTOM_RENDER_SCRIPT } from '#~/commands/build/client/index.ts'
+import { parseBoolean } from '#~/commands/utils/optionParser.ts'
+import type { Module } from '#~/rollup/bundle-analyzer.ts'
+import type { createServer } from '#~/server.ts'
+import { checkDependency } from '#~/utils/checkDependency.ts'
+import { existsSync, mkdirSync, statSync, writeFileSync } from 'node:fs'
+import path from 'node:path'
+
+export interface AnalyzerBuildOptions {
+  ana?: boolean
+  /**
+   * @default '.jk-analyses'
+   */
+  'ana.dir': string
+  /**
+   * @default 'server'
+   */
+  'ana.mode': string
+  'ana.open'?: boolean
+  /**
+   * @default 'parsed'
+   */
+  'ana.size': string
+}
+
+export const registerAnalyzerCommandOptions = (command: 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'
+    )
+
+export const useAnalyzer = async (options: AnalyzerBuildOptions, server?: ReturnType<typeof createServer>) => {
+  const modules: Module[] = []
+  let bundleAnalyzerModule: typeof import('vite-bundle-analyzer') | undefined
+  const analyzer = options.ana
+    ? {
+      dir: options['ana.dir'],
+      mode: options['ana.mode'],
+      open: options['ana.open'],
+      size: options['ana.size']
+    }
+    : undefined
+  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: string, applyModules: typeof modules) => {
+    if (!(analyzer && server && bundleAnalyzerModule)) return
+
+    if (analyzer.mode === 'json') {
+      const anaDir = path.resolve(cwd, analyzer.dir)
+      if (!existsSync(anaDir)) {
+        mkdirSync(anaDir, { recursive: true })
+      }
+      const gitIgnorePath = path.resolve(anaDir, '.gitignore')
+      if (!existsSync(gitIgnorePath)) {
+        writeFileSync(gitIgnorePath, '*\n!.gitignore\n')
+      }
+      const npmIgnorePath = path.resolve(anaDir, '.npmignore')
+      if (!existsSync(npmIgnorePath)) {
+        writeFileSync(npmIgnorePath, '*\n')
+      }
+      if (!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 as 'stat' | 'parsed' | 'gzip'
+    })
+    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) : undefined
+    }
+  }
+}

package/src/commands/build/client/analyzer.tsx

@@ -0,0 +1,121 @@
+import type { Module } from '#~/rollup/bundle-analyzer.ts'
+
+interface Node {
+  id: string
+  filename: string
+  parent?: Node
+}
+
+declare global {
+  // @ts-ignore
+  // eslint-disable-next-line no-var,vars-on-top
+  var React: typeof import('react')
+  // eslint-disable-next-line no-var,vars-on-top
+  var analyzeModule: Module[]
+  interface WindowEventMap {
+    'graph:click': CustomEvent<
+      | undefined
+      | { node: Node }
+    >
+    'send:filter': CustomEvent<{
+      analyzeModule: Module[]
+    }>
+  }
+}
+
+export function Main() {
+  const { useState, useMemo, useEffect, useCallback } = React
+  const [path, setPath] = useState(() => location.pathname.replace(/^\/ana\/?/, ''))
+  const [pkgName, entry] = useMemo(() => {
+    const pkgName = /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(path)?.[1]
+    return [
+      pkgName,
+      (pkgName != null) ? path.replace(`${pkgName}/`, '') : undefined
+    ]
+  }, [path])
+  const push = useCallback((newPath: string) => {
+    setPath(newPath)
+    document.title = `${document.title.replace(/ - \/.*/, '')} - \/${newPath}`
+    history.pushState(null, '', `/ana/${newPath}`)
+  }, [])
+  const filterModules = useCallback((startWith: string) => {
+    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<T extends keyof WindowEventMap>(type: T, listener: (this: Window, ev: WindowEventMap[T]) => any) {
+    window.addEventListener(type, listener)
+    return () => {
+      window.removeEventListener(type, listener)
+    }
+  }
+  return (
+    <div
+      style={{
+        padding: '12px 55px'
+      }}
+    >
+      /
+      <select
+        style={{
+          appearance: 'none',
+          border: 'none',
+          background: 'none'
+        }}
+        value={pkgName}
+        onChange={e => push(e.target.value)}
+      >
+        <option value=''>All</option>
+        {analyzeModule
+          .map(m => /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(m.filename)?.[1])
+          .filter((v, i, a) => a.indexOf(v) === i)
+          .map(v => (
+            <option key={v} value={v}>{v}</option>
+          ))}
+      </select>
+      {pkgName != null && <>
+        /
+        <select
+          style={{
+            appearance: 'none',
+            border: 'none',
+            background: 'none'
+          }}
+          value={entry}
+          onChange={e => push(`${pkgName}/${e.target.value}`)}
+        >
+          <option value=''>All</option>
+          {analyzeModule
+            .filter(m => m.filename.startsWith(`${pkgName}/`))
+            .map(m => m.filename.replace(`${pkgName}/`, ''))
+            .filter((v, i, a) => a.indexOf(v) === i)
+            .map(v => (
+              <option key={v} value={v}>{v}</option>
+            ))}
+        </select>
+      </>}
+    </div>
+  )
+}

package/src/commands/build/client/index.ts

@@ -0,0 +1,28 @@
+import { Main } from './analyzer'
+
+declare global {
+  // eslint-disable-next-line no-var,vars-on-top
+  var CUSTOM_SIDE_BAR: boolean
+  // eslint-disable-next-line no-var,vars-on-top
+  var __REPLACE_INJECT__: string
+}
+
+function render() {
+  CUSTOM_SIDE_BAR = true
+  window.addEventListener('client:ready', () =>
+    setTimeout(() => {
+      window.dispatchEvent(
+        new CustomEvent('send:ui', {
+          detail: { type: 'Main', Component: __REPLACE_INJECT__ }
+        })
+      )
+    }, 0))
+}
+
+export const CLIENT_CUSTOM_RENDER_SCRIPT = [
+  Main.toString(),
+  render
+    .toString()
+    .replace('__REPLACE_INJECT__', Main.name),
+  `(${render.name})()`
+].join('\n')