jiek 2.2.1 → 2.2.3-alpha.1

package/src/commands/build.ts

@@ -1,24 +1,24 @@
-import { existsSync, mkdirSync, statSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
 import process from 'node:process'
 
-import { confirm } from '@inquirer/prompts'
 import { MultiBar, Presets } from 'cli-progress'
 import { program } from 'commander'
 import { execaCommand } from 'execa'
-import type { renderView } from 'vite-bundle-analyzer'
 
 import type { RollupBuildEvent } from '#~/bridge.ts'
+import type { AnalyzerBuildOptions } from '#~/commands/build/analyzer.ts'
+import { registerAnalyzerCommandOptions, useAnalyzer } from '#~/commands/build/analyzer.ts'
 import { entriesDescription, filterDescription, outdirDescription } from '#~/commands/descriptions.ts'
 import { IS_WORKSPACE } from '#~/commands/meta.ts'
+import { parseBoolean } from '#~/commands/utils/optionParser.ts'
 import type { TemplateOptions } from '#~/rollup/base.ts'
 import { BUILDER_TYPES, BUILDER_TYPE_PACKAGE_NAME_MAP } from '#~/rollup/base.ts'
-import type { Module } from '#~/rollup/bundle-analyzer.ts'
 import { createServer } from '#~/server.ts'
+import { checkDependency } from '#~/utils/checkDependency.ts'
 import type { ProjectsGraph } from '#~/utils/filterSupport.ts'
 import { filterPackagesGraph, getSelectedProjectsGraph } from '#~/utils/filterSupport.ts'
-import { getWD } from '#~/utils/getWD.ts'
 import { loadConfig } from '#~/utils/loadConfig.ts'
 import { tsRegisterName } from '#~/utils/tsRegister.ts'
 
@@ -49,21 +49,7 @@ If you want to through the options to the \`rollup\` command, you can pass the o
 ${isDefault ? 'This command is the default command.' : ''}
 `.trim()
 
-interface BuildOptions {
-  ana?: boolean
-  /**
-   * @default '.jk-analyses'
-   */
-  'ana.dir': string
-  /**
-   * @default 'server'
-   */
-  'ana.mode': string
-  'ana.open'?: boolean
-  /**
-   * @default 'parsed'
-   */
-  'ana.size': string
+interface BuildOptions extends AnalyzerBuildOptions {
   /**
    * Auto-detect the builder from the installed dependencies.
    * If the builder is not installed, it will prompt the user to install it.
@@ -120,22 +106,6 @@ interface BuildOptions {
   dtsconfig?: string
 }
 
-async function checkDependency(dependency: string) {
-  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 confirm({ message: 'Do you want to install it now?' })) {
-      await execaCommand(command)
-    } else {
-      console.warn(`You can run the command '${command}' to install it manually.`)
-      process.exit(1)
-    }
-  }
-}
-
 let DEFAULT_BUILDER_TYPE: typeof BUILDER_TYPES[number]
 Object.entries(BUILDER_TYPE_PACKAGE_NAME_MAP).forEach(([type, packageName]) => {
   try {
@@ -147,11 +117,6 @@ if (!DEFAULT_BUILDER_TYPE!) {
   DEFAULT_BUILDER_TYPE = 'esbuild'
 }
 
-function parseBoolean(v?: unknown) {
-  if (v === undefined) return true
-  return Boolean(v)
-}
-
 const buildFilterDescription = `
 ${filterDescription}
 If you pass the --filter option, it will merge into the filters of the command.
@@ -217,16 +182,7 @@ 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)
@@ -282,48 +238,17 @@ command
         [] as string[]
       )
 
-    const modules: Module[] = []
-    const cjsModules: Module[] = []
-    const esmModules: Module[] = []
-    let render: typeof renderView | undefined
-    const analyzer = options.ana
-      ? {
-        dir: options['ana.dir'],
-        mode: options['ana.mode'],
-        open: options['ana.open'],
-        size: options['ana.size']
-      }
+    const shouldCreateServer = [
+      options.ana === true && options['ana.mode'] === 'server'
+    ].some(Boolean)
+    const server = shouldCreateServer
+      ? createServer(options.port, 'localhost')
       : undefined
-    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 = new Set<string>()
-    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 as 'stat' | 'parsed' | 'gzip'
-        })
-      )
-    }
+    const {
+      ANALYZER_ENV,
+      refreshAnalyzer
+    } = await useAnalyzer(options, server)
 
     const { build } = loadConfig()
     silent = silent ?? build?.silent ?? false
@@ -343,7 +268,7 @@ command
       entries = undefined
     }
     const env = {
-      JIEK_ANALYZER: analyzer && JSON.stringify(analyzer),
+      ...ANALYZER_ENV,
       JIEK_BUILDER: type,
       JIEK_OUT_DIR: outdir,
       JIEK_CLEAN: String(!noClean),
@@ -388,27 +313,10 @@ command
         .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.resolve(dir, 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.`)
-            }
-          }
 
           // TODO support auto build child packages in workspaces
           const escapeManifestName = manifest.name.replace(/^@/g, '').replace(/\//g, '+')
@@ -426,7 +334,7 @@ command
           command.push(...passThroughOptions)
           const child = execaCommand(command.join(' '), {
             ipc: true,
-            cwd: dir,
+            cwd: pkgCWD,
             env: {
               ...env,
               JIEK_NAME: manifest.name,
@@ -540,41 +448,18 @@ command
                 const {
                   data: {
                     type,
-                    path,
                     modules: pkgModules
                   }
                 } = e
-                pkgModules.forEach(m => {
-                  const newM = {
+                void refreshAnalyzer(
+                  pkgCWD,
+                  pkgModules.map(m => ({
                     ...m,
+                    type,
                     filename: `${manifest.name}/${m.filename}`,
                     label: `${manifest.name}/${m.label}`
-                  }
-                  const pushOrReplace = (arr: Module[]) => {
-                    const index = arr.findIndex(({ filename }) => filename === newM.filename)
-                    if (index === -1) {
-                      arr.push(newM)
-                    } else {
-                      arr[index] = newM
-                    }
-                  }
-                  pushOrReplace(modules)
-                  if (type === 'esm') {
-                    pushOrReplace(esmModules)
-                  }
-                  if (type === 'cjs') {
-                    pushOrReplace(cjsModules)
-                  }
-                })
-                void refreshAnalyzer()
-                void refreshAnalyzer(
-                  `/${type}`,
-                  {
-                    cjs: cjsModules,
-                    esm: esmModules
-                  }[type]
+                  }))
                 )
-                void refreshAnalyzer(`/${type}/${manifest.name}/${path.slice(2)}`, pkgModules)
                 break
               }
               case 'debug': {
@@ -586,14 +471,16 @@ command
             }
           })
           await new Promise<void>((resolve, reject) => {
-            let errorStr = ''
+            let errorStr = `rollup build failed\n`
+              + `package name: ${manifest.name}\n`
+              + `cwd: ${pkgCWD}\n\n`
             child.stderr?.on('data', (data) => {
               errorStr += data
             })
             child.once('exit', (code) =>
               code === 0
                 ? resolve()
-                : reject(new Error(`rollup build failed:\n${errorStr}`)))
+                : reject(new Error(errorStr)))
             verbose && child.stdout?.pipe(process.stdout)
           })
         })
@@ -624,20 +511,7 @@ command
       }
     } 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.\n`
-        message += analyzer.open ? ' The browser will open automatically.\n' : ''
-        if (anaPaths.size > 0) {
-          message += `The analyzer has ${anaPaths.size} pages:\n${
-            Array
-              .from(anaPaths)
-              .map(p => `http://localhost:${options.port}${p}`)
-              .join('\n')
-          }`
-        }
-      }
       // eslint-disable-next-line no-console
-      !silent && console.log(message)
+      !silent && console.log('Build complete')
     }
   })

package/src/commands/utils/optionParser.ts

@@ -0,0 +1,4 @@
+export function parseBoolean(v?: unknown) {
+  if (v === undefined) return true
+  return Boolean(v)
+}

package/src/rollup/base.ts

@@ -49,6 +49,17 @@ export interface TemplateOptions {
     | ({
       type: 'swc'
     } & import('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/src/rollup/index.ts

@@ -219,7 +219,7 @@ const withMinify = (
   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'
@@ -359,18 +359,51 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
   const rollupOptions: RollupOptions[] = []
 
   const commonPlugins: Plugin[] = [
-    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 }) =>
@@ -384,7 +417,14 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
               inline: 'inline'
             } as const)[sourcemap] ?? undefined,
           tsconfig: buildTSConfigPath,
-          ...noTypeResolvedBuilderOptions
+          ...noTypeResolvedBuilderOptions,
+          jsc: {
+            ...resolvedBuilderOptions.jsc,
+            experimental: {
+              ...resolvedBuilderOptions.jsc?.experimental,
+              keepImportAttributes: features.keepImportAttributes !== false
+            }
+          }
         })
       )
     const [ana, anaOutputPlugin] = bundleAnalyzer(modules => void publishInEntry('modulesAnalyze', { modules }))
@@ -411,6 +451,15 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           strict: typeof options?.output?.strict === 'object'
             ? options.output.strict.js
             : options?.output?.strict,
+          externalImportAttributes: features.keepImportAttributes !== false,
+          importAttributesKey: (
+              features.keepImportAttributes === false
+              || features.keepImportAttributes === undefined
+            )
+            ? undefined
+            : features.keepImportAttributes === true
+            ? 'with'
+            : features.keepImportAttributes,
           plugins: [
             isFormatEsm(format === 'esm')
           ]
@@ -529,6 +578,7 @@ export function template(packageJSON: PackageJSON): RollupOptions[] {
     return false
   })
 
+  console.log(exports)
   const configs: RollupOptions[] = []
   leafMap.forEach((keysArr, input) =>
     keysArr.forEach((keys) => {

package/src/server.ts

@@ -5,7 +5,15 @@ export const createServer = (port: number, host: string) => {
   app.listen(port, host)
   const streams = new Map<string, string>()
   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)
+        : undefined
+    }
     if (stream != null) {
       ctx.body = stream
     }

package/src/utils/checkDependency.ts

@@ -0,0 +1,22 @@
+import { spawnSync } from 'node:child_process'
+import process from 'node:process'
+
+import { confirm } from '@inquirer/prompts'
+
+import { getWD } from '#~/utils/getWD.ts'
+
+export async function checkDependency(dependency: string) {
+  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 confirm({ message: 'Do you want to install it now?' })) {
+      spawnSync(command)
+    } else {
+      console.warn(`You can run the command '${command}' to install it manually.`)
+      process.exit(1)
+    }
+  }
+}

package/src/utils/getExports.ts

@@ -1,11 +1,11 @@
 import { isAbsolute, relative, resolve } from 'node:path'
 
 import {
+  type Entrypoints2ExportsOptions,
+  type RecursiveRecord,
   DEFAULT_SKIP_VALUES,
   entrypoints2Exports,
-  type Entrypoints2ExportsOptions,
   filterLeafs,
-  type RecursiveRecord,
   resolveEntrypoints
 } from '@jiek/pkger/entrypoints'
 import type { Config } from 'jiek'
@@ -109,20 +109,30 @@ export function getExports({
   )
   const crossModuleWithConditional: Entrypoints2ExportsOptions['withConditional'] = crossModuleConvertor
     ? {
-      import: opts =>
-        !pkgIsModule && intersection(
-              new Set(opts.conditionals),
-              new Set(['import', 'module'])
-            ).size === 0
-          ? opts.dist.replace(/\.js$/, '.mjs')
-          : false,
-      require: opts =>
-        pkgIsModule && intersection(
-              new Set(opts.conditionals),
-              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),
+            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),
+            new Set(['require', 'node'])
+          ).size !== 0
+        ) return false
+
+        return opts.dist.replace(/\.js$/, '.cjs')
+      }
     }
     : {}
   return [

package/src/utils/ts.ts

@@ -4,7 +4,7 @@ import { dirname, resolve } from 'node:path'
 import { parse } from 'jsonc-parser'
 import { isMatch } from 'micromatch'
 
-type TSConfig = {
+interface TSConfig {
   extends?: string | string[]
   compilerOptions?: Record<string, unknown>
   references?: { path: string }[]
@@ -16,7 +16,7 @@ type TSConfig = {
 const getTSConfig = (p: string): TSConfig =>
   !fs.existsSync(p) || !fs.statSync(p).isFile()
     ? {}
-    : parse(fs.readFileSync(p, 'utf-8'), [], { allowTrailingComma: true, allowEmptyContent: true })
+    : parse(fs.readFileSync(p, 'utf-8'), [], { allowTrailingComma: true, allowEmptyContent: true }) as TSConfig
 
 const getExtendTSConfig = (tsconfigPath: string): TSConfig => {
   tsconfigPath = resolve(tsconfigPath)
@@ -25,7 +25,7 @@ const getExtendTSConfig = (tsconfigPath: string): TSConfig => {
   const resolvePaths = (paths: string[] | undefined) => paths?.map(p => resolve(tsconfigPathDirname, p)) ?? []
 
   const extendsPaths = resolvePaths(
-    exts ? Array.isArray(exts) ? exts : [exts] : []
+    exts !== undefined ? Array.isArray(exts) ? exts : [exts] : []
   )
   if (extendsPaths.length === 0) return tsconfig
   return extendsPaths