jiek 0.4.7-alpha.3 → 0.4.7-alpha.4

package/bin/jiek.js

@@ -1,10 +1,13 @@
-#!/usr/bin/env node
-const fs = require('node:fs')
-const path = require('node:path')
+#!/usr/bin/env node -m
+import { existsSync } from 'node:fs'
+import { resolve, dirname } from 'node:path'
+import { createRequire } from 'node:module'
 
-if (fs.existsSync(path.join(__dirname, '../.jiek-dev-tag'))) {
+const __dirname = dirname(import.meta.url.replace('file://', ''))
+if (existsSync(resolve(__dirname, '../.jiek-dev-tag'))) {
+  const require = createRequire(import.meta.url)
   require('esbuild-register')
-  require('../src/cli.ts')
+  require('../src/cli')
 } else {
-  require('jiek/cli')
+  import('jiek/cli')
 }

package/dist/{cli.mjs → cli.cjs}

@@ -1,24 +1,45 @@
-import fs from 'node:fs';
-import path, { resolve as resolve$1, relative } from 'node:path';
-import { filterPackagesFromDir } from '@pnpm/filter-workspace-packages';
-import { program } from 'commander';
-import { load } from 'js-yaml';
-import { isWorkspaceDir, getWorkspaceDir } from '@jiek/utils/getWorkspaceDir';
-import { MultiBar, Presets } from 'cli-progress';
-import { execaCommand } from 'execa';
-import detectIndent from 'detect-indent';
-import inquirer from 'inquirer';
-import { applyEdits, modify } from 'jsonc-parser';
-import { isMatch } from 'micromatch';
-import * as childProcess from 'node:child_process';
-import { bump } from '@jiek/utils/bumper';
-import { resolveEntrypoints, filterLeafs, DEFAULT_SKIP_VALUES, entrypoints2Exports } from '@jiek/pkger/entrypoints';
+'use strict';
+
+var fs = require('node:fs');
+var path = require('node:path');
+var filterWorkspacePackages = require('@pnpm/filter-workspace-packages');
+var commander = require('commander');
+var jsYaml = require('js-yaml');
+var getWorkspaceDir = require('@jiek/utils/getWorkspaceDir');
+var cliProgress = require('cli-progress');
+var execa = require('execa');
+var detectIndent = require('detect-indent');
+var inquirer = require('inquirer');
+var jsoncParser = require('jsonc-parser');
+var micromatch = require('micromatch');
+var childProcess = require('node:child_process');
+var bumper = require('@jiek/utils/bumper');
+var entrypoints = require('@jiek/pkger/entrypoints');
+
+function _interopNamespaceDefault(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__*/_interopNamespaceDefault(childProcess);
 
 let root;
 function getRoot() {
   if (root)
     return root;
-  const rootOption = program.getOptionValue("root");
+  const rootOption = commander.program.getOptionValue("root");
   root = rootOption ? path.isAbsolute(rootOption) ? rootOption : path.resolve(process.cwd(), rootOption) : void 0;
   return root;
 }
@@ -30,13 +51,13 @@ function getWD() {
     return { wd, notWorkspace };
   const root = getRoot();
   if (root !== void 0) {
-    const isWorkspace = isWorkspaceDir(root, type);
+    const isWorkspace = getWorkspaceDir.isWorkspaceDir(root, type);
     notWorkspace = !isWorkspace;
     wd = root;
     return { wd, notWorkspace };
   }
   try {
-    wd = getWorkspaceDir(type);
+    wd = getWorkspaceDir.getWorkspaceDir(type);
   } catch (e) {
     if ("message" in e && e.message === "workspace root not found") {
       wd = root;
@@ -55,16 +76,16 @@ try {
 } catch {
 }
 if (type !== "") {
-  program.option("-f, --filter <filter>", "filter packages");
+  commander.program.option("-f, --filter <filter>", "filter packages");
 }
 async function getSelectedProjectsGraph() {
-  let filter = program.getOptionValue("filter");
+  let filter = commander.program.getOptionValue("filter");
   const root = getRoot();
   const { wd, notWorkspace } = getWD();
   if (!notWorkspace && type === "pnpm") {
     const pnpmWorkspaceFilePath = path.resolve(wd, "pnpm-workspace.yaml");
     const pnpmWorkspaceFileContent = fs.readFileSync(pnpmWorkspaceFilePath, "utf-8");
-    const pnpmWorkspace = load(pnpmWorkspaceFileContent);
+    const pnpmWorkspace = jsYaml.load(pnpmWorkspaceFileContent);
     if (root === wd && !filter) {
       throw new Error("root path is workspace root, please provide a filter");
     }
@@ -79,7 +100,7 @@ async function getSelectedProjectsGraph() {
       }
       filter = packageJSON.name;
     }
-    const { selectedProjectsGraph } = await filterPackagesFromDir(wd, [{
+    const { selectedProjectsGraph } = await filterWorkspacePackages.filterPackagesFromDir(wd, [{
       filter: filter ?? "",
       followProdDepsOnly: true
     }], {
@@ -107,7 +128,7 @@ async function getSelectedProjectsGraph() {
 
 var pkg = require("../package.json");
 
-program.version(pkg.version).description(pkg.description).option("--root <root>", "root path").option("-c, --config-path <configPath>", "config path");
+commander.program.version(pkg.version).description(pkg.description).option("--root <root>", "root path").option("-c, --config-path <configPath>", "config path");
 
 let resolve;
 function actionDone() {
@@ -172,7 +193,7 @@ function getConfigPath(root, dir) {
 }
 function loadConfig(dir) {
   const { wd: root } = getWD();
-  let configPath = program.getOptionValue("configPath");
+  let configPath = commander.program.getOptionValue("configPath");
   if (!configPath) {
     configPath = getConfigPath(root, dir);
   } else {
@@ -192,7 +213,7 @@ function loadConfig(dir) {
     case ".json":
       return require(configPath);
     case ".yaml":
-      return load(fs.readFileSync(configPath, "utf-8"));
+      return jsYaml.load(fs.readFileSync(configPath, "utf-8"));
     case ".ts":
       if (tsRegisterName) {
         require(tsRegisterName);
@@ -217,7 +238,7 @@ const FILE_TEMPLATE = (manifest) => `
 const manifest = ${JSON.stringify(manifest, null, 2)}
 module.exports = require('jiek/rollup').template(manifest)
 `.trimStart();
-program.command("build").option("-s, --silent", "Don't display logs.").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").action(async ({
+commander.program.command("build").option("-s, --silent", "Don't display logs.").option("-e, --entries <ENTRIES>", "Specify the entries of the package.json's 'exports' field.(support glob)").action(async ({
   silent,
   entries
 }) => {
@@ -240,11 +261,11 @@ program.command("build").option("-s, --silent", "Don't display logs.").option("-
     fs.mkdirSync(jiekTempDir());
   }
   const rollupBinaryPath = require.resolve("rollup").replace(/dist\/rollup.js$/, "dist/bin/rollup");
-  const multiBars = new MultiBar({
+  const multiBars = new cliProgress.MultiBar({
     clearOnComplete: false,
     hideCursor: true,
     format: "- {bar} | {status} | {input} | {message}"
-  }, Presets.shades_classic);
+  }, cliProgress.Presets.shades_classic);
   let i = 0;
   await Promise.all(
     Object.entries(value).map(async ([dir, manifest]) => {
@@ -258,7 +279,7 @@ program.command("build").option("-s, --silent", "Don't display logs.").option("-
         prefix = `node -r ${tsRegisterName} `;
       }
       const command = `${prefix}${rollupBinaryPath} --silent -c ${configFile}`;
-      const child = execaCommand(command, {
+      const child = execa.execaCommand(command, {
         ipc: true,
         cwd: dir,
         env: {
@@ -432,12 +453,12 @@ async function getName(named, name, {
       }
     } else {
       for (const [key, value] of Object.entries(named)) {
-        if (isMatch(relativePath, key)) {
+        if (micromatch.isMatch(relativePath, key)) {
           matchedKey = key;
           matchedRule = value;
           break;
         }
-        if (isMatch(`${relativePath}/jiek_ignore_dont_use_same_file_name`, key)) {
+        if (micromatch.isMatch(`${relativePath}/jiek_ignore_dont_use_same_file_name`, key)) {
           isParentMatched = true;
           matchedKey = key;
           matchedRule = value;
@@ -477,8 +498,8 @@ async function getName(named, name, {
   }
   throw new Error("no matched rule");
 }
-program.command("init [name]").option("-t, --template <template>", "the package.json template file path or file content").action(async () => {
-  const [, name] = program.args;
+commander.program.command("init [name]").option("-t, --template <template>", "the package.json template file path or file content").action(async () => {
+  const [, name] = commander.program.args;
   const cwd = process.cwd();
   const { init = {} } = loadConfig() ?? {};
   const { wd } = getWD();
@@ -512,9 +533,9 @@ program.command("init [name]").option("-t, --template <template>", "the package.
   ];
   let newJSONString = templateString;
   for (const field of passFields) {
-    newJSONString = applyEdits(
+    newJSONString = jsoncParser.applyEdits(
       newJSONString,
-      modify(
+      jsoncParser.modify(
         newJSONString,
         [field],
         getWDPackageJSONFiled(wd, field),
@@ -545,7 +566,7 @@ program.command("init [name]").option("-t, --template <template>", "the package.
     });
     pkgName = inputName;
   }
-  newJSONString = applyEdits(newJSONString, modify(newJSONString, ["name"], pkgName, { formattingOptions }));
+  newJSONString = jsoncParser.applyEdits(newJSONString, jsoncParser.modify(newJSONString, ["name"], pkgName, { formattingOptions }));
   let pkgRepo = getWDPackageJSONFiled(wd, "repository");
   if (typeof pkgRepo === "string") {
     pkgRepo = {
@@ -554,9 +575,9 @@ program.command("init [name]").option("-t, --template <template>", "the package.
       directory: pkgDir
     };
   }
-  newJSONString = applyEdits(
+  newJSONString = jsoncParser.applyEdits(
     newJSONString,
-    modify(
+    jsoncParser.modify(
       newJSONString,
       ["repository"],
       pkgRepo,
@@ -564,9 +585,9 @@ program.command("init [name]").option("-t, --template <template>", "the package.
     )
   );
   const homepage = `${pkgRepo?.url}/blob/master/${pkgDir}/README.md`;
-  newJSONString = applyEdits(
+  newJSONString = jsoncParser.applyEdits(
     newJSONString,
-    modify(
+    jsoncParser.modify(
       newJSONString,
       ["homepage"],
       homepage,
@@ -582,9 +603,9 @@ program.command("init [name]").option("-t, --template <template>", "the package.
   }
   labels.push(`scope:${pkgName}`);
   const bugs = `${pkgRepo?.url}/issues/new?template=${resolvedBug.template}&labels=${labels.join(",")}`;
-  newJSONString = applyEdits(
+  newJSONString = jsoncParser.applyEdits(
     newJSONString,
-    modify(
+    jsoncParser.modify(
       newJSONString,
       ["bugs"],
       bugs,
@@ -618,15 +639,17 @@ program.command("init [name]").option("-t, --template <template>", "the package.
 
 const intersection = (a, b) => new Set([...a].filter((i) => b.has(i)));
 function getExports({
-  entrypoints,
+  entrypoints: entrypoints$1,
   pkgIsModule,
   entries,
   config,
   dir,
-  noFilter
+  noFilter,
+  withSource,
+  withSuffix
 }) {
-  const dirResolve = (...paths) => resolve$1(dir ?? process.cwd(), ...paths);
-  const dirRelative = (path) => relative(dir ?? process.cwd(), path);
+  const dirResolve = (...paths) => path.resolve(dir ?? process.cwd(), ...paths);
+  const dirRelative = (path$1) => path.relative(dir ?? process.cwd(), path$1);
   const { build = {} } = config ?? {};
   const {
     crossModuleConvertor = true
@@ -634,21 +657,21 @@ function getExports({
   const jsOutdir = `./${dirRelative(dirResolve(
     (typeof build?.output?.dir === "object" ? build.output.dir.js : build?.output?.dir) ?? "dist"
   ))}`;
-  const [, resolvedEntrypoints] = resolveEntrypoints(entrypoints);
+  const [, resolvedEntrypoints] = entrypoints.resolveEntrypoints(entrypoints$1);
   if (entries) {
     Object.entries(resolvedEntrypoints).forEach(([key]) => {
-      if (!entries.some((e) => isMatch(key, e, { matchBase: true }))) {
+      if (!entries.some((e) => micromatch.isMatch(key, e, { matchBase: true }))) {
         delete resolvedEntrypoints[key];
       }
     });
   }
-  const filteredResolvedEntrypoints = noFilter ? resolvedEntrypoints : filterLeafs(
+  const filteredResolvedEntrypoints = noFilter ? resolvedEntrypoints : entrypoints.filterLeafs(
     resolvedEntrypoints,
     {
       skipValue: [
         // ignore values that filename starts with `.jk-noentry`
         /(^|\/)\.jk-noentry/,
-        ...DEFAULT_SKIP_VALUES
+        ...entrypoints.DEFAULT_SKIP_VALUES
       ]
     }
   );
@@ -664,8 +687,10 @@ function getExports({
   } : {};
   return [
     filteredResolvedEntrypoints,
-    entrypoints2Exports(filteredResolvedEntrypoints, {
+    entrypoints.entrypoints2Exports(filteredResolvedEntrypoints, {
       outdir: jsOutdir,
+      withSource,
+      withSuffix,
       withConditional: {
         ...crossModuleWithConditional
       }
@@ -673,7 +698,7 @@ function getExports({
   ];
 }
 
-program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-p, --preview", "preview publish").action(async ({ preview, bumper, ...options }) => {
+commander.program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-p, --preview", "preview publish").action(async ({ preview, bumper: bumper$1, ...options }) => {
   actionRestore();
   const { value = {} } = await getSelectedProjectsGraph() ?? {};
   const selectedProjectsGraphEntries = Object.entries(value);
@@ -689,7 +714,9 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
       pkgIsModule,
       config: loadConfig(dir),
       dir,
-      noFilter: true
+      noFilter: true,
+      withSource: true,
+      withSuffix: true
     });
     newManifest.exports = {
       ...resolvedEntrypoints,
@@ -706,16 +733,16 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
   for (const [dir, manifest] of manifests) {
     const oldJSONString = fs.readFileSync(path.join(dir, "package.json"), "utf-8");
     const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
-    const newVersion = bump(oldJSON.version, bumper);
+    const newVersion = bumper.bump(oldJSON.version, bumper$1);
     const { indent = "    " } = detectIndent(oldJSONString);
     const formattingOptions = {
       tabSize: indent.length,
       insertSpaces: true
     };
     let newJSONString = oldJSONString;
-    newJSONString = applyEdits(
+    newJSONString = jsoncParser.applyEdits(
       newJSONString,
-      modify(
+      jsoncParser.modify(
         newJSONString,
         ["version"],
         newVersion,
@@ -726,9 +753,9 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
       if (JSON.stringify(value2) === JSON.stringify(oldJSON[key]))
         continue;
       if (key !== "exports") {
-        newJSONString = applyEdits(
+        newJSONString = jsoncParser.applyEdits(
           newJSONString,
-          modify(
+          jsoncParser.modify(
             newJSONString,
             ["publishConfig", key],
             value2,
@@ -738,9 +765,9 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
       } else {
         const exports = value2;
         for (const [k, v] of Object.entries(exports)) {
-          newJSONString = applyEdits(
+          newJSONString = jsoncParser.applyEdits(
             newJSONString,
-            modify(
+            jsoncParser.modify(
               newJSONString,
               ["publishConfig", "exports", k],
               v,
@@ -765,9 +792,9 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
           for (const [k, v] of Object.entries(indexPublishConfig)) {
             if (v === void 0)
               continue;
-            newJSONString = applyEdits(
+            newJSONString = jsoncParser.applyEdits(
               newJSONString,
-              modify(
+              jsoncParser.modify(
                 newJSONString,
                 ["publishConfig", k],
                 v,
@@ -786,11 +813,11 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
         console.warn("preview mode");
         continue;
       }
-      childProcess.execSync(["pnpm", "publish", "--access", "public", "--no-git-checks", ...passArgs].join(" "), {
+      childProcess__namespace.execSync(["pnpm", "publish", "--access", "public", "--no-git-checks", ...passArgs].join(" "), {
         cwd: dir,
         stdio: "inherit"
       });
-      const modifyVersionPackageJSON = applyEdits(oldJSONString, modify(oldJSONString, ["version"], newVersion, {}));
+      const modifyVersionPackageJSON = jsoncParser.applyEdits(oldJSONString, jsoncParser.modify(oldJSONString, ["version"], newVersion, {}));
       fs.writeFileSync(path.join(dir, "package.json.bak"), modifyVersionPackageJSON);
     } finally {
       fs.unlinkSync(path.join(dir, "package.json"));
@@ -800,4 +827,4 @@ program.command("publish").aliases(["pub", "p"]).option("-b, --bumper <bumper>",
   actionDone();
 });
 
-program.parse(process.argv);
+commander.program.parse(process.argv);