jiek 1.1.10 → 1.1.12

package/dist/cli.cjs

@@ -149,7 +149,7 @@ async function getSelectedProjectsGraph(filter = commander.program.getOptionValu
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.10";
+var version = "1.1.12";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -391,6 +391,8 @@ module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null
 const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
 const description = `
 Build the package according to the 'exports' field in the package.json.
+If you want to rewrite the rollup command options, you can pass the options after '--'.
+e.g. \`jiek build -- --watch\`
 `.trim();
 function parseBoolean(v) {
   if (v === void 0)
@@ -412,6 +414,19 @@ commander.program.command("build").description(description).option("-o, --outdir
   noClean,
   onlyMin
 }) => {
+  let shouldPassThrough = false;
+  const passThroughOptions = commander.program.parseOptions(process.argv).unknown.reduce(
+    (acc, value) => {
+      if (shouldPassThrough) {
+        acc.push(value);
+      }
+      if (value === "--") {
+        shouldPassThrough = true;
+      }
+      return acc;
+    },
+    []
+  );
   actionRestore();
   const { build } = loadConfig();
   silent = silent ?? build?.silent ?? false;
@@ -467,7 +482,7 @@ commander.program.command("build").description(description).option("-o, --outdir
         if (tsRegisterName) {
           prefix = `node -r ${tsRegisterName} `;
         }
-        const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`;
+        const command = [`${prefix}${rollupBinaryPath} --silent -c ${configFile}`, ...passThroughOptions].join(" ");
         const child = execa.execaCommand(command, {
           ipc: true,
           cwd: dir,
@@ -478,6 +493,8 @@ commander.program.command("build").description(description).option("-o, --outdir
           }
         });
         const bars = {};
+        const times = {};
+        const locks = {};
         let inputMaxLen = 10;
         child.on("message", (e) => {
           if (e.type === "debug")
@@ -503,7 +520,7 @@ commander.program.command("build").description(description).option("-o, --outdir
                 return;
               bars[key] = multiBars.create(50, 0, {
                 pkgName: manifest.name,
-                input: input.padEnd(inputMaxLen),
+                input: input.padEnd(inputMaxLen + 5),
                 status: "waiting".padEnd(10)
               }, {
                 barsize: 20,
@@ -522,6 +539,7 @@ commander.program.command("build").description(description).option("-o, --outdir
             const bar = bars[`${input}:${path2}`];
             if (!bar)
               return;
+            const time = times[`${input}:${path2}`];
             bar.update(
               {
                 start: 0,
@@ -529,12 +547,36 @@ commander.program.command("build").description(description).option("-o, --outdir
                 end: 50
               }[event ?? "start"] ?? 0,
               {
-                input: input.padEnd(inputMaxLen),
+                input: (time ? `${input}(x${time.toString().padStart(2, "0")})` : input).padEnd(inputMaxLen + 5),
                 status: event?.padEnd(10),
                 message: `${tags?.join(", ")}: ${message}`
               }
             );
           }
+          if (e.type === "watchChange") {
+            const {
+              path: path2,
+              input
+            } = e.data;
+            const key = `${input}:${path2}`;
+            const bar = bars[key];
+            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;
+          }
         });
         await new Promise((resolve, reject) => {
           let errorStr = "";

package/dist/cli.js

@@ -118,7 +118,7 @@ async function getSelectedProjectsGraph(filter = program.getOptionValue("filter"
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.10";
+var version = "1.1.12";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -360,6 +360,8 @@ module.exports = require('jiek/rollup').template(${JSON.stringify(manifest, null
 const require = createRequire(import.meta.url);
 const description = `
 Build the package according to the 'exports' field in the package.json.
+If you want to rewrite the rollup command options, you can pass the options after '--'.
+e.g. \`jiek build -- --watch\`
 `.trim();
 function parseBoolean(v) {
   if (v === void 0)
@@ -381,6 +383,19 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
   noClean,
   onlyMin
 }) => {
+  let shouldPassThrough = false;
+  const passThroughOptions = program.parseOptions(process.argv).unknown.reduce(
+    (acc, value) => {
+      if (shouldPassThrough) {
+        acc.push(value);
+      }
+      if (value === "--") {
+        shouldPassThrough = true;
+      }
+      return acc;
+    },
+    []
+  );
   actionRestore();
   const { build } = loadConfig();
   silent = silent ?? build?.silent ?? false;
@@ -436,7 +451,7 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
         if (tsRegisterName) {
           prefix = `node -r ${tsRegisterName} `;
         }
-        const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`;
+        const command = [`${prefix}${rollupBinaryPath} --silent -c ${configFile}`, ...passThroughOptions].join(" ");
         const child = execaCommand(command, {
           ipc: true,
           cwd: dir,
@@ -447,6 +462,8 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
           }
         });
         const bars = {};
+        const times = {};
+        const locks = {};
         let inputMaxLen = 10;
         child.on("message", (e) => {
           if (e.type === "debug")
@@ -472,7 +489,7 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
                 return;
               bars[key] = multiBars.create(50, 0, {
                 pkgName: manifest.name,
-                input: input.padEnd(inputMaxLen),
+                input: input.padEnd(inputMaxLen + 5),
                 status: "waiting".padEnd(10)
               }, {
                 barsize: 20,
@@ -491,6 +508,7 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
             const bar = bars[`${input}:${path2}`];
             if (!bar)
               return;
+            const time = times[`${input}:${path2}`];
             bar.update(
               {
                 start: 0,
@@ -498,12 +516,36 @@ program.command("build").description(description).option("-o, --outdir <OUTDIR>"
                 end: 50
               }[event ?? "start"] ?? 0,
               {
-                input: input.padEnd(inputMaxLen),
+                input: (time ? `${input}(x${time.toString().padStart(2, "0")})` : input).padEnd(inputMaxLen + 5),
                 status: event?.padEnd(10),
                 message: `${tags?.join(", ")}: ${message}`
               }
             );
           }
+          if (e.type === "watchChange") {
+            const {
+              path: path2,
+              input
+            } = e.data;
+            const key = `${input}:${path2}`;
+            const bar = bars[key];
+            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;
+          }
         });
         await new Promise((resolve, reject) => {
           let errorStr = "";

package/dist/rollup/index.cjs

@@ -4652,6 +4652,7 @@ const generateConfigs = (context, options = {}) => {
   const tsOutputSuffix = jsOutputSuffix.replace(/(\.[cm]?)js$/, ".d$1ts");
   const { js: jsOutput, dts: dtsOutput } = resolveOutputControls(context, build.output);
   const rollupOptions = [];
+  const commonPlugins = [];
   if (jsOutput && !WITHOUT_JS) {
     rollupOptions.push({
       input: inputObj,
@@ -4668,6 +4669,7 @@ const generateConfigs = (context, options = {}) => {
         })
       ],
       plugins: [
+        ...commonPlugins,
         pluginNodeResolve.nodeResolve({ exportConditions }),
         import('rollup-plugin-postcss').then(
           ({ default: postcss }) => postcss({
@@ -4704,6 +4706,7 @@ const generateConfigs = (context, options = {}) => {
         }
       ],
       plugins: [
+        ...commonPlugins,
         pluginNodeResolve.nodeResolve({ exportConditions }),
         skip({ patterns: [STYLE_REGEXP] }),
         rollupPluginDts.dts({
@@ -4733,6 +4736,18 @@ const generateConfigs = (context, options = {}) => {
       ]
     });
   }
+  rollupOptions[0].plugins = [
+    {
+      name: "jiek-plugin-watcher",
+      watchChange: (id) => execa.sendMessage(
+        {
+          type: "watchChange",
+          data: { id, name: JIEK_NAME, path: path$1, input }
+        }
+      )
+    },
+    ...rollupOptions[0].plugins
+  ];
   return rollupOptions;
 };
 function template(packageJSON) {

package/dist/rollup/index.js

@@ -4637,6 +4637,7 @@ const generateConfigs = (context, options = {}) => {
   const tsOutputSuffix = jsOutputSuffix.replace(/(\.[cm]?)js$/, ".d$1ts");
   const { js: jsOutput, dts: dtsOutput } = resolveOutputControls(context, build.output);
   const rollupOptions = [];
+  const commonPlugins = [];
   if (jsOutput && !WITHOUT_JS) {
     rollupOptions.push({
       input: inputObj,
@@ -4653,6 +4654,7 @@ const generateConfigs = (context, options = {}) => {
         })
       ],
       plugins: [
+        ...commonPlugins,
         nodeResolve({ exportConditions }),
         import('rollup-plugin-postcss').then(
           ({ default: postcss }) => postcss({
@@ -4689,6 +4691,7 @@ const generateConfigs = (context, options = {}) => {
         }
       ],
       plugins: [
+        ...commonPlugins,
         nodeResolve({ exportConditions }),
         skip({ patterns: [STYLE_REGEXP] }),
         dts({
@@ -4718,6 +4721,18 @@ const generateConfigs = (context, options = {}) => {
       ]
     });
   }
+  rollupOptions[0].plugins = [
+    {
+      name: "jiek-plugin-watcher",
+      watchChange: (id) => sendMessage(
+        {
+          type: "watchChange",
+          data: { id, name: JIEK_NAME, path, input }
+        }
+      )
+    },
+    ...rollupOptions[0].plugins
+  ];
   return rollupOptions;
 };
 function template(packageJSON) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jiek",
   "type": "module",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "YiJie's personal kits.",
   "bin": {
     "jiek": "bin/jiek.js",

package/src/commands/build.ts

@@ -35,6 +35,8 @@ const require = createRequire(import.meta.url)
 
 const description = `
 Build the package according to the 'exports' field in the package.json.
+If you want to rewrite the rollup command options, you can pass the options after '--'.
+e.g. \`jiek build -- --watch\`
 `.trim()
 
 interface BuildOptions extends Record<string, unknown> {
@@ -91,6 +93,23 @@ program
     noClean,
     onlyMin: onlyMin
   }: BuildOptions) => {
+    let shouldPassThrough = false
+
+    const passThroughOptions = program
+      .parseOptions(process.argv)
+      .unknown
+      .reduce(
+        (acc, value) => {
+          if (shouldPassThrough) {
+            acc.push(value)
+          }
+          if (value === '--') {
+            shouldPassThrough = true
+          }
+          return acc
+        },
+        [] as string[]
+      )
     actionRestore()
     const { build } = loadConfig()
     silent = silent ?? build?.silent ?? false
@@ -154,7 +173,7 @@ program
           if (tsRegisterName) {
             prefix = `node -r ${tsRegisterName} `
           }
-          const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`
+          const command = [`${prefix}${rollupBinaryPath} --silent -c ${configFile}`, ...passThroughOptions].join(' ')
           const child = execaCommand(command, {
             ipc: true,
             cwd: dir,
@@ -165,6 +184,8 @@ program
             }
           })
           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: RollupProgressEvent) => {
             if (e.type === 'debug') console.log(...(Array.isArray(e.data) ? e.data : [e.data]))
@@ -190,7 +211,7 @@ program
                 if (bars[key]) return
                 bars[key] = multiBars.create(50, 0, {
                   pkgName: manifest.name,
-                  input: input.padEnd(inputMaxLen),
+                  input: input.padEnd(inputMaxLen + 5),
                   status: 'waiting'.padEnd(10)
                 }, {
                   barsize: 20,
@@ -208,6 +229,7 @@ program
               } = e.data
               const bar = bars[`${input}:${path}`]
               if (!bar) return
+              const time = times[`${input}:${path}`]
               bar.update(
                 {
                   start: 0,
@@ -215,12 +237,39 @@ program
                   end: 50
                 }[event ?? 'start'] ?? 0,
                 {
-                  input: input.padEnd(inputMaxLen),
+                  input: (
+                    time
+                      ? `${input}(x${time.toString().padStart(2, '0')})`
+                      : input
+                  ).padEnd(inputMaxLen + 5),
                   status: event?.padEnd(10),
                   message: `${tags?.join(', ')}: ${message}`
                 }
               )
             }
+            if (e.type === 'watchChange') {
+              const {
+                path,
+                input
+              } = e.data
+              const key = `${input}:${path}`
+              const bar = bars[key]
+              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
+            }
           })
           await new Promise<void>((resolve, reject) => {
             let errorStr = ''

package/src/rollup/base.ts

@@ -65,6 +65,15 @@ export type RollupProgressEvent =
       targetsLength: number
     }
   }
+  | {
+    type: 'watchChange'
+    data: {
+      id: string
+      name: string
+      path: string
+      input: string
+    }
+  }
   | {
     type: 'debug'
     data: unknown

package/src/rollup/index.ts

@@ -11,7 +11,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'
 import terser from '@rollup/plugin-terser'
 import { sendMessage } from 'execa'
 import { isMatch } from 'micromatch'
-import type { InputPluginOption, OutputOptions, OutputPlugin, RollupOptions } from 'rollup'
+import type { InputPluginOption, OutputOptions, OutputPlugin, Plugin, RollupOptions } from 'rollup'
 import esbuild from 'rollup-plugin-esbuild'
 import ts from 'typescript'
 
@@ -245,6 +245,8 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
   const tsOutputSuffix = jsOutputSuffix.replace(/(\.[cm]?)js$/, '.d$1ts')
   const { js: jsOutput, dts: dtsOutput } = resolveOutputControls(context, build.output)
   const rollupOptions: RollupOptions[] = []
+
+  const commonPlugins: Plugin[] = []
   if (jsOutput && !WITHOUT_JS) {
     rollupOptions.push({
       input: inputObj,
@@ -277,6 +279,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
         })
       ],
       plugins: [
+        ...commonPlugins,
         nodeResolve({ exportConditions }),
         import('rollup-plugin-postcss')
           .then(({ default: postcss }) =>
@@ -303,6 +306,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
       ]
     })
   }
+
   if (dtsOutput && !WITHOUT_DTS) {
     rollupOptions.push({
       input: inputObj,
@@ -328,6 +332,7 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
         }
       ],
       plugins: [
+        ...commonPlugins,
         nodeResolve({ exportConditions }),
         skip({ patterns: [STYLE_REGEXP] }),
         dts({
@@ -358,6 +363,20 @@ const generateConfigs = (context: ConfigGenerateContext, options: TemplateOption
       ]
     })
   }
+  // only push the first one a watcher plugin
+  rollupOptions[0].plugins = [
+    {
+      name: 'jiek-plugin-watcher',
+      watchChange: (id) =>
+        sendMessage(
+          {
+            type: 'watchChange',
+            data: { id, name: JIEK_NAME!, path, input }
+          } satisfies RollupProgressEvent
+        )
+    },
+    ...(rollupOptions[0].plugins as any)
+  ]
   return rollupOptions
 }