jiek 1.0.8 → 1.0.10

package/src/commands/build.ts

@@ -1,5 +1,3 @@
-import '../rollup/base'
-
 import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
@@ -9,11 +7,24 @@ import { program } from 'commander'
 import { execaCommand } from 'execa'
 
 import { actionDone, actionRestore } from '../inner'
-import type { RollupProgressEvent } from '../rollup/base'
+import type { RollupProgressEvent, TemplateOptions } from '../rollup/base'
 import { getSelectedProjectsGraph } from '../utils/filterSupport'
 import { loadConfig } from '../utils/loadConfig'
 import { tsRegisterName } from '../utils/tsRegister'
 
+declare module 'jiek' {
+  export interface Config {
+    build?: TemplateOptions & {
+      /**
+       * Whether to run in silent mode, only active when configured in the workspace root or cwd.
+       *
+       * @default false
+       */
+      silent?: boolean
+    }
+  }
+}
+
 const FILE_TEMPLATE = (manifest: unknown) => (`
 module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null, 2)})
 `.trimStart())

package/src/rollup/base.ts

@@ -78,16 +78,3 @@ export type RollupProgressEvent =
       message?: string
     }
   }
-
-declare module 'jiek' {
-  export interface Config {
-    build?: TemplateOptions & {
-      /**
-       * Whether to run in silent mode, only active when configured in the workspace root or cwd.
-       *
-       * @default false
-       */
-      silent?: boolean
-    }
-  }
-}

package/src/rollup/index.ts

@@ -1,4 +1,4 @@
-import '../rollup/base'
+import './base'
 
 import fs from 'node:fs'
 import { dirname, relative, resolve } from 'node:path'
@@ -16,6 +16,8 @@ import type { InputPluginOption, OutputOptions, OutputPlugin, RollupOptions } fr
 import esbuild from 'rollup-plugin-esbuild'
 import ts from 'typescript'
 
+import { recusiveListFiles } from '#~/utils/recusiveListFiles.ts'
+
 import { getExports } from '../utils/getExports'
 import { loadConfig } from '../utils/loadConfig'
 import { getCompilerOptionsByFilePath } from '../utils/ts'
@@ -58,9 +60,6 @@ const jsOutdir = `./${
 
 const STYLE_REGEXP = /\.(css|s[ac]ss|less|styl)$/
 
-// eslint-disable-next-line unused-imports/no-unused-vars
-const debug = (...args: unknown[]) => sendMessage({ type: 'debug', data: args } satisfies RollupProgressEvent)
-
 const resolveBuildPlugins = (context: ConfigGenerateContext, plugins: TemplateOptions['plugins']): {
   js: InputPluginOption
   dts: InputPluginOption
@@ -107,7 +106,7 @@ const withMinify = (
     plugins?: OutputPlugin[]
   },
   minify = build?.output?.minify
-) =>
+): OutputOptions[] =>
   minify === false
     ? [output]
     : minify === 'only-minify'
@@ -115,7 +114,12 @@ const withMinify = (
       ...output,
       // TODO replace suffix when pubish to npm and the `build.output.minify` is 'only-minify'
       // TODO resolve dts output file name
-      file: output.file?.replace(/(\.[cm]?js)$/, '.min$1'),
+      entryFileNames: chunkInfo =>
+        typeof output.entryFileNames === 'function'
+          ? output.entryFileNames(chunkInfo).replace(/(\.[cm]?js)$/, '.min$1')
+          : (() => {
+            throw new Error('entryFileNames must be a function')
+          })(),
       plugins: [
         ...(output.plugins ?? []),
         terser()
@@ -125,6 +129,12 @@ const withMinify = (
       output,
       {
         ...output,
+        entryFileNames: chunkInfo =>
+          typeof output.entryFileNames === 'function'
+            ? output.entryFileNames(chunkInfo).replace(/(\.[cm]?js)$/, '.min$1')
+            : (() => {
+              throw new Error('entryFileNames must be a function')
+            })(),
         file: output.file?.replace(/(\.[cm]?js)$/, '.min$1'),
         plugins: [
           ...(output.plugins ?? []),
@@ -176,15 +186,34 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
   }
   const outdir = options?.output?.dir
   const { js: jsPlugins, dts: dtsPlugins } = resolveBuildPlugins(context, build.plugins)
+  if (input.includes('**')) {
+    throw new Error(
+      'input should not include "**", please read the [documentation](https://nodejs.org/api/packages.html#subpath-patterns).'
+    )
+  }
+  const inputObj = !input.includes('*')
+    ? input
+    : recusiveListFiles(process.cwd())
+      .filter(p => /(?<!\.d)\.[cm]?tsx?$/.test(p))
+  const globCommonDir = input.includes('*')
+    ? input.split('*')[0]
+    : ''
   return [
     {
-      input,
+      input: inputObj,
       external,
       output: [
         ...withMinify({
-          file: output,
+          dir: jsOutdir,
           name,
           interop: 'auto',
+          entryFileNames: (chunkInfo) => (
+            Array.isArray(inputObj)
+              ? chunkInfo.facadeModuleId!.replace(`${process.cwd()}/`, './')
+                .replace(globCommonDir, '')
+                .replace(/(\.[cm]?)ts$/, '$1js')
+              : output.replace(`${jsOutdir}/`, '')
+          ),
           sourcemap: typeof options?.output?.sourcemap === 'object'
             ? options.output.sourcemap.js
             : options?.output?.sourcemap,
@@ -227,7 +256,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
       ]
     },
     {
-      input,
+      input: inputObj,
       external,
       output: [
         {
@@ -235,10 +264,15 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
           sourcemap: typeof options?.output?.sourcemap === 'object'
             ? options.output.sourcemap.dts
             : options?.output?.sourcemap,
-          entryFileNames: () =>
-            output
-              .replace(`${jsOutdir}/`, '')
-              .replace(/(\.[cm]?)js$/, '.d$1ts'),
+          entryFileNames: (chunkInfo) => (
+            Array.isArray(inputObj)
+              ? chunkInfo.facadeModuleId!.replace(`${process.cwd()}/`, './')
+                .replace(globCommonDir, '')
+                .replace(/(\.[cm]?)ts$/, '.d$1ts')
+              : output
+                .replace(`${jsOutdir}/`, '')
+                .replace(/(\.[cm]?)js$/, '.d$1ts')
+          ),
           strict: typeof options?.output?.strict === 'object'
             ? options.output.strict.dts
             : options?.output?.strict

package/src/utils/recusiveListFiles.ts

@@ -0,0 +1,13 @@
+import fs from 'node:fs'
+import { resolve } from 'node:path'
+
+export const recusiveListFiles = (dir: string): string[] =>
+  fs.readdirSync(dir).reduce((acc, file) => {
+    const filePath = resolve(dir, file)
+    if (fs.statSync(filePath).isDirectory()) {
+      if (filePath.endsWith('/node_modules')) return acc
+
+      return [...acc, ...recusiveListFiles(filePath)]
+    }
+    return [...acc, filePath]
+  }, [] as string[])

package/src/merge-package-json.ts

@@ -1,75 +0,0 @@
-import path from 'node:path'
-
-import { type Options, pkger } from '@jiek/pkger'
-import { commondir } from '@jiek/utils/commondir'
-import type { Manifest } from '@pnpm/workspace.pkgs-graph'
-
-export function mergePackageJson(manifest: Manifest & {
-  jiek?: Options
-  exports?: unknown | unknown[]
-}, cwd: string, options: {
-  excludeDistInExports?: boolean
-} = {}) {
-  const {
-    excludeDistInExports = false
-  } = options
-  const {
-    jiek: { cwd: _, ...jiek } = {}
-  } = manifest
-  const { outdir = 'dist' } = jiek
-  let { exports } = manifest
-  let includeIndex = false
-  if (typeof exports === 'string') {
-    includeIndex = true
-    exports = { '.': exports }
-  }
-  if (exports === undefined) {
-    exports = { '.': './src/index.ts' }
-  }
-  if (typeof exports === 'object') {
-    if (Array.isArray(exports) && exports.length > 0) {
-      includeIndex = true
-    } else {
-      includeIndex = !!(<Record<string, unknown>>exports)['.']
-    }
-  }
-  let inputs = Array.isArray(exports)
-    ? exports as string[]
-    : Object
-      .entries(<Record<string, unknown>>exports)
-      .reduce((acc, [key, value]) => {
-        if (typeof value === 'string') return key === '.'
-          ? [value, ...acc]
-          : acc.concat(value)
-        if (Array.isArray(value)) return acc.concat(value)
-
-        throw new TypeError(`Unexpected value type for key "${key}" in exports, expected string, got ${typeof value}`)
-      }, [] as string[])
-  if (excludeDistInExports) {
-    inputs = inputs.filter(input => !input.startsWith(`./${outdir}`) && !input.startsWith(outdir))
-  }
-  if (inputs.length === 0)
-    throw new Error('No inputs found')
-
-  const absoluteInputs = inputs.map(input => path.isAbsolute(input)
-    ? input
-    : path.resolve(cwd, input)
-  )
-  let cDir = path.dirname(absoluteInputs[0])
-  if (absoluteInputs.length > 1) {
-    cDir = commondir(absoluteInputs, cwd)
-  }
-  const resolvedInputs = absoluteInputs.map(input => {
-    return path.relative(cDir, input)
-  })
-  return {
-    ...manifest,
-    ...pkger({
-      cwd,
-      noIndex: !includeIndex,
-      source: path.relative(cwd, cDir),
-      inputs: resolvedInputs,
-      ...jiek
-    })
-  }
-}