jiek 2.2.7 → 2.3.1

package/src/commands/build.ts

@@ -5,24 +5,30 @@ import process from 'node:process'
 import { MultiBar, Presets } from 'cli-progress'
 import { program } from 'commander'
 import { execaCommand } from 'execa'
+import type { Config } from 'jiek'
 
-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 { 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 { loadConfig } from '#~/utils/loadConfig.ts'
-import { tsRegisterName } from '#~/utils/tsRegister.ts'
+import type { RollupBuildEvent } from '#~/bridge'
+import type { AnalyzerBuildOptions } from '#~/commands/build/analyzer'
+import { registerAnalyzerCommandOptions, useAnalyzer } from '#~/commands/build/analyzer'
+import { entriesDescription, filterDescription, outdirDescription } from '#~/commands/descriptions'
+import { IS_WORKSPACE } from '#~/commands/meta'
+import { parseBoolean } from '#~/commands/utils/optionParser'
+import type { TemplateOptions } from '#~/rollup/base'
+import { BUILDER_TYPES, BUILDER_TYPE_PACKAGE_NAME_MAP } from '#~/rollup/base'
+import { createServer } from '#~/server'
+import { checkDependency } from '#~/utils/checkDependency'
+import type { Manifest } from '#~/utils/filterSupport'
+import { filterPackagesGraph, getSelectedProjectsGraph } from '#~/utils/filterSupport'
+import { getWD } from '#~/utils/getWD'
+import { loadConfig } from '#~/utils/loadConfig'
+import { tsRegisterName } from '#~/utils/tsRegister'
 
 declare module 'jiek' {
-  export interface Config {
+  interface Config {
+    /**
+     * Skip entries which end with '.js'.
+     */
+    skipJS?: boolean
     build?: TemplateOptions & {
       /**
        * Whether to run in silent mode, only active when configured in the workspace root or cwd.
@@ -38,7 +44,11 @@ const FILE_TEMPLATE = (manifest: unknown) => (`
 module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null, 2)})
 `.trimStart())
 
-const isDefault = process.env.JIEK_IS_ONLY_BUILD === 'true'
+const ROLLUP_BIN = require
+  .resolve('rollup')
+  .replace(/dist\/rollup.js$/, 'dist/bin/rollup')
+
+const isDefault = process.env.JIEK_BIN__FILENAME === 'build.cjs'
 
 const description = `
 Build the package according to the 'exports' field from the package.json.
@@ -46,7 +56,13 @@ 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 extends AnalyzerBuildOptions {
+interface BuildOptions extends
+  AnalyzerBuildOptions,
+  Pick<
+    Config,
+    'skipJS'
+  >
+{
   /**
    * Auto-detect the builder from the installed dependencies.
    * If the builder is not installed, it will prompt the user to install it.
@@ -102,6 +118,8 @@ interface BuildOptions extends AnalyzerBuildOptions {
    * - ./tsconfig.dts.json
    */
   dtsconfig?: string
+
+  'features.keepImportAttributes'?: boolean | 'assert'
 }
 
 let DEFAULT_BUILDER_TYPE: typeof BUILDER_TYPES[number]
@@ -143,8 +161,7 @@ let command = isDefault
 command = command
   .description(description)
   .option('-t, --type <TYPE>', `The type of build, support ${BUILDER_TYPES.map(s => `"${s}"`).join(', ')}.`, v => {
-    // eslint-disable-next-line ts/no-unsafe-argument
-    if (!BUILDER_TYPES.includes(v as any)) {
+    if (!BUILDER_TYPES.includes(v as typeof BUILDER_TYPES[number])) {
       throw new Error(`The value of 'type' must be ${BUILDER_TYPES.map(s => `"${s}"`).join(', ')}`)
     }
     return String(v)
@@ -173,6 +190,12 @@ command = command
     parseBoolean
   )
 
+command = command
+  .option('--skipJS', 'Skip entries which end with ".js".', parseBoolean)
+
+command = command
+  .option('--features.keepImportAttributes', 'Keep the import attributes in the output.')
+
 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)
@@ -205,7 +228,8 @@ command
       noClean,
       onlyMin,
       tsconfig,
-      dtsconfig
+      dtsconfig,
+      skipJS
     } = options
     const resolvedType = type ?? DEFAULT_BUILDER_TYPE
     if (!withoutJs) {
@@ -277,6 +301,10 @@ command
       JIEK_MINIFY_TYPE: minifyType,
       JIEK_TSCONFIG: tsconfig,
       JIEK_DTSCONFIG: dtsconfig,
+      JIEK_SKIP_JS: String(skipJS),
+      JIEK_FEATURES: JSON.stringify({
+        keepImportAttributes: options['features.keepImportAttributes']
+      }),
       ...process.env
     }
 
@@ -286,201 +314,202 @@ command
       format: '- {bar} | {status} | {pkgName} | {input} | {message}'
     }, Presets.shades_classic)
 
-    const buildPackage = async ({
-      wd,
-      value = {}
-    }: ProjectsGraph) => {
-      if (Object.keys(value).length === 0) {
-        throw new Error('no package found')
-      }
-      const wdNodeModules = path.resolve(wd, 'node_modules')
-      if (!existsSync(wdNodeModules)) {
-        mkdirSync(wdNodeModules)
-      }
-      const resolveByJiekTemp = (...paths: string[]) => path.resolve(wdNodeModules, '.jiek', ...paths)
-      const jiekTemp = resolveByJiekTemp()
-      if (!existsSync(jiekTemp)) {
-        try {
-          mkdirSync(jiekTemp)
-        } catch {}
+    const { wd } = getWD()
+    const wdNodeModules = path.resolve(wd, 'node_modules')
+    if (!existsSync(wdNodeModules)) {
+      mkdirSync(wdNodeModules)
+    }
+    const resolveByJiekTemp = (...paths: string[]) => path.resolve(wdNodeModules, '.jiek', ...paths)
+    const jiekTemp = resolveByJiekTemp()
+    if (!existsSync(jiekTemp)) {
+      try {
+        mkdirSync(jiekTemp)
+      } catch (e) {
+        if ((e as { code: string }).code !== 'EEXIST') {
+          throw e
+        }
       }
+    }
 
-      const rollupBinaryPath = require.resolve('rollup')
-        .replace(/dist\/rollup.js$/, 'dist/bin/rollup')
-      let i = 0
-      await Promise.all(
-        Object.entries(value).map(async ([pkgCWD, manifest]) => {
-          if (manifest.name == null) {
-            throw new Error('package.json must have a name field')
-          }
+    let i = 0
+    const buildPackage = async ([pkgCWD, manifest]: [
+      string,
+      Manifest
+    ], {
+      resolveByJiekTemp
+    }: {
+      resolveByJiekTemp: (...paths: string[]) => string
+    }) => {
+      if (manifest.name == null) {
+        throw new Error('package.json must have a name field')
+      }
 
-          // TODO support auto build child packages in workspaces
-          const escapeManifestName = manifest.name.replace(/^@/g, '').replace(/\//g, '+')
-          const configFile = resolveByJiekTemp(
-            `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
-          )
-          writeFileSync(configFile, FILE_TEMPLATE(manifest))
-          const command = [rollupBinaryPath, '--silent', '-c', configFile]
-          if (tsRegisterName != null) {
-            command.unshift(`node -r ${tsRegisterName}`)
-          }
-          if (watch) {
-            command.push('--watch')
-          }
-          command.push(...passThroughOptions)
-          const child = execaCommand(command.join(' '), {
-            ipc: true,
-            cwd: pkgCWD,
-            env: {
-              ...env,
-              JIEK_NAME: manifest.name,
-              JIEK_ROOT: wd
-            }
-          })
-          const bars: Record<string, ReturnType<typeof multiBars.create>> = {}
-          const times: Record<string, number> = {}
-          const locks: Record<string, boolean> = {}
-          let inputMaxLen = 10
-          child.on('message', (e: RollupBuildEvent) => {
-            if (
-              silent && [
-                'init',
-                'progress',
-                'watchChange'
-              ].includes(e.type)
-            ) return
-            switch (e.type) {
-              case 'init': {
-                const { leafMap, targetsLength } = e.data
-                const leafs = Array
-                  .from(leafMap.entries())
-                  .flatMap(([input, pathAndCondiions]) =>
-                    pathAndCondiions.map(([path, ...conditions]) => ({
-                      input,
-                      path,
-                      conditions
-                    }))
-                  )
-                let initMessage = `Package '${manifest.name}' has ${targetsLength} targets to build`
-                if (watch) {
-                  initMessage += ' and watching...'
-                }
-                // eslint-disable-next-line no-console
-                console.log(initMessage)
-                leafs.forEach(({ input }) => {
-                  inputMaxLen = Math.max(inputMaxLen, input.length)
-                })
-                leafs.forEach(({ input, path }) => {
-                  const key = `${input}:${path}`
-                  // eslint-disable-next-line ts/strict-boolean-expressions
-                  if (bars[key]) return
-                  bars[key] = multiBars.create(50, 0, {
-                    pkgName: manifest.name,
-                    input: input.padEnd(inputMaxLen + 5),
-                    status: 'waiting'.padEnd(10)
-                  }, {
-                    barsize: 20,
-                    linewrap: true
-                  })
-                })
-                break
-              }
-              case 'progress': {
-                const {
-                  path,
-                  tags,
+      // TODO support auto build child packages in workspaces
+      const escapeManifestName = manifest.name.replace(/^@/g, '').replace(/\//g, '+')
+      const configFile = resolveByJiekTemp(
+        `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
+      )
+      writeFileSync(configFile, FILE_TEMPLATE(manifest))
+      const command = [ROLLUP_BIN, '--silent', '-c', configFile]
+      if (tsRegisterName != null) {
+        command.unshift(`node -r ${tsRegisterName}`)
+      }
+      if (watch) {
+        command.push('--watch')
+      }
+      command.push(...passThroughOptions)
+      const child = execaCommand(command.join(' '), {
+        ipc: true,
+        cwd: pkgCWD,
+        windowsHide: true,
+        env: {
+          ...env,
+          JIEK_NAME: manifest.name,
+          JIEK_ROOT: wd
+        }
+      })
+      const bars: Record<string, ReturnType<typeof multiBars.create>> = {}
+      const times: Record<string, number> = {}
+      const locks: Record<string, boolean> = {}
+      let inputMaxLen = 10
+      child.on('message', (e: RollupBuildEvent) => {
+        if (
+          silent && [
+            'init',
+            'progress',
+            'watchChange'
+          ].includes(e.type)
+        ) return
+        switch (e.type) {
+          case 'init': {
+            const { leafMap, targetsLength } = e.data
+            const leafs = Array
+              .from(leafMap.entries())
+              .flatMap(([input, pathAndConditions]) =>
+                pathAndConditions.map(([path, ...conditions]) => ({
                   input,
-                  event,
-                  message
-                } = e.data
-                const bar = bars[`${input}:${path}`]
-                // eslint-disable-next-line ts/strict-boolean-expressions
-                if (!bar) return
-                const time = times[`${input}:${path}`]
-                bar.update(
-                  {
-                    start: 0,
-                    resolve: 20,
-                    end: 50
-                  }[event ?? 'start'] ?? 0,
-                  {
-                    input: (
-                      time
-                        ? `${input}(x${time.toString().padStart(2, '0')})`
-                        : input
-                    ).padEnd(inputMaxLen + 5),
-                    status: event?.padEnd(10),
-                    message: `${tags?.join(', ')}: ${message}`
-                  }
-                )
-                break
-              }
-              case 'watchChange': {
-                const {
                   path,
-                  input
-                } = e.data
-                const key = `${input}:${path}`
-                const bar = bars[key]
-                // eslint-disable-next-line ts/strict-boolean-expressions
-                if (!bar) return
-                let time = times[key] ?? 1
-                if (!locks[key]) {
-                  time += 1
-                  times[key] = time
-                  setTimeout(() => {
-                    locks[key] = false
-                  }, 100)
-                  bar.update(0, {
-                    input: `${input}(x${time.toString().padStart(2, '0')})`.padEnd(inputMaxLen + 5),
-                    status: 'watching'.padEnd(10),
-                    message: 'watching...'
-                  })
-                }
-                locks[key] = true
-                break
-              }
-              case 'modulesAnalyze': {
-                const {
-                  data: {
-                    type,
-                    modules: pkgModules
-                  }
-                } = e
-                void refreshAnalyzer(
-                  pkgCWD,
-                  pkgModules.map(m => ({
-                    ...m,
-                    type,
-                    filename: `${manifest.name}/${m.filename}`,
-                    label: `${manifest.name}/${m.label}`
-                  }))
-                )
-                break
-              }
-              case 'debug': {
-                // eslint-disable-next-line no-console,ts/no-unsafe-argument
-                console.log(...(Array.isArray(e.data) ? e.data : [e.data]))
-                break
-              }
-              default:
+                  conditions
+                }))
+              )
+            let initMessage = `Package '${manifest.name}' has ${targetsLength} targets to build`
+            if (watch) {
+              initMessage += ' and watching...'
             }
-          })
-          await new Promise<void>((resolve, reject) => {
-            let errorStr = `rollup build failed\n`
-              + `package name: ${manifest.name}\n`
-              + `cwd: ${pkgCWD}\n\n`
-            child.stderr?.on('data', (data) => {
-              errorStr += data
+            // eslint-disable-next-line no-console
+            console.log(initMessage)
+            leafs.forEach(({ input }) => {
+              inputMaxLen = Math.max(inputMaxLen, input.length)
+            })
+            leafs.forEach(({ input, path }) => {
+              const key = `${input}:${path}`
+              // eslint-disable-next-line ts/strict-boolean-expressions
+              if (bars[key]) return
+              bars[key] = multiBars.create(50, 0, {
+                pkgName: manifest.name,
+                input: input.padEnd(inputMaxLen + 5),
+                status: 'waiting'.padEnd(10)
+              }, {
+                barsize: 20,
+                linewrap: true
+              })
             })
-            child.once('exit', (code) =>
-              code === 0
-                ? resolve()
-                : reject(new Error(errorStr)))
-            verbose && child.stdout?.pipe(process.stdout)
-          })
+            break
+          }
+          case 'progress': {
+            const {
+              path,
+              tags,
+              input,
+              event,
+              message
+            } = e.data
+            const bar = bars[`${input}:${path}`]
+            // eslint-disable-next-line ts/strict-boolean-expressions
+            if (!bar) return
+            const time = times[`${input}:${path}`]
+            bar.update(
+              {
+                start: 0,
+                resolve: 20,
+                end: 50
+              }[event ?? 'start'] ?? 0,
+              {
+                input: (
+                  time
+                    ? `${input}(x${time.toString().padStart(2, '0')})`
+                    : input
+                ).padEnd(inputMaxLen + 5),
+                status: event?.padEnd(10),
+                message: `${tags?.join(', ')}: ${message}`
+              }
+            )
+            break
+          }
+          case 'watchChange': {
+            const {
+              path,
+              input
+            } = e.data
+            const key = `${input}:${path}`
+            const bar = bars[key]
+            // eslint-disable-next-line ts/strict-boolean-expressions
+            if (!bar) return
+            let time = times[key] ?? 1
+            if (!locks[key]) {
+              time += 1
+              times[key] = time
+              setTimeout(() => {
+                locks[key] = false
+              }, 100)
+              bar.update(0, {
+                input: `${input}(x${time.toString().padStart(2, '0')})`.padEnd(inputMaxLen + 5),
+                status: 'watching'.padEnd(10),
+                message: 'watching...'
+              })
+            }
+            locks[key] = true
+            break
+          }
+          case 'modulesAnalyze': {
+            const {
+              data: {
+                type,
+                modules: pkgModules
+              }
+            } = e
+            void refreshAnalyzer(
+              pkgCWD,
+              pkgModules.map(m => ({
+                ...m,
+                type,
+                filename: `${manifest.name}/${m.filename}`,
+                label: `${manifest.name}/${m.label}`
+              }))
+            )
+            break
+          }
+          case 'debug': {
+            // eslint-disable-next-line no-console,ts/no-unsafe-argument
+            console.log(...(Array.isArray(e.data) ? e.data : [e.data]))
+            break
+          }
+          default:
+        }
+      })
+      await new Promise<void>((resolve, reject) => {
+        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(errorStr)))
+        verbose && child.stdout?.pipe(process.stdout)
+      })
     }
 
     const commandFilters = IS_WORKSPACE ? commandFiltersOrEntries : undefined
@@ -499,12 +528,14 @@ command
       ])
     ]
     try {
-      if (filters.length > 0) {
-        const packages = await filterPackagesGraph(filters)
-        await Promise.all(packages.map(buildPackage))
-      } else {
-        await buildPackage(await getSelectedProjectsGraph())
-      }
+      const packages = (
+        filters.length > 0
+          ? await filterPackagesGraph(filters)
+          : [await getSelectedProjectsGraph()]
+      ).flatMap(({ value }) => Object.entries(value ?? {}))
+      await Promise.allSettled(
+        packages.map(async ([cwd, manifest]) => buildPackage([cwd, manifest], { resolveByJiekTemp }))
+      )
     } finally {
       multiBars.stop()
       // eslint-disable-next-line no-console

package/src/commands/meta.ts

@@ -1,4 +1,4 @@
-import { getWD } from '#~/utils/getWD.ts'
+import { getWD } from '#~/utils/getWD'
 
 const { notWorkspace } = getWD()