jiek 2.0.1 → 2.0.2-alpha.2

package/dist/index.d.cts

@@ -90,59 +90,6 @@ declare module 'jiek' {
     }
 }
 
-declare module 'jiek' {
-    type InitNamedFunction = (argument: string, paths: {
-        full: string;
-        relative: string;
-        basename?: string;
-    }) => [name?: string, path?: string];
-    type InitNamed = InitNamedFunction | {
-        [key: string]: string | InitNamedFunction;
-    };
-    interface Config {
-        init?: {
-            /**
-             * the package.json template file path or file content
-             *
-             * if it can be parsed as json, it will be parsed
-             * if it is a relative file path, it will be resolved to an absolute path based on the current working directory
-             * if it is an absolute file path, it will be used directly
-             * @default '.jiek.template.package.json'
-             */
-            template?: string;
-            /**
-             * the readme content
-             *
-             * $name will be replaced with the package name
-             * $license will be replaced with the license
-             */
-            readme?: string | ((ctx: {
-                dir: string;
-                packageJson: Record<string, any>;
-            }) => string);
-            /**
-             * the readme template file path
-             * @default '.jiek.template.readme.md'
-             */
-            readmeTemplate?: string;
-            bug?: {
-                /**
-                 * @default 'bug_report.yml'
-                 */
-                template?: string;
-                /**
-                 * @default ['bug']
-                 */
-                labels?: string[] | ((ctx: {
-                    name: string;
-                    dir: string;
-                }) => string[]);
-            };
-            named?: InitNamed;
-        };
-    }
-}
-
 declare module 'jiek' {
     interface Config {
         publish?: {

package/dist/index.d.ts

@@ -90,59 +90,6 @@ declare module 'jiek' {
     }
 }
 
-declare module 'jiek' {
-    type InitNamedFunction = (argument: string, paths: {
-        full: string;
-        relative: string;
-        basename?: string;
-    }) => [name?: string, path?: string];
-    type InitNamed = InitNamedFunction | {
-        [key: string]: string | InitNamedFunction;
-    };
-    interface Config {
-        init?: {
-            /**
-             * the package.json template file path or file content
-             *
-             * if it can be parsed as json, it will be parsed
-             * if it is a relative file path, it will be resolved to an absolute path based on the current working directory
-             * if it is an absolute file path, it will be used directly
-             * @default '.jiek.template.package.json'
-             */
-            template?: string;
-            /**
-             * the readme content
-             *
-             * $name will be replaced with the package name
-             * $license will be replaced with the license
-             */
-            readme?: string | ((ctx: {
-                dir: string;
-                packageJson: Record<string, any>;
-            }) => string);
-            /**
-             * the readme template file path
-             * @default '.jiek.template.readme.md'
-             */
-            readmeTemplate?: string;
-            bug?: {
-                /**
-                 * @default 'bug_report.yml'
-                 */
-                template?: string;
-                /**
-                 * @default ['bug']
-                 */
-                labels?: string[] | ((ctx: {
-                    name: string;
-                    dir: string;
-                }) => string[]);
-            };
-            named?: InitNamed;
-        };
-    }
-}
-
 declare module 'jiek' {
     interface Config {
         publish?: {

package/dist/package.json

@@ -0,0 +1,125 @@
+{
+  "name": "jiek",
+  "type": "module",
+  "version": "2.0.2-alpha.2",
+  "description": "A lightweight toolkit for compiling and managing libraries based on `package.json` metadata and suitable for `Monorepo`.",
+  "author": "YiJie <yijie4188@gmail.com>",
+  "repository": {
+    "url": "nwylzw/jiek",
+    "directory": "packages/jiek"
+  },
+  "homepage": "https://github.com/NWYLZW/jiek/tree/master/packages/jiek#readme",
+  "bugs": "https://github.com/NWYLZW/jiek/issues?q=is%3Aissue+is%3Aopen+jiek",
+  "bin": {
+    "jiek": "bin/jiek.js",
+    "jk": "bin/jiek.js",
+    "jiek-build": "bin/jiek-build.js",
+    "jb": "bin/jiek-build.js"
+  },
+  "files": ["dist", "src", "bin", "LICENSE", "README.md"],
+  "scripts": {
+    "prepublish": "jb -nm -nc"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./src/index.ts",
+    "./cli": "./src/cli.ts",
+    "./cli-only-build": "./src/cli-only-build.ts",
+    "./rollup": "./src/rollup/index.ts"
+  },
+  "imports": {
+    "#~/*": "./src/*"
+  },
+  "dependencies": {
+    "@jiek/pkger": "workspace:^",
+    "@jiek/rollup-plugin-dts": "^6.2.1",
+    "@jiek/utils": "workspace:^",
+    "@inquirer/prompts": "^7.1.0",
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "cli-progress": "^3.12.0",
+    "commander": "^12.0.0",
+    "detect-indent": "^6.1.0",
+    "execa": "9.3.1",
+    "js-yaml": "^4.1.0",
+    "jsonc-parser": "^3.2.1",
+    "rollup": "4.13.2"
+  },
+  "peerDependencies": {
+    "@rollup/plugin-terser": "^0.4.4",
+    "@pnpm/filter-workspace-packages": "^7.2.13",
+    "esbuild-register": "^3.5.0",
+    "postcss": "^8.4.47",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-esbuild": "^6.1.0",
+    "rollup-plugin-swc3": "^0.12.1",
+    "typescript": "^4.0.0||^5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@rollup/plugin-terser": { "optional": true },
+    "@pnpm/filter-workspace-packages": { "optional": true },
+    "esbuild-register": { "optional": true },
+    "postcss": { "optional": true },
+    "rollup-plugin-postcss": { "optional": true },
+    "rollup-plugin-esbuild": { "optional": true },
+    "rollup-plugin-swc3": { "optional": true },
+    "typescript": { "optional": true }
+  },
+  "devDependencies": {
+    "@npm/types": "^1.0.2",
+    "@pnpm/filter-workspace-packages": "^7.2.13",
+    "@pnpm/workspace.pkgs-graph": "^2.0.15",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/cli-progress": "^3.11.5",
+    "@types/inquirer": "^9.0.7",
+    "@types/js-yaml": "^4.0.9",
+    "@types/micromatch": "^4.0.6",
+    "esbuild-register": "^3.5.0",
+    "micromatch": "^4.0.5",
+    "node-sass": "^9.0.0",
+    "postcss": "^8.4.47",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-esbuild": "^6.1.0",
+    "rollup-plugin-swc3": "^0.12.1"
+  },
+  "publishConfig": {
+    "exports": {
+      "./package.json": "./package.json",
+      ".": {
+        "source": "./src/index.ts",
+        "require": "./dist/index.cjs",
+        "default": "./dist/index.js"
+      },
+      "./cli": {
+        "source": "./src/cli.ts",
+        "require": "./dist/cli.cjs",
+        "default": "./dist/cli.js"
+      },
+      "./cli-only-build": {
+        "source": "./src/cli-only-build.ts",
+        "require": "./dist/cli-only-build.cjs",
+        "default": "./dist/cli-only-build.js"
+      },
+      "./rollup": {
+        "source": "./src/rollup/index.ts",
+        "require": "./dist/rollup/index.cjs",
+        "default": "./dist/rollup/index.js"
+      }
+    },
+    "main": "./dist/index.cjs",
+    "module": "./dist/index.js",
+    "typesVersions": {
+      "<5.0": {
+        "*": [
+          "*",
+          "./dist/*",
+          "./dist/*/index.d.ts",
+          "./dist/*/index.d.mts",
+          "./dist/*/index.d.cts"
+        ]
+      }
+    },
+    "directory": "./dist"
+  }
+}

package/dist/rollup/index.cjs

@@ -4503,7 +4503,7 @@ const {
   JIEK_WITHOUT_DTS,
   JIEK_WITHOUT_MINIFY,
   JIEK_MINIFY_TYPE,
-  JIEK_NO_CLEAN,
+  JIEK_CLEAN,
   JIEK_ONLY_MINIFY,
   JIEK_TSCONFIG,
   JIEK_DTSCONFIG
@@ -4527,7 +4527,7 @@ const WITHOUT_JS = JIEK_WITHOUT_JS === "true";
 const WITHOUT_DTS = JIEK_WITHOUT_DTS === "true";
 const WITHOUT_MINIFY = JIEK_WITHOUT_MINIFY === "true";
 const ONLY_MINIFY = JIEK_ONLY_MINIFY === "true";
-const CLEAN = JIEK_NO_CLEAN !== "true";
+const CLEAN = JIEK_CLEAN === "true";
 const MINIFY_DEFAULT_VALUE = WITHOUT_MINIFY ? false : ONLY_MINIFY ? "only-minify" : true;
 const BUILDER_OPTIONS = {
   type: JIEK_BUILDER ?? "esbuild"

package/dist/rollup/index.js

@@ -4490,7 +4490,7 @@ const {
   JIEK_WITHOUT_DTS,
   JIEK_WITHOUT_MINIFY,
   JIEK_MINIFY_TYPE,
-  JIEK_NO_CLEAN,
+  JIEK_CLEAN,
   JIEK_ONLY_MINIFY,
   JIEK_TSCONFIG,
   JIEK_DTSCONFIG
@@ -4514,7 +4514,7 @@ const WITHOUT_JS = JIEK_WITHOUT_JS === "true";
 const WITHOUT_DTS = JIEK_WITHOUT_DTS === "true";
 const WITHOUT_MINIFY = JIEK_WITHOUT_MINIFY === "true";
 const ONLY_MINIFY = JIEK_ONLY_MINIFY === "true";
-const CLEAN = JIEK_NO_CLEAN !== "true";
+const CLEAN = JIEK_CLEAN === "true";
 const MINIFY_DEFAULT_VALUE = WITHOUT_MINIFY ? false : ONLY_MINIFY ? "only-minify" : true;
 const BUILDER_OPTIONS = {
   type: JIEK_BUILDER ?? "esbuild"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.2-alpha.2",
   "description": "A lightweight toolkit for compiling and managing libraries based on `package.json` metadata and suitable for `Monorepo`.",
   "author": "YiJie <yijie4188@gmail.com>",
   "repository": {
@@ -25,32 +25,17 @@
   ],
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "source": "./src/index.ts",
-      "require": "./dist/index.cjs",
-      "default": "./dist/index.js"
-    },
-    "./cli": {
-      "source": "./src/cli.ts",
-      "require": "./dist/cli.cjs",
-      "default": "./dist/cli.js"
-    },
-    "./cli-only-build": {
-      "source": "./src/cli-only-build.ts",
-      "require": "./dist/cli-only-build.cjs",
-      "default": "./dist/cli-only-build.js"
-    },
-    "./rollup": {
-      "source": "./src/rollup/index.ts",
-      "require": "./dist/rollup/index.cjs",
-      "default": "./dist/rollup/index.js"
-    }
+    ".": "./src/index.ts",
+    "./cli": "./src/cli.ts",
+    "./cli-only-build": "./src/cli-only-build.ts",
+    "./rollup": "./src/rollup/index.ts"
   },
   "imports": {
     "#~/*": "./src/*"
   },
   "dependencies": {
     "@jiek/rollup-plugin-dts": "^6.2.1",
+    "@inquirer/prompts": "^7.1.0",
     "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -58,7 +43,6 @@
     "commander": "^12.0.0",
     "detect-indent": "^6.1.0",
     "execa": "9.3.1",
-    "inquirer": "^8.2.6",
     "js-yaml": "^4.1.0",
     "jsonc-parser": "^3.2.1",
     "rollup": "4.13.2",
@@ -119,19 +103,6 @@
     "rollup-plugin-swc3": "^0.12.1"
   },
   "scripts": {
-    "prepublish": "jb --noMin"
-  },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "typesVersions": {
-    "<5.0": {
-      "*": [
-        "*",
-        "./dist/*",
-        "./dist/*/index.d.ts",
-        "./dist/*/index.d.mts",
-        "./dist/*/index.d.cts"
-      ]
-    }
+    "prepublish": "jb -nm -nc"
   }
 }

package/src/cli.ts

@@ -1,3 +1,2 @@
-import './commands/init'
 import './commands/publish'
 import 'jiek/cli-only-build'

package/src/commands/build.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
 
+import { confirm } from '@inquirer/prompts'
 import { MultiBar, Presets } from 'cli-progress'
 import { program } from 'commander'
 import { execaCommand } from 'execa'
@@ -40,7 +41,7 @@ const isDefault = process.env.JIEK_IS_ONLY_BUILD === 'true'
 
 const description = `
 Build the package according to the 'exports' field from the package.json.
-If you want to rewrite the \`rollup\` command options, you can pass the options after '--'.
+If you want to through the options to the \`rollup\` command, you can pass the options after '--'.
 ${isDefault ? 'This command is the default command.' : ''}
 `.trim()
 
@@ -100,12 +101,13 @@ async function checkDependency(dependency: string) {
     require.resolve(dependency)
   } catch (e) {
     console.error(`The package '${dependency}' is not installed, please install it first.`)
-    const answer = prompt('Do you want to install it now? (Y/n)', 'Y')
     const { notWorkspace } = getWD()
-    if (answer === 'Y') {
-      await execaCommand(`pnpm install -${notWorkspace ? '' : 'w'}D ${dependency}`)
+    const command = `pnpm install -${notWorkspace ? '' : 'w'}D ${dependency}`
+    if (await confirm({ message: 'Do you want to install it now?' })) {
+      await execaCommand(command)
     } else {
-      return
+      console.warn(`You can run the command '${command}' to install it manually.`)
+      process.exit(1)
     }
   }
 }
@@ -137,24 +139,19 @@ If you pass the --entries option, it will merge into the entries of the command.
 `.trim()
 
 const command = isDefault
-  ? program
-    .name('jb/jiek-build')
-    .helpCommand(false)
+  ? (() => {
+    const c = program
+      .name('jb/jiek-build')
+      .helpCommand(false)
+    if (IS_WORKSPACE) {
+      c.argument('[filters]', buildFilterDescription)
+    } else {
+      c.argument('[entries]', buildEntriesDescription)
+    }
+    return c
+  })()
   : program
-
-if (IS_WORKSPACE) {
-  if (isDefault) {
-    command.argument('[filters]', buildFilterDescription)
-  } else {
-    command.command('build [filters]')
-  }
-} else {
-  if (isDefault) {
-    command.argument('[entries]', buildEntriesDescription)
-  } else {
-    command.command('build [entries]')
-  }
-}
+    .command(`build [${IS_WORKSPACE ? 'filters' : 'entries'}]`)
 
 command
   .description(description)

package/src/commands/publish.ts

@@ -28,8 +28,14 @@ declare module 'jiek' {
   }
 }
 
+const description = `
+Publish package to npm registry, and auto generate exports field and other fields in published package.json.
+If you want to through the options to the \`pnpm publish\` command, you can pass the options after '--'.
+`.trim()
+
 program
   .command('publish')
+  .description(description)
   .aliases(['pub', 'p'])
   .option('-b, --bumper <bumper>', 'bump version', 'patch')
   .option('-no-b, --no-bumper', 'no bump version')
@@ -42,6 +48,21 @@ program
     silent?: boolean
     bumper: false | BumperType
   }) => {
+    let shouldPassThrough = false
+
+    const passThroughOptions = process.argv
+      .reduce(
+        (acc, value) => {
+          if (shouldPassThrough) {
+            acc.push(value)
+          }
+          if (value === '--') {
+            shouldPassThrough = true
+          }
+          return acc
+        },
+        [] as string[]
+      )
     actionRestore()
 
     const { value = {} } = await getSelectedProjectsGraph() ?? {}
@@ -83,7 +104,9 @@ program
         return acc
       }, [] as string[])
     for (const [dir, manifest, resolvedOutdir] of manifests) {
-      const oldJSONString = fs.readFileSync(path.join(dir, 'package.json'), 'utf-8')
+      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 newVersion = bumper ? bump(oldJSON.version, bumper) : oldJSON.version
       // TODO detectIndent by editorconfig
@@ -178,26 +201,41 @@ program
           { formattingOptions }
         )
       )
+      newJSONString = applyEdits(
+        newJSONString,
+        modify(newJSONString, ['publishConfig', 'directory'], resolvedOutdir, { formattingOptions })
+      )
+      !silent && console.log(newJSONString)
+      if (preview) {
+        continue
+      }
+      const effects: (() => void)[] = []
       try {
-        fs.renameSync(path.join(dir, 'package.json'), path.join(dir, 'package.json.bak'))
-        fs.writeFileSync(path.join(dir, 'package.json'), newJSONString)
-        !silent && console.log(newJSONString)
-        if (preview) {
-          continue
+        // fs.renameSync(resolveByDir('package.json'), resolveByDir('package.json.bak'))
+
+        if (!fs.existsSync(resolveByDir(resolvedOutdir))) {
+          fs.mkdirSync(resolveByDir(resolvedOutdir))
+          effects.push(() => fs.rmdirSync(resolveByDir(resolvedOutdir), { recursive: true }))
         }
+        // fs.writeFileSync(resolveByDir('package.json'), newJSONString)
+        fs.writeFileSync(resolveByDir(resolvedOutdir, 'package.json'), newJSONString)
+        effects.push(() => fs.unlinkSync(resolveByDir(resolvedOutdir, 'package.json')))
+
+        const modifyVersionPackageJSON = applyEdits(oldJSONString, modify(oldJSONString, ['version'], newVersion, {}))
+        fs.writeFileSync(resolveByDir('package.json'), modifyVersionPackageJSON)
+        effects.push(() => fs.writeFileSync(resolveByDir('package.json'), oldJSONString))
+
         const args = ['pnpm', 'publish', '--access', 'public', '--no-git-checks', ...passArgs]
         if (bumper && TAGS.includes(bumper)) {
           args.push('--tag', bumper)
         }
+        args.push(...passThroughOptions)
         childProcess.execSync(args.join(' '), {
           cwd: dir,
           stdio: 'inherit'
         })
-        const modifyVersionPackageJSON = applyEdits(oldJSONString, modify(oldJSONString, ['version'], newVersion, {}))
-        fs.writeFileSync(path.join(dir, 'package.json.bak'), modifyVersionPackageJSON)
       } finally {
-        fs.unlinkSync(path.join(dir, 'package.json'))
-        fs.renameSync(path.join(dir, 'package.json.bak'), path.join(dir, 'package.json'))
+        effects.forEach(effect => effect())
       }
     }
     actionDone()

package/src/rollup/index.ts

@@ -39,7 +39,7 @@ const {
   JIEK_WITHOUT_DTS,
   JIEK_WITHOUT_MINIFY,
   JIEK_MINIFY_TYPE,
-  JIEK_NO_CLEAN,
+  JIEK_CLEAN,
   JIEK_ONLY_MINIFY,
   JIEK_TSCONFIG,
   JIEK_DTSCONFIG
@@ -74,7 +74,7 @@ const WITHOUT_MINIFY = JIEK_WITHOUT_MINIFY === 'true'
 
 const ONLY_MINIFY = JIEK_ONLY_MINIFY === 'true'
 
-const CLEAN = JIEK_NO_CLEAN !== 'true'
+const CLEAN = JIEK_CLEAN === 'true'
 
 const MINIFY_DEFAULT_VALUE = WITHOUT_MINIFY
   ? false