jiek 1.1.5 → 1.1.7-alpha.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "1.1.5",
+  "version": "1.1.7-alpha.1",
   "description": "YiJie's personal kits.",
   "bin": {
     "jiek": "bin/jiek.js",
@@ -58,7 +58,7 @@
     "inquirer": "^8.2.6",
     "js-yaml": "^4.1.0",
     "jsonc-parser": "^3.2.1",
-    "rollup": "^4.1.5",
+    "rollup": "4.13.2",
     "rollup-plugin-esbuild": "^6.1.0",
     "typescript": "^5.0.0",
     "@jiek/pkger": "^0.2.0",
@@ -84,6 +84,9 @@
     "postcss": "^8.4.47",
     "rollup-plugin-postcss": "^4.0.2"
   },
+  "scripts": {
+    "prepublish": "jk build"
+  },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js"
 }

package/src/commands/build.ts

@@ -8,7 +8,8 @@ import { execaCommand } from 'execa'
 
 import { actionDone, actionRestore } from '../inner'
 import type { RollupProgressEvent, TemplateOptions } from '../rollup/base'
-import { getSelectedProjectsGraph } from '../utils/filterSupport'
+import { getSelectedProjectsGraph, ProjectsGraph } from '../utils/filterSupport'
+import { filterPackagesGraph } from '../utils/filterSupport'
 import { loadConfig } from '../utils/loadConfig'
 import { tsRegisterName } from '../utils/tsRegister'
 
@@ -59,127 +60,139 @@ program
     actionRestore()
     const { build } = loadConfig()
     silent = silent ?? build?.silent ?? false
-    const {
-      wd,
-      value = {}
-    } = await getSelectedProjectsGraph() ?? {}
-
-    if (Object.keys(value).length === 0) {
-      throw new Error('no package found')
-    }
-    const wdNodeModules = path.resolve(wd, 'node_modules')
-    if (!fs.existsSync(wdNodeModules)) {
-      fs.mkdirSync(wdNodeModules)
-    }
-    const jiekTempDir = (...paths: string[]) => path.resolve(wdNodeModules, '.jiek', ...paths)
-    if (!fs.existsSync(jiekTempDir())) {
-      fs.mkdirSync(jiekTempDir())
-    }
 
-    const rollupBinaryPath = require.resolve('rollup')
-      .replace(/dist\/rollup.js$/, 'dist/bin/rollup')
     const multiBars = new MultiBar({
       clearOnComplete: false,
       hideCursor: true,
-      format: '- {bar} | {status} | {input} | {message}'
+      format: '- {bar} | {status} | {pkgName} | {input} | {message}'
     }, Presets.shades_classic)
-    let i = 0
-    await Promise.all(
-      Object.entries(value).map(async ([dir, manifest]) => {
-        // TODO support auto build child packages in workspaces
-        const escapeManifestName = manifest.name?.replace(/^@/g, '').replace(/\//g, '+')
-        const configFile = jiekTempDir(
-          `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
-        )
-        fs.writeFileSync(configFile, FILE_TEMPLATE(manifest))
-        let prefix = ''
-        if (tsRegisterName) {
-          prefix = `node -r ${tsRegisterName} `
-        }
-        const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`
-        const child = execaCommand(command, {
-          ipc: true,
-          cwd: dir,
-          env: {
-            ...process.env,
-            JIEK_ROOT: wd,
-            JIEK_ENTRIES: entries,
-            JIEK_WITHOUT_JS: String(withoutJs),
-            JIEK_WITHOUT_DTS: String(withoutDts)
+
+    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 (!fs.existsSync(wdNodeModules)) {
+        fs.mkdirSync(wdNodeModules)
+      }
+      const jiekTempDir = (...paths: string[]) => path.resolve(wdNodeModules, '.jiek', ...paths)
+      if (!fs.existsSync(jiekTempDir())) {
+        fs.mkdirSync(jiekTempDir())
+      }
+
+      const rollupBinaryPath = require.resolve('rollup')
+        .replace(/dist\/rollup.js$/, 'dist/bin/rollup')
+      let i = 0
+      await Promise.all(
+        Object.entries(value).map(async ([dir, manifest]) => {
+          // TODO support auto build child packages in workspaces
+          const escapeManifestName = manifest.name?.replace(/^@/g, '').replace(/\//g, '+')
+          const configFile = jiekTempDir(
+            `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
+          )
+          fs.writeFileSync(configFile, FILE_TEMPLATE(manifest))
+          let prefix = ''
+          if (tsRegisterName) {
+            prefix = `node -r ${tsRegisterName} `
           }
-        })
-        const bars: Record<string, ReturnType<typeof multiBars.create>> = {}
-        let inputMaxLen = 10
-        child.on('message', (e: RollupProgressEvent) => {
-          if (e.type === 'debug') console.log(...(Array.isArray(e.data) ? e.data : [e.data]))
-        })
-        !silent && child.on('message', (e: RollupProgressEvent) => {
-          if (e.type === 'init') {
-            const { leafMap, targetsLength } = e.data
-            const leafs = Array
-              .from(leafMap.entries())
-              .flatMap(([input, pathAndCondiions]) =>
-                pathAndCondiions.map(([path, ...conditions]) => ({
-                  input,
-                  path,
-                  conditions
-                }))
-              )
-            console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`)
-            leafs.forEach(({ input }) => {
-              inputMaxLen = Math.max(inputMaxLen, input.length)
-            })
-            leafs.forEach(({ input, path }) => {
-              const key = `${input}:${path}`
-              if (bars[key]) return
-              bars[key] = multiBars.create(50, 0, {
-                input: input.padEnd(inputMaxLen),
-                status: 'waiting'.padEnd(10)
-              }, {
-                barsize: 20,
-                linewrap: true
+          const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`
+          const child = execaCommand(command, {
+            ipc: true,
+            cwd: dir,
+            env: {
+              ...process.env,
+              JIEK_ROOT: wd,
+              JIEK_ENTRIES: entries,
+              JIEK_WITHOUT_JS: String(withoutJs),
+              JIEK_WITHOUT_DTS: String(withoutDts)
+            }
+          })
+          const bars: Record<string, ReturnType<typeof multiBars.create>> = {}
+          let inputMaxLen = 10
+          child.on('message', (e: RollupProgressEvent) => {
+            if (e.type === 'debug') console.log(...(Array.isArray(e.data) ? e.data : [e.data]))
+          })
+          !silent && child.on('message', (e: RollupProgressEvent) => {
+            if (e.type === 'init') {
+              const { leafMap, targetsLength } = e.data
+              const leafs = Array
+                .from(leafMap.entries())
+                .flatMap(([input, pathAndCondiions]) =>
+                  pathAndCondiions.map(([path, ...conditions]) => ({
+                    input,
+                    path,
+                    conditions
+                  }))
+                )
+              console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`)
+              leafs.forEach(({ input }) => {
+                inputMaxLen = Math.max(inputMaxLen, input.length)
+              })
+              leafs.forEach(({ input, path }) => {
+                const key = `${input}:${path}`
+                if (bars[key]) return
+                bars[key] = multiBars.create(50, 0, {
+                  pkgName: manifest.name,
+                  input: input.padEnd(inputMaxLen),
+                  status: 'waiting'.padEnd(10)
+                }, {
+                  barsize: 20,
+                  linewrap: true
+                })
               })
+            }
+            if (e.type === 'progress') {
+              const {
+                path,
+                tags,
+                input,
+                event,
+                message
+              } = e.data
+              const bar = bars[`${input}:${path}`]
+              if (!bar) return
+              bar.update(
+                {
+                  start: 0,
+                  resolve: 20,
+                  end: 50
+                }[event ?? 'start'] ?? 0,
+                {
+                  input: input.padEnd(inputMaxLen),
+                  status: event?.padEnd(10),
+                  message: `${tags?.join(', ')}: ${message}`
+                }
+              )
+            }
+          })
+          await new Promise<void>((resolve, reject) => {
+            let errorStr = ''
+            child.stderr?.on('data', (data) => {
+              errorStr += data
             })
-          }
-          if (e.type === 'progress') {
-            const {
-              path,
-              tags,
-              input,
-              event,
-              message
-            } = e.data
-            const bar = bars[`${input}:${path}`]
-            if (!bar) return
-            bar.update(
-              {
-                start: 0,
-                resolve: 20,
-                end: 50
-              }[event ?? 'start'] ?? 0,
-              {
-                input: input.padEnd(inputMaxLen),
-                status: event?.padEnd(10),
-                message: `${tags?.join(', ')}: ${message}`
-              }
-            )
-          }
-        })
-        await new Promise<void>((resolve, reject) => {
-          let errorStr = ''
-          child.stderr?.on('data', (data) => {
-            errorStr += data
+            child.once('exit', (code) =>
+              code === 0
+                ? resolve()
+                : reject(new Error(`rollup build failed:\n${errorStr}`)))
+            verbose && child.stdout?.pipe(process.stdout)
           })
-          child.once('exit', (code) =>
-            code === 0
-              ? resolve()
-              : reject(new Error(`rollup build failed:\n${errorStr}`)))
-          verbose && child.stdout?.pipe(process.stdout)
         })
-      })
-    ).finally(() => {
+      )
+    }
+    const filters = (program.getOptionValue('filter') as string | undefined)?.split(',')
+    try {
+      if (filters) {
+        const packages = await filterPackagesGraph(filters)
+        await Promise.all(packages.map(buildPackage))
+      } else {
+        await buildPackage(await getSelectedProjectsGraph())
+      }
+    } finally {
       multiBars.stop()
-    })
+    }
 
     actionDone()
   })

package/src/commands/publish.ts

@@ -2,7 +2,7 @@ import * as childProcess from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
 
-import { bump, type BumperType } from '@jiek/utils/bumper'
+import { bump, type BumperType, TAGS } from '@jiek/utils/bumper'
 import { program } from 'commander'
 import detectIndent from 'detect-indent'
 import { applyEdits, modify } from 'jsonc-parser'
@@ -156,7 +156,11 @@ program
           console.warn('preview mode')
           continue
         }
-        childProcess.execSync(['pnpm', 'publish', '--access', 'public', '--no-git-checks', ...passArgs].join(' '), {
+        const args = ['pnpm', 'publish', '--access', 'public', '--no-git-checks', ...passArgs]
+        if (bumper && TAGS.includes(bumper)) {
+          args.push('--tag', bumper)
+        }
+        childProcess.execSync(args.join(' '), {
           cwd: dir,
           stdio: 'inherit'
         })

package/src/utils/filterSupport.ts

@@ -18,10 +18,10 @@ try {
 } catch { /* empty */ }
 if (type !== '') {
   program
-    .option('-f, --filter <filter>', 'filter packages')
+    .option('-f, --filter <filter>', 'filter packages, support fuzzy match and array. e.g. -f core,utils')
 }
 
-interface ProjectsGraph {
+export interface ProjectsGraph {
   wd: string
   root: string
   value?: Record<string, {
@@ -31,11 +31,25 @@ interface ProjectsGraph {
   }>
 }
 
-export async function getSelectedProjectsGraph(): Promise<ProjectsGraph> {
-  let filter = program.getOptionValue('filter')
-  const root = getRoot()
+export function filterPackagesGraph(filters: string[]): Promise<ProjectsGraph[]> {
+  return Promise.all(filters.map(async filter => getSelectedProjectsGraph(filter)))
+}
+
+export async function getSelectedProjectsGraph(
+  filter = program.getOptionValue('filter')
+): Promise<ProjectsGraph> {
+  let root = getRoot()
   const { wd, notWorkspace } = getWD()
-  if (!notWorkspace && type === 'pnpm') {
+  if (notWorkspace) {
+    return {
+      wd,
+      root,
+      value: {
+        [wd]: JSON.parse(fs.readFileSync(path.resolve(wd, 'package.json'), 'utf-8'))
+      }
+    }
+  }
+  if (type === 'pnpm') {
     const pnpmWorkspaceFilePath = path.resolve(wd, 'pnpm-workspace.yaml')
     const pnpmWorkspaceFileContent = fs.readFileSync(pnpmWorkspaceFilePath, 'utf-8')
     const pnpmWorkspace = load(pnpmWorkspaceFileContent) as {
@@ -45,6 +59,9 @@ export async function getSelectedProjectsGraph(): Promise<ProjectsGraph> {
       throw new Error('root path is workspace root, please provide a filter')
       // TODO inquirer prompt support user select packages
     }
+    if (root === undefined) {
+      root = process.cwd()
+    }
     if (root !== wd && !filter) {
       const packageJSONIsExist = fs.existsSync(path.resolve(root, 'package.json'))
       if (!packageJSONIsExist) {
@@ -74,11 +91,5 @@ export async function getSelectedProjectsGraph(): Promise<ProjectsGraph> {
         }, {} as NonNullable<ProjectsGraph['value']>)
     }
   }
-  return {
-    wd,
-    root,
-    value: {
-      [wd]: JSON.parse(fs.readFileSync(path.resolve(wd, 'package.json'), 'utf-8'))
-    }
-  }
+  throw new Error(`not supported package manager ${type}`)
 }