jiek 2.1.12 → 2.1.13-alpha.2

package/src/commands/publish.ts

@@ -1,8 +1,10 @@
+/* eslint-disable ts/strict-boolean-expressions */
 import * as childProcess from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
+import process from 'node:process'
 
-import { bump, type BumperType, TAGS } from '@jiek/utils/bumper'
+import { type BumperType, TAGS, bump } from '@jiek/utils/bumper'
 import { program } from 'commander'
 import detectIndent from 'detect-indent'
 import { applyEdits, modify } from 'jsonc-parser'
@@ -91,13 +93,17 @@ program
     })
   })
 
-async function prepublish() {
+async function prepublish({ bumper }: {
+  bumper?: boolean | BumperType
+} = {}) {
   const {
     JIEK_PUBLISH_OUTDIR: outdirEnv,
     JIEK_PUBLISH_BUMPER: bumperEnv
   } = process.env
-  const outdir = outdirEnv ? JSON.parse(outdirEnv) : 'dist'
-  const bumper = bumperEnv ? JSON.parse(bumperEnv) : false
+  const outdir = outdirEnv ?? 'dist'
+  bumper = bumper ?? (
+    bumperEnv ? JSON.parse(bumperEnv) as string | boolean : false
+  )
 
   const generateNewManifest = (dir: string, manifest: NonNullable<ProjectsGraph['value']>[string]) => {
     const { name, type, exports: entrypoints = {} } = manifest
@@ -188,6 +194,7 @@ async function prepublish() {
         const index = exports?.['.']
         const indexPublishConfig: Record<string, string> = {}
         if (index) {
+          // eslint-disable-next-line ts/switch-exhaustiveness-check
           switch (typeof index) {
             case 'string':
               indexPublishConfig[
@@ -196,8 +203,8 @@ async function prepublish() {
               break
             case 'object': {
               const indexExports = index as Record<string, string>
-              indexPublishConfig.main = indexExports['require'] ?? indexExports['default']
-              indexPublishConfig.module = indexExports['import'] ?? indexExports['module'] ?? indexExports['default']
+              indexPublishConfig.main = indexExports.require ?? indexExports.default
+              indexPublishConfig.module = indexExports.import ?? indexExports.module ?? indexExports.default
               break
             }
           }
@@ -216,7 +223,7 @@ async function prepublish() {
         }
       }
     }
-    if (oldJSON['devDependencies']) {
+    if (oldJSON.devDependencies) {
       newJSONString = applyEdits(
         newJSONString,
         modify(
@@ -227,8 +234,8 @@ async function prepublish() {
         )
       )
     }
-    if (oldJSON['peerDependencies']) {
-      const peerDependenciesMeta = Object.keys(oldJSON['peerDependencies']).reduce(
+    if (oldJSON.peerDependencies) {
+      const peerDependenciesMeta = Object.keys(oldJSON.peerDependencies).reduce(
         (acc, key) => {
           acc[key] = { optional: true }
           return acc
@@ -245,7 +252,7 @@ async function prepublish() {
         )
       )
     }
-    if (oldJSON['files']) {
+    if (oldJSON.files) {
       newJSONString = applyEdits(
         newJSONString,
         modify(
@@ -264,9 +271,9 @@ async function prepublish() {
     const resolveByDir = (...paths: string[]) => path.resolve(dir, ...paths)
 
     const oldJSONString = fs.readFileSync(resolveByDir('package.json'), 'utf-8')
-    const oldJSON = JSON.parse(oldJSONString) ?? '0.0.0'
+    const oldJSON = JSON.parse(oldJSONString) as Record<string, unknown>
     if (typeof oldJSON.version !== 'string') {
-      throw new Error(`${dir}/package.json must have a version field with a string value`)
+      throw new TypeError(`${dir}/package.json must have a version field with a string value`)
     }
 
     // TODO detectIndent by editorconfig
@@ -276,7 +283,9 @@ async function prepublish() {
       insertSpaces: true
     }
 
-    const newVersion = bumper ? bump(oldJSON.version, bumper) : oldJSON.version
+    const newVersion = bumper
+      ? bump(oldJSON.version, bumper === true ? 'patch' : bumper)
+      : oldJSON.version
     const modifyVersionPackageJSON = applyEdits(
       oldJSONString,
       modify(oldJSONString, ['version'], newVersion, { formattingOptions })
@@ -357,17 +366,24 @@ async function prepublish() {
     }
 
     if (oldJSON.files) {
-      if (!Array.isArray(oldJSON.files)) {
-        throw new Error(`${dir}/package.json files field must be an array`)
-      }
-      if (Array.isArray(oldJSON.files) && oldJSON.files.every((file: unknown) => typeof file !== 'string')) {
-        throw new Error(`${dir}/package.json files field must be an array of string`)
+      if (Array.isArray(oldJSON.files)) {
+        if (oldJSON.files.every((file: unknown) => typeof file !== 'string')) {
+          throw new TypeError(`${dir}/package.json files field must be an array of string`)
+        }
+      } else {
+        throw new TypeError(`${dir}/package.json files field must be an array`)
       }
     }
     const resolvedOutdirAbs = resolveByDir(resolvedOutdir)
     const files = (
       (oldJSON.files as undefined | string[]) ?? fs.readdirSync(resolveByDir('.'))
-    ).filter(file => file === 'node_modules' || resolveByDir(file) !== resolvedOutdirAbs)
+    ).filter(file =>
+      ![
+        'node_modules',
+        'package.json',
+        'pnpm-lock.yaml'
+      ].includes(file) && resolveByDir(file) !== resolvedOutdirAbs
+    )
 
     for (const file of files) {
       const path = resolveByDir(file)
@@ -398,6 +414,7 @@ async function postpublish() {
     if (fs.existsSync(jiekTempPackageJSON)) {
       fs.copyFileSync(jiekTempPackageJSON, packageJSON)
       fs.rmSync(jiekTempPackageJSON)
+      // eslint-disable-next-line no-console
       console.log(`${dir}/package.json has been restored`)
     } else {
       throw new Error(
@@ -412,6 +429,7 @@ program
     const {
       npm_lifecycle_event: NPM_LIFECYCLE_EVENT
     } = process.env
+    // eslint-disable-next-line ts/switch-exhaustiveness-check
     switch (NPM_LIFECYCLE_EVENT) {
       case 'prepublish':
         await prepublish()
@@ -436,6 +454,8 @@ Prepare package.json for publish, you can add \`jk\` to the \`prepublish\` scrip
 program
   .command('prepublish')
   .description(prepublishDescription)
+  .option('-b, --bumper <bumper>', 'bump version')
+  .option('-no-b, --no-bumper', 'no bump version')
   .action(prepublish)
 
 const postpublishDescription = `

package/src/rollup/base.ts

@@ -100,38 +100,3 @@ export interface TemplateOptions {
       dts: InputPluginOption
     }
 }
-
-export type RollupProgressEvent =
-  | {
-    type: 'init'
-    data: {
-      leafMap: Map<string, string[][]>
-      targetsLength: number
-    }
-  }
-  | {
-    type: 'watchChange'
-    data: {
-      id: string
-      name: string
-      path: string
-      input: string
-    }
-  }
-  | {
-    type: 'debug'
-    data: unknown
-  }
-  | {
-    type: 'progress'
-    data: {
-      // name, path, exportConditions, input
-      name: string
-      path: string
-      exportConditions: string[]
-      input: string
-      tags?: string[]
-      event?: string
-      message?: string
-    }
-  }

package/src/rollup/bundle-analyzer.ts

@@ -0,0 +1,62 @@
+import process from 'node:process'
+
+import type { InputPluginOption, OutputPlugin, Plugin } from 'rollup'
+import type { AnalyzerPluginInternalAPI } from 'vite-bundle-analyzer'
+
+export type Module = ReturnType<AnalyzerPluginInternalAPI['processModule']>[number]
+
+const {
+  JIEK_ANALYZER
+} = process.env
+
+const ANALYZER = (JIEK_ANALYZER != null) && JSON.parse(JIEK_ANALYZER) as {
+  dir?: string
+  mode?: string
+  size?: string
+  port?: number
+  open?: boolean
+}
+
+export function bundleAnalyzer(modulesResolved: (modules: Module[]) => void) {
+  // eslint-disable-next-line ts/strict-boolean-expressions
+  if (!ANALYZER) {
+    return []
+  }
+
+  const defaultSizes = ({
+    parsed: 'parsed',
+    stat: 'stat',
+    gzip: 'gzip'
+  } as const)[ANALYZER.size ?? 'stat'] ?? 'parsed'
+
+  let module: typeof import('vite-bundle-analyzer') | undefined
+  let ana: Plugin | undefined
+  async function initAna() {
+    const { adapter, analyzer } = module ?? 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)
+        }
+      } satisfies InputPluginOption
+    })(),
+    (async () => {
+      await initAna()
+      return {
+        ...ana,
+        name: 'jiek:bundle-analyzer-output'
+      } satisfies OutputPlugin
+    })()
+  ] as const
+}

package/src/rollup/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable ts/strict-boolean-expressions */
 import fs from 'node:fs'
-import { dirname, extname, join, relative, resolve } from 'node:path'
+import { dirname, extname, relative, resolve } from 'node:path'
 import process from 'node:process'
 
 import type { RecursiveRecord } from '@jiek/pkger/entrypoints'
@@ -10,17 +10,19 @@ import { 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 { isMatch } from 'micromatch'
-import type { InputPluginOption, OutputOptions, OutputPlugin, Plugin, RollupOptions } from 'rollup'
+import type { InputPluginOption, OutputOptions, OutputPlugin, OutputPluginOption, Plugin, RollupOptions } from 'rollup'
 import ts from 'typescript'
 
+import type { RollupBuildEntryCtx, RollupBuildEventMap } from '#~/bridge.ts'
+import { publish } from '#~/bridge.ts'
+import { bundleAnalyzer } from '#~/rollup/bundle-analyzer.ts'
 import { getExports, getOutDirs } from '#~/utils/getExports.ts'
 import { loadConfig } from '#~/utils/loadConfig.ts'
 import { recusiveListFiles } from '#~/utils/recusiveListFiles.ts'
 import { getCompilerOptionsByFilePath } from '#~/utils/ts.ts'
 
-import type { ConfigGenerateContext, RollupProgressEvent, TemplateOptions } from './base'
+import type { ConfigGenerateContext, TemplateOptions } from './base'
 import createRequire, { isFormatEsm } from './plugins/create-require'
 import progress from './plugins/progress'
 import skip from './plugins/skip'
@@ -33,7 +35,6 @@ interface PackageJSON {
 }
 
 const {
-  JIEK_ANALYZER,
   JIEK_ROOT,
   JIEK_NAME,
   JIEK_BUILDER,
@@ -62,14 +63,6 @@ const resolveArrayString = (str: string | undefined) => {
   return arr?.length ? arr : undefined
 }
 
-const ANALYZER = JIEK_ANALYZER && JSON.parse(JIEK_ANALYZER) as {
-  dir?: string
-  mode?: string
-  size?: string
-  port?: number
-  open?: boolean
-}
-
 const entries = resolveArrayString(JIEK_ENTRIES)?.map(e => ({ 'index': '.' }[e] ?? e))
 
 const commandExternal = resolveArrayString(JIEK_EXTERNAL)?.map(e => new RegExp(`^${e}$`))
@@ -203,16 +196,10 @@ const withMinify = (
   output: OutputOptions & {
     plugins?: OutputPlugin[]
   },
-  minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE
+  onlyOncePlugins: OutputPluginOption[] = []
 ): OutputOptions[] => {
+  const minify = build?.output?.minify ?? MINIFY_DEFAULT_VALUE
   output.plugins = output.plugins ?? []
-  const onlyOncePlugins: Plugin[] = [
-    // adapter(analyzer({
-    //   analyzerMode: 'server',
-    //   analyzerPort: 8888,
-    //   reportTitle: 'Bundle Analysis'
-    // }))
-  ]
   if (minify === false) {
     output.plugins.push(...onlyOncePlugins)
     return [output]
@@ -276,6 +263,14 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
   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')
@@ -315,10 +310,22 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
     delete compilerOptions.composite
   }
   const exportConditions = [...conditionals, ...(compilerOptions.customConditions ?? [])]
-  const throughEventProps: RollupProgressEvent & { type: 'progress' } = {
-    type: 'progress',
-    data: { name, path, exportConditions, input }
-  }
+  const publishInEntry = <K extends keyof RollupBuildEventMap>(
+    type: K,
+    data: Omit<RollupBuildEventMap[K], keyof RollupBuildEntryCtx>
+  ) =>
+    // eslint-disable-next-line ts/no-unsafe-argument
+    void publish(type, {
+      ...{
+        type: format,
+        name,
+        path,
+        exportConditions,
+        input
+      } as RollupBuildEntryCtx,
+      ...data
+    } as any)
+
   const { js: jsPlugins, dts: dtsPlugins } = resolveBuildPlugins(context, build.plugins)
   if (input.includes('**')) {
     throw new Error(
@@ -377,59 +384,10 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           ...noTypeResolvedBuilderOptions
         })
       )
-    const ana = ANALYZER
-      ? import('vite-bundle-analyzer').then(({ adapter, analyzer }) => {
-        const defaultSizes = ({
-          parsed: 'parsed',
-          stat: 'stat',
-          gzip: 'gzip'
-        } as const)[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 undefined: {
-            throw new Error('Not implemented yet: undefined case')
-          }
-          default:
-            void sendMessage(
-              {
-                ...throughEventProps,
-                data: {
-                  ...throughEventProps.data,
-                  event: 'error',
-                  message: 'ANALYZER.mode not supported',
-                  tags: ['js']
-                }
-              } satisfies RollupProgressEvent
-            )
-        }
-      })
-      : undefined
+    const [ana, anaOutputPlugin] = bundleAnalyzer(modules => void publishInEntry('modulesAnalyze', { modules }))
+    const onlyOncePlugins = [
+      anaOutputPlugin
+    ]
     rollupOptions.push({
       input: inputObj,
       external,
@@ -446,20 +404,14 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
               : 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,
@@ -476,13 +428,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
         builder,
         ana,
         progress({
-          onEvent: (event, message) =>
-            void sendMessage(
-              {
-                ...throughEventProps,
-                data: { ...throughEventProps.data, event, message, tags: ['js'] }
-              } satisfies RollupProgressEvent
-            )
+          onEvent: (event, message) => void publishInEntry('progress', { event, message, tags: ['js'] })
         }),
         jsPlugins
       ]
@@ -532,13 +478,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           tsconfig: dtsTSConfigPath
         }),
         progress({
-          onEvent: (event, message) =>
-            void sendMessage(
-              {
-                ...throughEventProps,
-                data: { ...throughEventProps.data, event, message, tags: ['dts'] }
-              } satisfies RollupProgressEvent
-            )
+          onEvent: (event, message) => void publishInEntry('progress', { event, message, tags: ['dts'] })
         }),
         dtsPlugins
       ]
@@ -549,13 +489,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
     rollupOptions[0].plugins = [
       {
         name: 'jiek-plugin-watcher',
-        watchChange: (id) =>
-          void sendMessage(
-            {
-              type: 'watchChange',
-              data: { id, name: JIEK_NAME!, path, input }
-            } satisfies RollupProgressEvent
-          )
+        watchChange: id => void publishInEntry('watchChange', { id })
       },
       ...(rollupOptions[0].plugins as Plugin[])
     ]
@@ -634,15 +568,7 @@ export function template(packageJSON: PackageJSON): RollupOptions[] {
       }
     })
   )
-  void sendMessage(
-    {
-      type: 'init',
-      data: {
-        leafMap,
-        targetsLength: configs.length
-      }
-    } satisfies RollupProgressEvent
-  )
+  void publish('init', { leafMap, targetsLength: configs.length })
   return configs.map(c => ({
     ...COMMON_OPTIONS,
     ...c,

package/src/server.ts

@@ -0,0 +1,22 @@
+import Koa from 'koa'
+
+export const createServer = (port: number, host: string) => {
+  const app = new Koa()
+  app.listen(port, host)
+  const streams = new Map<string, string>()
+  app.use(async (ctx) => {
+    const stream = streams.get(ctx.path)
+    if (stream != null) {
+      ctx.body = stream
+    }
+  })
+  // noinspection HttpUrlsUsage
+  return {
+    port,
+    host,
+    rootUrl: `http://${host}:${port}`,
+    renderTo: async (path: string, stream: string) => {
+      streams.set(path, stream)
+    }
+  }
+}

package/rollup/package.json

@@ -1 +0,0 @@
-{"type":"module","main":"../dist/rollup/index.cjs","module":"../dist/rollup/index.js"}