jiek 2.3.3 → 2.3.4

package/dist/rollup/index.cjs

@@ -1,23 +1,26 @@
 'use strict';
 
+require('#~/polyfill');
 var fs = require('node:fs');
 var node_path = require('node:path');
 var process = require('node:process');
-var entrypoints = require('@jiek/pkger/entrypoints');
-var rollupPluginDts = require('@jiek/rollup-plugin-dts');
-var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 var commonjs = require('@rollup/plugin-commonjs');
 var inject = require('@rollup/plugin-inject');
 var json = require('@rollup/plugin-json');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var ts$1 = require('typescript');
+var entrypoints = require('@jiek/pkger/entrypoints');
+var rollupPluginDts = require('@jiek/rollup-plugin-dts');
+var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
 var bridge = require('#~/bridge');
 var bundleAnalyzer = require('#~/rollup/bundle-analyzer');
 var getInternalModuleName = require('#~/utils/getInternalModuleName');
 var intersection = require('#~/utils/intersection');
 var loadConfig = require('#~/utils/loadConfig');
+var pascalCase = require('#~/utils/pascalCase');
 var recursiveListFiles = require('#~/utils/recursiveListFiles');
 var resolveExports = require('#~/utils/resolveExports');
+var reveal = require('#~/utils/reveal');
 var ts = require('#~/utils/ts');
 var rollupPluginUtils = require('jiek/rollup-plugin-utils');
 var MagicString = require('magic-string');
@@ -120,7 +123,7 @@ var replace = rollupPluginUtils.definePlugin((options = {}) => {
       allKeys.forEach((key) => {
         root.findAll(key).forEach((node) => {
           const { start, end } = node.range();
-          const newValue = typeof allValues[key] === "function" ? allValues[key]({
+          let newValue = typeof allValues[key] === "function" ? allValues[key]({
             ...ctx,
             code,
             mode: "ast-grep",
@@ -136,11 +139,12 @@ var replace = rollupPluginUtils.definePlugin((options = {}) => {
             }
           }) : allValues[key];
           if ([null, void 0, false].includes(newValue)) return;
-          ms.overwrite(
-            start.index,
-            end.index,
-            newValue
-          );
+          newValue = newValue.toString();
+          newValue = newValue.replace(/\$([a-z_\-]+)/gi, (_, [name]) => {
+            if (name == null) return _;
+            return node.getMatch(name)?.text() ?? _;
+          });
+          ms.overwrite(start.index, end.index, newValue);
         });
       });
     }
@@ -330,12 +334,6 @@ const resolveOutputControls = (context, output) => ({
   dts: typeof output?.dts === "boolean" ? output.dts : typeof output?.dts === "function" ? output.dts(context) : true
 });
 const resolveWorkspacePath = (p) => node_path.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`);
-  return acc[key];
-}, obj);
 const resolveMinifyOptions = (minifyOptions) => typeof minifyOptions === "string" ? { type: minifyOptions } : minifyOptions ?? { type: "esbuild" };
 const resolveBuilderOptions = (builder) => typeof builder === "string" ? { type: builder } : builder ?? { type: "esbuild" };
 const resolvedMinifyOptions = resolveMinifyOptions(build.output?.minifyOptions ?? MINIFY_OPTIONS);
@@ -690,7 +688,7 @@ function template(packageJSON) {
     imports: internalEntrypoints
   } = packageJSON;
   const pkgIsModule = type === "module";
-  const packageName = pascalCase(name);
+  const packageName = pascalCase.pascalCase(name);
   const leafMap = /* @__PURE__ */ new Map();
   const inputTags = /* @__PURE__ */ new Map();
   const inputExports = /* @__PURE__ */ new Map();
@@ -785,8 +783,8 @@ function template(packageJSON) {
     const exports = inputExports.get(input);
     keysArr.forEach((keys) => {
       const [path, ...conditionals] = keys;
-      const name2 = packageName + (path === "." ? "" : pascalCase(path));
-      const keyExports = reveal(exports, keys);
+      const name2 = packageName + (path === "." ? "" : pascalCase.pascalCase(path));
+      const keyExports = reveal.reveal(exports, keys);
       const commonContext = {
         path,
         name: name2,

package/dist/rollup/index.js

@@ -1,21 +1,24 @@
+import '#~/polyfill';
 import fs from 'node:fs';
 import { extname, relative, resolve, dirname } from 'node:path';
 import process from 'node:process';
-import { getAllLeafs } from '@jiek/pkger/entrypoints';
-import { dts } from '@jiek/rollup-plugin-dts';
-import { getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
 import commonjs from '@rollup/plugin-commonjs';
 import inject from '@rollup/plugin-inject';
 import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import ts from 'typescript';
+import { getAllLeafs } from '@jiek/pkger/entrypoints';
+import { dts } from '@jiek/rollup-plugin-dts';
+import { getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
 import { publish } from '#~/bridge';
 import { bundleAnalyzer } from '#~/rollup/bundle-analyzer';
 import { getInternalModuleName } from '#~/utils/getInternalModuleName';
 import { intersection } from '#~/utils/intersection';
 import { loadConfig } from '#~/utils/loadConfig';
+import { pascalCase } from '#~/utils/pascalCase';
 import { recursiveListFiles } from '#~/utils/recursiveListFiles';
 import { getOutDirs, resolveExports } from '#~/utils/resolveExports';
+import { reveal } from '#~/utils/reveal';
 import { getCompilerOptionsByFilePath } from '#~/utils/ts';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
 import { definePlugin, createFilter } from 'jiek/rollup-plugin-utils';
@@ -108,7 +111,7 @@ var replace = definePlugin((options = {}) => {
       allKeys.forEach((key) => {
         root.findAll(key).forEach((node) => {
           const { start, end } = node.range();
-          const newValue = typeof allValues[key] === "function" ? allValues[key]({
+          let newValue = typeof allValues[key] === "function" ? allValues[key]({
             ...ctx,
             code,
             mode: "ast-grep",
@@ -124,11 +127,12 @@ var replace = definePlugin((options = {}) => {
             }
           }) : allValues[key];
           if ([null, void 0, false].includes(newValue)) return;
-          ms.overwrite(
-            start.index,
-            end.index,
-            newValue
-          );
+          newValue = newValue.toString();
+          newValue = newValue.replace(/\$([a-z_\-]+)/gi, (_, [name]) => {
+            if (name == null) return _;
+            return node.getMatch(name)?.text() ?? _;
+          });
+          ms.overwrite(start.index, end.index, newValue);
         });
       });
     }
@@ -318,12 +322,6 @@ const resolveOutputControls = (context, output) => ({
   dts: typeof output?.dts === "boolean" ? output.dts : typeof output?.dts === "function" ? output.dts(context) : true
 });
 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`);
-  return acc[key];
-}, obj);
 const resolveMinifyOptions = (minifyOptions) => typeof minifyOptions === "string" ? { type: minifyOptions } : minifyOptions ?? { type: "esbuild" };
 const resolveBuilderOptions = (builder) => typeof builder === "string" ? { type: builder } : builder ?? { type: "esbuild" };
 const resolvedMinifyOptions = resolveMinifyOptions(build.output?.minifyOptions ?? MINIFY_OPTIONS);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "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",
@@ -83,7 +83,7 @@
     "magic-string": "^0.30.17",
     "rollup": "^4.0.0",
     "@jiek/pkger": "^0.2.2",
-    "@jiek/utils": "^0.2.3"
+    "@jiek/utils": "^0.2.4"
   },
   "peerDependenciesMeta": {
     "@ast-grep/napi": {

package/src/bin/build.cts

@@ -1,5 +0,0 @@
-import '#~/bin/common'
-
-import parseArgv from '#~/bin/parseArgv'
-
-parseArgv()

package/src/bin/common.ts

@@ -1,3 +0,0 @@
-import '../utils/filterSupport'
-import '../commands/base'
-import '../commands/build'

package/src/bin/index.cts

@@ -1,7 +0,0 @@
-import '#~/bin/common'
-
-import '../commands/publish'
-
-import parseArgv from '#~/bin/parseArgv'
-
-parseArgv()

package/src/bin/parseArgv.ts

@@ -1,26 +0,0 @@
-import { program } from 'commander'
-import process from 'node:process'
-
-const { argv } = process
-const env: Record<string, string> = {}
-let isPassThrough = false
-const newArgv = argv.filter((arg) => {
-  if (isPassThrough) {
-    return true
-  }
-  if (arg === '--') {
-    isPassThrough = true
-    return false
-  }
-  const m = /^--env\.(\w+)=(.*)$/.exec(arg)
-  if (m) {
-    env[m[1]] = m[2]
-    return false
-  }
-  return true
-})
-for (const [key, value] of Object.entries(env)) {
-  process.env[key] = value
-}
-
-export default () => program.parse(newArgv)

package/src/bridge.ts

@@ -1,46 +0,0 @@
-import type { Module } from '#~/rollup/bundle-analyzer'
-
-import { sendMessage } from 'execa'
-
-export const bridgeDisabledRef = { value: false }
-
-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]) => {
-  if (bridgeDisabledRef.value) return Promise.resolve()
-
-  return sendMessage({ type, data })
-}

package/src/commands/base.ts

@@ -1,18 +0,0 @@
-import { program } from 'commander'
-import pkg from 'jiek/package.json'
-
-import { filterDescription } from '#~/commands/descriptions'
-import { IS_WORKSPACE } from '#~/commands/meta'
-import { type } from '#~/utils/filterSupport'
-
-program
-  .name('jk/jiek')
-  .version(pkg.version)
-  .description(`${pkg.description} - Version ${pkg.version}`)
-  .option('-c, --config-path <configPath>', 'Custom jiek config path')
-  .option('--env.<name>=<value>', 'Set the environment variable.')
-
-if (type !== '' && IS_WORKSPACE) {
-  program
-    .option('-f, --filter <filter>', filterDescription)
-}

package/src/commands/build/analyzer.ts

@@ -1,122 +0,0 @@
-import type { Command } from 'commander'
-
-import { CLIENT_CUSTOM_RENDER_SCRIPT } from '#~/commands/build/client/index'
-import { parseBoolean } from '#~/commands/utils/optionParser'
-import type { Module } from '#~/rollup/bundle-analyzer'
-import type { createServer } from '#~/server'
-import { checkDependency } from '#~/utils/checkDependency'
-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

@@ -1,121 +0,0 @@
-import type { Module } from '#~/rollup/bundle-analyzer'
-
-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

@@ -1,26 +0,0 @@
-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', () =>
-    window.dispatchEvent(
-      new CustomEvent('send:ui', {
-        detail: { type: 'Main', Component: __REPLACE_INJECT__ }
-      })
-    ))
-}
-
-export const CLIENT_CUSTOM_RENDER_SCRIPT = [
-  Main.toString(),
-  render
-    .toString()
-    .replace('__REPLACE_INJECT__', Main.name),
-  `(${render.name})()`
-].join('\n')