jiek 2.3.3 → 2.3.4

package/dist/.internal/commands/utils/createAreaManagement.cjs

@@ -0,0 +1,108 @@
+'use strict';
+
+const createAreaManagement = (options) => {
+  const { outputLines } = options;
+  let i = 0;
+  const areaSizeList = [];
+  function create({
+    maxSize: inputMaxSize = options.maxSize ?? 3,
+    header,
+    footer
+  } = {}) {
+    const current = i++;
+    const hasHeader = header !== void 0;
+    const hasFooter = footer !== void 0;
+    areaSizeList.push(hasHeader ? 1 : 0);
+    const waitLogLines = [];
+    let isExited = false;
+    const noLogLines = Promise.withResolvers();
+    const update = () => {
+      if (waitLogLines.length === 0) {
+        if (isExited) noLogLines.resolve();
+        return;
+      }
+      const maxSize = inputMaxSize + (hasHeader ? 1 : 0) + (hasFooter ? 1 : 0);
+      const offset = areaSizeList.reduce((acc, size, index) => {
+        if (index < current) {
+          return acc + size;
+        }
+        return acc;
+      }, 0);
+      const contentLogLines = waitLogLines.splice(0, maxSize);
+      const currentLogLines = [
+        ...hasHeader ? [header] : [],
+        ...contentLogLines,
+        ...hasFooter ? [footer] : []
+      ];
+      const curLen = currentLogLines.length;
+      if (hasFooter && curLen > 0) {
+        const prevAreaSize = areaSizeList[current];
+        areaSizeList[current] -= outputLines.splice(offset + prevAreaSize - 1, 1).length;
+      }
+      for (let i2 = 0; i2 < curLen; i2++) {
+        const isHeader = hasHeader && i2 === 0;
+        const isFooter = hasFooter && i2 === curLen - 1;
+        const line = currentLogLines.shift();
+        const areaSize = areaSizeList[current];
+        let insertIndex = i2;
+        if (areaSize < maxSize) {
+          insertIndex = areaSize - (hasFooter ? 1 : 0);
+          if (!isHeader) {
+            areaSizeList[current]++;
+          }
+        }
+        if (areaSize === maxSize) {
+          outputLines.splice(
+            offset + (hasHeader ? 1 : 0),
+            1
+          );
+          insertIndex = maxSize - 1;
+          if (isFooter) {
+            insertIndex = insertIndex - 1;
+          }
+        }
+        if (isHeader) {
+          outputLines[offset] = line;
+        } else {
+          insertIndex += hasHeader ? 1 : 0;
+          outputLines.splice(
+            offset + insertIndex,
+            0,
+            line
+          );
+        }
+      }
+      options.onAreaUpdate?.();
+    };
+    const timer = setInterval(update, 10);
+    return {
+      exit: async () => {
+        if (waitLogLines.length !== 0) {
+          isExited = true;
+          await noLogLines.promise;
+        }
+        clearTimeout(timer);
+      },
+      info: (message) => {
+        waitLogLines.push(...message.split("\n").filter((s) => s.trim() !== ""));
+      },
+      setHeader: (newHeader) => {
+        if (header == null) {
+          throw new Error('You can only set header when header is already, use create({ header: "header" })');
+        }
+        header = newHeader;
+        update();
+      },
+      setFooter: (newFooter) => {
+        if (footer == null) {
+          throw new Error('You can only set footer when footer is already, use create({ footer: "footer" })');
+        }
+        footer = newFooter;
+        update();
+      }
+    };
+  }
+  return { create };
+};
+
+exports.createAreaManagement = createAreaManagement;

package/dist/.internal/commands/utils/createAreaManagement.d.cts

@@ -0,0 +1,18 @@
+declare const createAreaManagement: (options: {
+    outputLines: string[];
+    onAreaUpdate?: () => void;
+    maxSize?: number;
+}) => {
+    create: ({ maxSize: inputMaxSize, header, footer }?: {
+        maxSize?: number;
+        header?: string;
+        footer?: string;
+    }) => {
+        exit: () => Promise<void>;
+        info: (message: string) => void;
+        setHeader: (newHeader: string) => void;
+        setFooter: (newFooter: string) => void;
+    };
+};
+
+export { createAreaManagement };

package/dist/.internal/commands/utils/createAreaManagement.d.ts

@@ -0,0 +1,18 @@
+declare const createAreaManagement: (options: {
+    outputLines: string[];
+    onAreaUpdate?: () => void;
+    maxSize?: number;
+}) => {
+    create: ({ maxSize: inputMaxSize, header, footer }?: {
+        maxSize?: number;
+        header?: string;
+        footer?: string;
+    }) => {
+        exit: () => Promise<void>;
+        info: (message: string) => void;
+        setHeader: (newHeader: string) => void;
+        setFooter: (newFooter: string) => void;
+    };
+};
+
+export { createAreaManagement };

package/dist/.internal/commands/utils/createAreaManagement.js

@@ -0,0 +1,106 @@
+const createAreaManagement = (options) => {
+  const { outputLines } = options;
+  let i = 0;
+  const areaSizeList = [];
+  function create({
+    maxSize: inputMaxSize = options.maxSize ?? 3,
+    header,
+    footer
+  } = {}) {
+    const current = i++;
+    const hasHeader = header !== void 0;
+    const hasFooter = footer !== void 0;
+    areaSizeList.push(hasHeader ? 1 : 0);
+    const waitLogLines = [];
+    let isExited = false;
+    const noLogLines = Promise.withResolvers();
+    const update = () => {
+      if (waitLogLines.length === 0) {
+        if (isExited) noLogLines.resolve();
+        return;
+      }
+      const maxSize = inputMaxSize + (hasHeader ? 1 : 0) + (hasFooter ? 1 : 0);
+      const offset = areaSizeList.reduce((acc, size, index) => {
+        if (index < current) {
+          return acc + size;
+        }
+        return acc;
+      }, 0);
+      const contentLogLines = waitLogLines.splice(0, maxSize);
+      const currentLogLines = [
+        ...hasHeader ? [header] : [],
+        ...contentLogLines,
+        ...hasFooter ? [footer] : []
+      ];
+      const curLen = currentLogLines.length;
+      if (hasFooter && curLen > 0) {
+        const prevAreaSize = areaSizeList[current];
+        areaSizeList[current] -= outputLines.splice(offset + prevAreaSize - 1, 1).length;
+      }
+      for (let i2 = 0; i2 < curLen; i2++) {
+        const isHeader = hasHeader && i2 === 0;
+        const isFooter = hasFooter && i2 === curLen - 1;
+        const line = currentLogLines.shift();
+        const areaSize = areaSizeList[current];
+        let insertIndex = i2;
+        if (areaSize < maxSize) {
+          insertIndex = areaSize - (hasFooter ? 1 : 0);
+          if (!isHeader) {
+            areaSizeList[current]++;
+          }
+        }
+        if (areaSize === maxSize) {
+          outputLines.splice(
+            offset + (hasHeader ? 1 : 0),
+            1
+          );
+          insertIndex = maxSize - 1;
+          if (isFooter) {
+            insertIndex = insertIndex - 1;
+          }
+        }
+        if (isHeader) {
+          outputLines[offset] = line;
+        } else {
+          insertIndex += hasHeader ? 1 : 0;
+          outputLines.splice(
+            offset + insertIndex,
+            0,
+            line
+          );
+        }
+      }
+      options.onAreaUpdate?.();
+    };
+    const timer = setInterval(update, 10);
+    return {
+      exit: async () => {
+        if (waitLogLines.length !== 0) {
+          isExited = true;
+          await noLogLines.promise;
+        }
+        clearTimeout(timer);
+      },
+      info: (message) => {
+        waitLogLines.push(...message.split("\n").filter((s) => s.trim() !== ""));
+      },
+      setHeader: (newHeader) => {
+        if (header == null) {
+          throw new Error('You can only set header when header is already, use create({ header: "header" })');
+        }
+        header = newHeader;
+        update();
+      },
+      setFooter: (newFooter) => {
+        if (footer == null) {
+          throw new Error('You can only set footer when footer is already, use create({ footer: "footer" })');
+        }
+        footer = newFooter;
+        update();
+      }
+    };
+  }
+  return { create };
+};
+
+export { createAreaManagement };

package/dist/.internal/polyfill.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+if (typeof Promise.withResolvers === "undefined") {
+  Promise.withResolvers = () => {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}

package/dist/.internal/polyfill.d.cts

@@ -0,0 +1 @@
+export {  }

package/dist/.internal/polyfill.d.ts

@@ -0,0 +1 @@
+export {  }

package/dist/.internal/polyfill.js

@@ -0,0 +1,11 @@
+if (typeof Promise.withResolvers === "undefined") {
+  Promise.withResolvers = () => {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}

package/dist/.internal/utils/filterSupport.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var filterSupport = require('../.chunks/filterSupport.4rM7f6jB.cjs');
+var filterSupport = require('../.chunks/getWD.Bdo2NGCR.cjs');
 require('node:fs');
 require('node:path');
 require('node:process');

package/dist/.internal/utils/filterSupport.js

@@ -1,8 +1,8 @@
-export { f as filterPackagesGraph, a as getSelectedProjectsGraph, t as type } from '../.chunks/filterSupport.BXWpLBpT.js';
+export { f as filterPackagesGraph, a as getSelectedProjectsGraph, t as type } from '../.chunks/getWD.DGvwAHMY.js';
 import 'node:fs';
 import 'node:path';
 import 'node:process';
 import 'commander';
 import 'js-yaml';
-import 'node:module';
 import '@jiek/utils/getWorkspaceDir';
+import 'node:module';

package/dist/.internal/utils/loadConfig.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-require('../.chunks/filterSupport.4rM7f6jB.cjs');
+require('../.chunks/getWD.Bdo2NGCR.cjs');
 require('node:fs');
 require('node:path');
+require('node:process');
 require('commander');
 require('js-yaml');
-var loadConfig = require('../.chunks/loadConfig.OOKddvHF.cjs');
-require('node:process');
+var loadConfig = require('../.chunks/loadConfig.8xhNFEJe.cjs');
 require('@jiek/utils/getWorkspaceDir');
 
 

package/dist/.internal/utils/loadConfig.d.cts

@@ -3,6 +3,7 @@ import { Config } from 'jiek';
 interface LoadConfigOptions {
     dir?: string;
     root?: string;
+    configPath?: string;
 }
 declare function loadConfig(options?: LoadConfigOptions): Config;
 declare function loadConfig(dir?: string): Config;

package/dist/.internal/utils/loadConfig.d.ts

@@ -3,6 +3,7 @@ import { Config } from 'jiek';
 interface LoadConfigOptions {
     dir?: string;
     root?: string;
+    configPath?: string;
 }
 declare function loadConfig(options?: LoadConfigOptions): Config;
 declare function loadConfig(dir?: string): Config;

package/dist/.internal/utils/loadConfig.js

@@ -1,9 +1,9 @@
-import '../.chunks/filterSupport.BXWpLBpT.js';
+import '../.chunks/getWD.DGvwAHMY.js';
 import 'node:fs';
 import 'node:path';
+import 'node:process';
 import 'commander';
 import 'js-yaml';
-export { l as loadConfig } from '../.chunks/loadConfig.CFfzkm_p.js';
-import 'node:module';
-import 'node:process';
+export { l as loadConfig } from '../.chunks/loadConfig.BjzxLOdC.js';
 import '@jiek/utils/getWorkspaceDir';
+import 'node:module';

package/dist/.internal/utils/pascalCase.cjs

@@ -0,0 +1,5 @@
+'use strict';
+
+const pascalCase = (str) => str.replace(/[@|/-](\w)/g, (_, $1) => $1.toUpperCase()).replace(/(?:^|-)(\w)/g, (_, $1) => $1.toUpperCase());
+
+exports.pascalCase = pascalCase;

package/dist/.internal/utils/pascalCase.d.cts

@@ -0,0 +1,3 @@
+declare const pascalCase: (str: string) => string;
+
+export { pascalCase };

package/dist/.internal/utils/pascalCase.d.ts

@@ -0,0 +1,3 @@
+declare const pascalCase: (str: string) => string;
+
+export { pascalCase };

package/dist/.internal/utils/pascalCase.js

@@ -0,0 +1,3 @@
+const pascalCase = (str) => str.replace(/[@|/-](\w)/g, (_, $1) => $1.toUpperCase()).replace(/(?:^|-)(\w)/g, (_, $1) => $1.toUpperCase());
+
+export { pascalCase };

package/dist/.internal/utils/reveal.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const reveal = (obj, keys) => keys.reduce((acc, key) => {
+  if (typeof acc === "string") throw new Error("key not found in exports");
+  if (!(key in acc)) throw new Error(`key ${key} not found in exports`);
+  return acc[key];
+}, obj);
+
+exports.reveal = reveal;

package/dist/.internal/utils/reveal.d.cts

@@ -0,0 +1,3 @@
+declare const reveal: (obj: string | Record<string, unknown>, keys: string[]) => string | Record<string, unknown>;
+
+export { reveal };

package/dist/.internal/utils/reveal.d.ts

@@ -0,0 +1,3 @@
+declare const reveal: (obj: string | Record<string, unknown>, keys: string[]) => string | Record<string, unknown>;
+
+export { reveal };

package/dist/.internal/utils/reveal.js

@@ -0,0 +1,7 @@
+const reveal = (obj, keys) => keys.reduce((acc, key) => {
+  if (typeof acc === "string") throw new Error("key not found in exports");
+  if (!(key in acc)) throw new Error(`key ${key} not found in exports`);
+  return acc[key];
+}, obj);
+
+export { reveal };

package/dist/bin/index.cjs

@@ -1,41 +1,25 @@
 'use strict';
 
-require('#~/bin/common');
-var childProcess = require('node:child_process');
+require('#~/polyfill');
+var node_child_process = require('node:child_process');
 var fs = require('node:fs');
 var path = require('node:path');
 var process = require('node:process');
-var bumper = require('@jiek/utils/bumper');
+var cliProgress = require('cli-progress');
 var commander = require('commander');
 var detectIndent = require('detect-indent');
 var jsoncParser = require('jsonc-parser');
+var bumper = require('@jiek/utils/bumper');
+var createAreaManagement = require('#~/commands/utils/createAreaManagement');
 var filterSupport = require('#~/utils/filterSupport');
+var getInternalModuleName = require('#~/utils/getInternalModuleName');
 var loadConfig = require('#~/utils/loadConfig');
 var resolveExports = require('#~/utils/resolveExports');
-var getInternalModuleName = require('#~/utils/getInternalModuleName');
+require('#~/bin/common');
 var parseArgv = require('#~/bin/parseArgv');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var childProcess__namespace = /*#__PURE__*/_interopNamespace(childProcess);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var process__default = /*#__PURE__*/_interopDefault(process);
@@ -52,23 +36,31 @@ 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();
-async function forEachSelectedProjectsGraphEntries(callback) {
+async function forEachSelectedProjectsGraphEntries(callback, selectedProjectsGraphEntriesCallback) {
   const { value = {} } = await filterSupport.getSelectedProjectsGraph() ?? {};
   const selectedProjectsGraphEntries = Object.entries(value);
   if (selectedProjectsGraphEntries.length === 0) {
     throw new Error("no packages selected");
   }
-  for (const [dir, manifest] of selectedProjectsGraphEntries) {
-    callback(dir, manifest);
-  }
+  await selectedProjectsGraphEntriesCallback?.(selectedProjectsGraphEntries);
+  const tasks = selectedProjectsGraphEntries.map(
+    async ([dir, manifest], index, entries) => callback(
+      dir,
+      manifest,
+      index,
+      entries
+    )
+  );
+  await Promise.all(tasks);
 }
 const attachPublishOptions = (command) => command.option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").option("--skipJS", 'skip entries which end with ".js"');
 attachPublishOptions(
   commander.program.command("publish").description(description).aliases(["pub", "p"])
-).action(async ({
+).option("--no-parallel", "Disable parallel publish").action(async ({
   outdir,
-  bumper: bumper$1,
-  skipJS
+  bumper,
+  skipJS,
+  parallel
 }) => {
   let shouldPassThrough = false;
   const passThroughOptions = process__default.default.argv.reduce(
@@ -83,23 +75,89 @@ attachPublishOptions(
     },
     []
   );
-  await forEachSelectedProjectsGraphEntries((dir) => {
-    const args = ["pnpm", "publish", "--access", "public", "--no-git-checks"];
-    if (bumper$1 && bumper.TAGS.includes(bumper$1)) {
-      args.push("--tag", bumper$1);
+  const mb = new cliProgress.MultiBar({
+    hideCursor: true,
+    format: "{message}"
+  });
+  const bars = {};
+  const outputLines = [];
+  function render() {
+    let i;
+    for (i = 0; i < outputLines.length; i++) {
+      let bar = bars[i];
+      if (!bar) {
+        bars[i] = bar = mb.create(0, 0, { message: "" });
+      }
+      bar.update({ message: outputLines[i] });
+    }
+    for (; i < Object.keys(bars).length; i++) {
+      mb.remove(bars[i]);
     }
+  }
+  const areaManagement = parallel ? createAreaManagement.createAreaManagement({
+    maxSize: 5,
+    outputLines,
+    onAreaUpdate: render
+  }) : void 0;
+  await forEachSelectedProjectsGraphEntries(async (dir, { name }) => {
+    const relativePath = path__default.default.relative(process__default.default.cwd(), dir);
+    const config = loadConfig.loadConfig(dir);
+    const { parallel: genParallelConfig } = config.publish ?? {};
+    const args = ["pnpm", "publish"];
     args.push(...passThroughOptions);
-    childProcess__namespace.execSync(args.join(" "), {
-      cwd: dir,
-      stdio: "inherit",
-      env: {
-        ...process__default.default.env,
-        JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
-        JIEK_PUBLISH_BUMPER: JSON.stringify(bumper$1),
-        JIEK_PUBLISH_SKIP_JS: JSON.stringify(skipJS)
+    const env = {
+      ...process__default.default.env,
+      JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
+      JIEK_PUBLISH_BUMPER: JSON.stringify(bumper),
+      JIEK_PUBLISH_SKIP_JS: JSON.stringify(skipJS)
+    };
+    const tag = bumper === false || ["minor", "major", "patch"].includes(bumper) ? "latest" : bumper;
+    const parallelConfig = parallel ? genParallelConfig?.(tag) : {};
+    async function pubByPnpm(type, attachArgs = [], isReady = false) {
+      const area = areaManagement?.create({
+        header: `\u250C publishing [${name}${type ? `@${type}` : ""}] ./${relativePath}`,
+        footer: "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"
+      });
+      const info = (message) => area?.info(
+        message.trim().split("\n").map((s) => `\u2502 ${s}`).join("\n")
+      );
+      area && info("waiting for ready...");
+      isReady && await isReady;
+      const child = node_child_process.exec(
+        [...args, ...attachArgs, "--tag", type ?? tag].join(" "),
+        { cwd: dir, windowsHide: true, env }
+      );
+      try {
+        if (area) {
+          child.stdout?.on("data", (data) => info(data));
+          child.stderr?.on("data", (data) => info(data));
+        } else {
+          child.stdout?.pipe(process__default.default.stdout);
+          child.stderr?.pipe(process__default.default.stderr);
+        }
+      } finally {
+        await new Promise((resolve) => {
+          child.once("exit", (code) => {
+            if (code === 0) {
+              resolve();
+            } else {
+              info(`pnpm publish exited with code ${code}`);
+              resolve();
+            }
+          });
+        });
+        await area?.exit();
       }
-    });
+    }
+    const buildEnd = Promise.withResolvers();
+    await Promise.all([
+      pubByPnpm().then(() => buildEnd.resolve()).catch((e) => buildEnd.reject(e)),
+      ...Object.entries(parallelConfig ?? {}).map(async ([type]) => {
+        await pubByPnpm(type, ["--ignore-scripts"], buildEnd.promise);
+      })
+    ]);
   });
+  mb.stop();
 });
 async function prepublish({
   bumper: bumper$1,

package/dist/index.d.cts

@@ -35,6 +35,12 @@ declare module 'jiek' {
              * @default true
              */
             withSource?: boolean;
+            parallel?: (tag: string) => false | void | null | Record<string, {
+                include?: string[];
+                overrideInclude?: string[];
+                exclude?: string[];
+                overrideExclude?: string[];
+            }>;
         };
     }
 }
@@ -42,6 +48,7 @@ declare module 'jiek' {
 interface ConfigExperimental {
 }
 interface Config {
+    extends?: string;
     experimental?: ConfigExperimental;
 }
 declare const defineConfig: (config: Config) => Config;

package/dist/index.d.ts

@@ -35,6 +35,12 @@ declare module 'jiek' {
              * @default true
              */
             withSource?: boolean;
+            parallel?: (tag: string) => false | void | null | Record<string, {
+                include?: string[];
+                overrideInclude?: string[];
+                exclude?: string[];
+                overrideExclude?: string[];
+            }>;
         };
     }
 }
@@ -42,6 +48,7 @@ declare module 'jiek' {
 interface ConfigExperimental {
 }
 interface Config {
+    extends?: string;
     experimental?: ConfigExperimental;
 }
 declare const defineConfig: (config: Config) => Config;