jiek 1.1.5 → 1.1.6

package/bin/jiek.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { existsSync } from 'node:fs'
-import { resolve, dirname } from 'node:path'
 import { createRequire } from 'node:module'
+import { dirname, resolve } from 'node:path'
 
 const __dirname = dirname(import.meta.url.replace('file://', ''))
 if (existsSync(resolve(__dirname, '../.jiek-dev-tag'))) {

package/dist/cli.cjs

@@ -89,10 +89,12 @@ try {
 } catch {
 }
 if (type$1 !== "") {
-  commander.program.option("-f, --filter <filter>", "filter packages");
+  commander.program.option("-f, --filter <filter>", "filter packages, support fuzzy match and array. e.g. -f core,utils");
 }
-async function getSelectedProjectsGraph() {
-  let filter = commander.program.getOptionValue("filter");
+function filterPackagesGraph(filters) {
+  return Promise.all(filters.map(async (filter) => getSelectedProjectsGraph(filter)));
+}
+async function getSelectedProjectsGraph(filter = commander.program.getOptionValue("filter")) {
   const root = getRoot();
   const { wd, notWorkspace } = getWD();
   if (!notWorkspace && type$1 === "pnpm") {
@@ -141,7 +143,7 @@ async function getSelectedProjectsGraph() {
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.4";
+var version = "1.1.5";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -360,120 +362,125 @@ commander.program.command("build").description(description).option("-s, --silent
   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__default.default.resolve(wd, "node_modules");
-  if (!fs__default.default.existsSync(wdNodeModules)) {
-    fs__default.default.mkdirSync(wdNodeModules);
-  }
-  const jiekTempDir = (...paths) => path__default.default.resolve(wdNodeModules, ".jiek", ...paths);
-  if (!fs__default.default.existsSync(jiekTempDir())) {
-    fs__default.default.mkdirSync(jiekTempDir());
-  }
-  const rollupBinaryPath = require$1.resolve("rollup").replace(/dist\/rollup.js$/, "dist/bin/rollup");
   const multiBars = new cliProgress.MultiBar({
     clearOnComplete: false,
     hideCursor: true,
-    format: "- {bar} | {status} | {input} | {message}"
+    format: "- {bar} | {status} | {pkgName} | {input} | {message}"
   }, cliProgress.Presets.shades_classic);
-  let i = 0;
-  await Promise.all(
-    Object.entries(value).map(async ([dir, manifest]) => {
-      const escapeManifestName = manifest.name?.replace(/^@/g, "").replace(/\//g, "+");
-      const configFile = jiekTempDir(
-        `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
-      );
-      fs__default.default.writeFileSync(configFile, FILE_TEMPLATE(manifest));
-      let prefix = "";
-      if (tsRegisterName) {
-        prefix = `node -r ${tsRegisterName} `;
-      }
-      const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`;
-      const child = execa.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 = {}
+  }) => {
+    if (Object.keys(value).length === 0) {
+      throw new Error("no package found");
+    }
+    const wdNodeModules = path__default.default.resolve(wd, "node_modules");
+    if (!fs__default.default.existsSync(wdNodeModules)) {
+      fs__default.default.mkdirSync(wdNodeModules);
+    }
+    const jiekTempDir = (...paths) => path__default.default.resolve(wdNodeModules, ".jiek", ...paths);
+    if (!fs__default.default.existsSync(jiekTempDir())) {
+      fs__default.default.mkdirSync(jiekTempDir());
+    }
+    const rollupBinaryPath = require$1.resolve("rollup").replace(/dist\/rollup.js$/, "dist/bin/rollup");
+    let i = 0;
+    await Promise.all(
+      Object.entries(value).map(async ([dir, manifest]) => {
+        const escapeManifestName = manifest.name?.replace(/^@/g, "").replace(/\//g, "+");
+        const configFile = jiekTempDir(
+          `${escapeManifestName ?? `anonymous-${i++}`}.rollup.config.js`
+        );
+        fs__default.default.writeFileSync(configFile, FILE_TEMPLATE(manifest));
+        let prefix = "";
+        if (tsRegisterName) {
+          prefix = `node -r ${tsRegisterName} `;
         }
-      });
-      const bars = {};
-      let inputMaxLen = 10;
-      child.on("message", (e) => {
-        if (e.type === "debug")
-          console.log(...Array.isArray(e.data) ? e.data : [e.data]);
-      });
-      !silent && child.on("message", (e) => {
-        if (e.type === "init") {
-          const { leafMap, targetsLength } = e.data;
-          const leafs = Array.from(leafMap.entries()).flatMap(
-            ([input, pathAndCondiions]) => pathAndCondiions.map(([path2, ...conditions]) => ({
-              input,
+        const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`;
+        const child = execa.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 = {};
+        let inputMaxLen = 10;
+        child.on("message", (e) => {
+          if (e.type === "debug")
+            console.log(...Array.isArray(e.data) ? e.data : [e.data]);
+        });
+        !silent && child.on("message", (e) => {
+          if (e.type === "init") {
+            const { leafMap, targetsLength } = e.data;
+            const leafs = Array.from(leafMap.entries()).flatMap(
+              ([input, pathAndCondiions]) => pathAndCondiions.map(([path2, ...conditions]) => ({
+                input,
+                path: path2,
+                conditions
+              }))
+            );
+            console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`);
+            leafs.forEach(({ input }) => {
+              inputMaxLen = Math.max(inputMaxLen, input.length);
+            });
+            leafs.forEach(({ input, path: path2 }) => {
+              const key = `${input}:${path2}`;
+              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: path2,
-              conditions
-            }))
-          );
-          console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`);
-          leafs.forEach(({ input }) => {
-            inputMaxLen = Math.max(inputMaxLen, input.length);
-          });
-          leafs.forEach(({ input, path: path2 }) => {
-            const key = `${input}:${path2}`;
-            if (bars[key])
+              tags,
+              input,
+              event,
+              message
+            } = e.data;
+            const bar = bars[`${input}:${path2}`];
+            if (!bar)
               return;
-            bars[key] = multiBars.create(50, 0, {
-              input: input.padEnd(inputMaxLen),
-              status: "waiting".padEnd(10)
-            }, {
-              barsize: 20,
-              linewrap: true
-            });
-          });
-        }
-        if (e.type === "progress") {
-          const {
-            path: path2,
-            tags,
-            input,
-            event,
-            message
-          } = e.data;
-          const bar = bars[`${input}:${path2}`];
-          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((resolve, reject) => {
-        let errorStr = "";
-        child.stderr?.on("data", (data) => {
-          errorStr += data;
+            bar.update(
+              {
+                start: 0,
+                resolve: 20,
+                end: 50
+              }[event ?? "start"] ?? 0,
+              {
+                input: input.padEnd(inputMaxLen),
+                status: event?.padEnd(10),
+                message: `${tags?.join(", ")}: ${message}`
+              }
+            );
+          }
         });
-        child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`rollup build failed:
+        await new Promise((resolve, reject) => {
+          let errorStr = "";
+          child.stderr?.on("data", (data) => {
+            errorStr += data;
+          });
+          child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`rollup build failed:
 ${errorStr}`)));
-        verbose && child.stdout?.pipe(process.stdout);
-      });
-    })
-  ).finally(() => {
+          verbose && child.stdout?.pipe(process.stdout);
+        });
+      })
+    );
+  };
+  const filters = commander.program.getOptionValue("filter").split(",");
+  const packages = await filterPackagesGraph(filters);
+  await Promise.all(packages.map(buildPackage)).finally(() => {
     multiBars.stop();
   });
   actionDone();

package/dist/cli.js

@@ -58,10 +58,12 @@ try {
 } catch {
 }
 if (type$1 !== "") {
-  program.option("-f, --filter <filter>", "filter packages");
+  program.option("-f, --filter <filter>", "filter packages, support fuzzy match and array. e.g. -f core,utils");
 }
-async function getSelectedProjectsGraph() {
-  let filter = program.getOptionValue("filter");
+function filterPackagesGraph(filters) {
+  return Promise.all(filters.map(async (filter) => getSelectedProjectsGraph(filter)));
+}
+async function getSelectedProjectsGraph(filter = program.getOptionValue("filter")) {
   const root = getRoot();
   const { wd, notWorkspace } = getWD();
   if (!notWorkspace && type$1 === "pnpm") {
@@ -110,7 +112,7 @@ async function getSelectedProjectsGraph() {
 
 var name = "jiek";
 var type = "module";
-var version = "1.1.4";
+var version = "1.1.5";
 var description$1 = "YiJie's personal kits.";
 var bin = {
 	jiek: "bin/jiek.js",
@@ -329,120 +331,125 @@ program.command("build").description(description).option("-s, --silent", "Don't
   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) => 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]) => {
-      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 = {}
+  }) => {
+    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) => 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]) => {
+        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 = {};
-      let inputMaxLen = 10;
-      child.on("message", (e) => {
-        if (e.type === "debug")
-          console.log(...Array.isArray(e.data) ? e.data : [e.data]);
-      });
-      !silent && child.on("message", (e) => {
-        if (e.type === "init") {
-          const { leafMap, targetsLength } = e.data;
-          const leafs = Array.from(leafMap.entries()).flatMap(
-            ([input, pathAndCondiions]) => pathAndCondiions.map(([path2, ...conditions]) => ({
-              input,
+        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 = {};
+        let inputMaxLen = 10;
+        child.on("message", (e) => {
+          if (e.type === "debug")
+            console.log(...Array.isArray(e.data) ? e.data : [e.data]);
+        });
+        !silent && child.on("message", (e) => {
+          if (e.type === "init") {
+            const { leafMap, targetsLength } = e.data;
+            const leafs = Array.from(leafMap.entries()).flatMap(
+              ([input, pathAndCondiions]) => pathAndCondiions.map(([path2, ...conditions]) => ({
+                input,
+                path: path2,
+                conditions
+              }))
+            );
+            console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`);
+            leafs.forEach(({ input }) => {
+              inputMaxLen = Math.max(inputMaxLen, input.length);
+            });
+            leafs.forEach(({ input, path: path2 }) => {
+              const key = `${input}:${path2}`;
+              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: path2,
-              conditions
-            }))
-          );
-          console.log(`Package '${manifest.name}' has ${targetsLength} targets to build`);
-          leafs.forEach(({ input }) => {
-            inputMaxLen = Math.max(inputMaxLen, input.length);
-          });
-          leafs.forEach(({ input, path: path2 }) => {
-            const key = `${input}:${path2}`;
-            if (bars[key])
+              tags,
+              input,
+              event,
+              message
+            } = e.data;
+            const bar = bars[`${input}:${path2}`];
+            if (!bar)
               return;
-            bars[key] = multiBars.create(50, 0, {
-              input: input.padEnd(inputMaxLen),
-              status: "waiting".padEnd(10)
-            }, {
-              barsize: 20,
-              linewrap: true
-            });
-          });
-        }
-        if (e.type === "progress") {
-          const {
-            path: path2,
-            tags,
-            input,
-            event,
-            message
-          } = e.data;
-          const bar = bars[`${input}:${path2}`];
-          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((resolve, reject) => {
-        let errorStr = "";
-        child.stderr?.on("data", (data) => {
-          errorStr += data;
+            bar.update(
+              {
+                start: 0,
+                resolve: 20,
+                end: 50
+              }[event ?? "start"] ?? 0,
+              {
+                input: input.padEnd(inputMaxLen),
+                status: event?.padEnd(10),
+                message: `${tags?.join(", ")}: ${message}`
+              }
+            );
+          }
         });
-        child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`rollup build failed:
+        await new Promise((resolve, reject) => {
+          let errorStr = "";
+          child.stderr?.on("data", (data) => {
+            errorStr += data;
+          });
+          child.once("exit", (code) => code === 0 ? resolve() : reject(new Error(`rollup build failed:
 ${errorStr}`)));
-        verbose && child.stdout?.pipe(process.stdout);
-      });
-    })
-  ).finally(() => {
+          verbose && child.stdout?.pipe(process.stdout);
+        });
+      })
+    );
+  };
+  const filters = program.getOptionValue("filter").split(",");
+  const packages = await filterPackagesGraph(filters);
+  await Promise.all(packages.map(buildPackage)).finally(() => {
     multiBars.stop();
   });
   actionDone();