jiek 2.1.11 → 2.1.13-alpha.1

package/dist/cli.cjs

@@ -3,6 +3,7 @@
 var childProcess = require('node:child_process');
 var fs = require('node:fs');
 var path = require('node:path');
+var process$1 = require('node:process');
 var bumper = require('@jiek/utils/bumper');
 var commander = require('commander');
 var detectIndent = require('detect-indent');
@@ -39,6 +40,7 @@ function _interopNamespace(e) {
 var childProcess__namespace = /*#__PURE__*/_interopNamespace(childProcess);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
+var process__default = /*#__PURE__*/_interopDefault(process$1);
 var detectIndent__default = /*#__PURE__*/_interopDefault(detectIndent);
 var require$$0__default = /*#__PURE__*/_interopDefault(require$$0);
 var require$$0__default$1 = /*#__PURE__*/_interopDefault(require$$0$1);
@@ -79,7 +81,7 @@ function getWD() {
 
 let type = "";
 try {
-  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 require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
   require$1.resolve("@pnpm/filter-workspace-packages");
   type = "pnpm";
 } catch {
@@ -4335,7 +4337,7 @@ function getExports({
   ];
 }
 
-const require$2 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
+const require$2 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
 function packageIsExist(name) {
   try {
     require$2.resolve(name);
@@ -4358,7 +4360,7 @@ for (const register of registers) {
   }
 }
 
-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 require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
 let configName = "jiek.config";
 function getConfigPath(root, dir) {
   const isSupportTsLoader = !!tsRegisterName;
@@ -4463,7 +4465,7 @@ async function forEachSelectedProjectsGraphEntries(callback) {
 }
 commander.program.command("publish").description(description).aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").action(async ({ outdir, bumper: bumper$1 }) => {
   let shouldPassThrough = false;
-  const passThroughOptions = process.argv.reduce(
+  const passThroughOptions = process__default.default.argv.reduce(
     (acc, value) => {
       if (shouldPassThrough) {
         acc.push(value);
@@ -4485,20 +4487,20 @@ commander.program.command("publish").description(description).aliases(["pub", "p
       cwd: dir,
       stdio: "inherit",
       env: {
-        ...process.env,
+        ...process__default.default.env,
         JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
         JIEK_PUBLISH_BUMPER: JSON.stringify(bumper$1)
       }
     });
   });
 });
-async function prepublish() {
+async function prepublish({ bumper: bumper$1 } = {}) {
   const {
     JIEK_PUBLISH_OUTDIR: outdirEnv,
     JIEK_PUBLISH_BUMPER: bumperEnv
-  } = process.env;
-  const outdir = outdirEnv ? JSON.parse(outdirEnv) : "dist";
-  const bumper$1 = bumperEnv ? JSON.parse(bumperEnv) : false;
+  } = process__default.default.env;
+  const outdir = outdirEnv ?? "dist";
+  bumper$1 = bumper$1 ?? (bumperEnv ? JSON.parse(bumperEnv) : false);
   const generateNewManifest = (dir, manifest) => {
     const { name, type, exports: entrypoints = {} } = manifest;
     if (!name) {
@@ -4585,8 +4587,8 @@ async function prepublish() {
               break;
             case "object": {
               const indexExports = index;
-              indexPublishConfig.main = indexExports["require"] ?? indexExports["default"];
-              indexPublishConfig.module = indexExports["import"] ?? indexExports["module"] ?? indexExports["default"];
+              indexPublishConfig.main = indexExports.require ?? indexExports.default;
+              indexPublishConfig.module = indexExports.import ?? indexExports.module ?? indexExports.default;
               break;
             }
           }
@@ -4606,8 +4608,19 @@ async function prepublish() {
         }
       }
     }
-    if (oldJSON["peerDependencies"]) {
-      const peerDependenciesMeta = Object.keys(oldJSON["peerDependencies"]).reduce(
+    if (oldJSON.devDependencies) {
+      newJSONString = jsoncParser.applyEdits(
+        newJSONString,
+        jsoncParser.modify(
+          newJSONString,
+          ["devDependencies"],
+          void 0,
+          { formattingOptions }
+        )
+      );
+    }
+    if (oldJSON.peerDependencies) {
+      const peerDependenciesMeta = Object.keys(oldJSON.peerDependencies).reduce(
         (acc, key) => {
           acc[key] = { optional: true };
           return acc;
@@ -4624,7 +4637,7 @@ async function prepublish() {
         )
       );
     }
-    if (oldJSON["files"]) {
+    if (oldJSON.files) {
       newJSONString = jsoncParser.applyEdits(
         newJSONString,
         jsoncParser.modify(
@@ -4641,16 +4654,16 @@ async function prepublish() {
     const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest);
     const resolveByDir = (...paths) => path__default.default.resolve(dir, ...paths);
     const oldJSONString = fs__default.default.readFileSync(resolveByDir("package.json"), "utf-8");
-    const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
+    const oldJSON = JSON.parse(oldJSONString);
     if (typeof oldJSON.version !== "string") {
-      throw new Error(`${dir}/package.json must have a version field with a string value`);
+      throw new TypeError(`${dir}/package.json must have a version field with a string value`);
     }
     const { indent = "    " } = detectIndent__default.default(oldJSONString);
     const formattingOptions = {
       tabSize: indent.length,
       insertSpaces: true
     };
-    const newVersion = bumper$1 ? bumper.bump(oldJSON.version, bumper$1) : oldJSON.version;
+    const newVersion = bumper$1 ? bumper.bump(oldJSON.version, bumper$1 === true ? "patch" : bumper$1) : oldJSON.version;
     const modifyVersionPackageJSON = jsoncParser.applyEdits(
       oldJSONString,
       jsoncParser.modify(oldJSONString, ["version"], newVersion, { formattingOptions })
@@ -4721,15 +4734,22 @@ async function prepublish() {
       }
     }
     if (oldJSON.files) {
-      if (!Array.isArray(oldJSON.files)) {
-        throw new Error(`${dir}/package.json files field must be an array`);
-      }
-      if (Array.isArray(oldJSON.files) && oldJSON.files.every((file) => typeof file !== "string")) {
-        throw new Error(`${dir}/package.json files field must be an array of string`);
+      if (Array.isArray(oldJSON.files)) {
+        if (oldJSON.files.every((file) => typeof file !== "string")) {
+          throw new TypeError(`${dir}/package.json files field must be an array of string`);
+        }
+      } else {
+        throw new TypeError(`${dir}/package.json files field must be an array`);
       }
     }
     const resolvedOutdirAbs = resolveByDir(resolvedOutdir);
-    const files = (oldJSON.files ?? fs__default.default.readdirSync(resolveByDir("."))).filter((file) => file === "node_modules" || resolveByDir(file) !== resolvedOutdirAbs);
+    const files = (oldJSON.files ?? fs__default.default.readdirSync(resolveByDir("."))).filter(
+      (file) => ![
+        "node_modules",
+        "package.json",
+        "pnpm-lock.yaml"
+      ].includes(file) && resolveByDir(file) !== resolvedOutdirAbs
+    );
     for (const file of files) {
       const path2 = resolveByDir(file);
       try {
@@ -4766,10 +4786,11 @@ async function postpublish() {
     }
   });
 }
+console.log(process__default.default.env);
 commander.program.action(async () => {
   const {
     npm_lifecycle_event: NPM_LIFECYCLE_EVENT
-  } = process.env;
+  } = process__default.default.env;
   switch (NPM_LIFECYCLE_EVENT) {
     case "prepublish":
       await prepublish();
@@ -4790,7 +4811,7 @@ Prepare package.json for publish, you can add \`jk\` to the \`prepublish\` scrip
   }
 }
 `.trim();
-commander.program.command("prepublish").description(prepublishDescription).action(prepublish);
+commander.program.command("prepublish").description(prepublishDescription).option("-b, --bumper <bumper>", "bump version").option("-no-b, --no-bumper", "no bump version").action(prepublish);
 const postpublishDescription = `
 Restore package.json after publish, you can add \`jk\` to the \`postpublish\` script in package.json, the command will automatically run \`jk postpublish\`.
 .e.g
@@ -4802,4 +4823,27 @@ Restore package.json after publish, you can add \`jk\` to the \`postpublish\` sc
 `.trim();
 commander.program.command("postpublish").description(postpublishDescription).action(postpublish);
 
-commander.program.parse(process.argv);
+const { argv } = process__default.default;
+const env = {};
+let isPassThrough = false;
+const newArgv = argv.filter((arg) => {
+  if (isPassThrough) {
+    return true;
+  }
+  if (arg === "--") {
+    isPassThrough = true;
+    return false;
+  }
+  const m = /^--env\.(\w+)=(.*)$/.exec(arg);
+  if (m) {
+    env[m[1]] = m[2];
+    return false;
+  }
+  return true;
+});
+for (const [key, value] of Object.entries(env)) {
+  process__default.default.env[key] = value;
+}
+var parseArgv = () => commander.program.parse(newArgv);
+
+parseArgv();

package/dist/cli.js

@@ -1,6 +1,7 @@
 import * as childProcess from 'node:child_process';
 import fs from 'node:fs';
 import path, { isAbsolute, relative, resolve } from 'node:path';
+import process$1 from 'node:process';
 import { TAGS, bump } from '@jiek/utils/bumper';
 import { program } from 'commander';
 import detectIndent from 'detect-indent';
@@ -4433,7 +4434,7 @@ async function forEachSelectedProjectsGraphEntries(callback) {
 }
 program.command("publish").description(description).aliases(["pub", "p"]).option("-b, --bumper <bumper>", "bump version", "patch").option("-no-b, --no-bumper", "no bump version").option("-o, --outdir <OUTDIR>", outdirDescription, String, "dist").action(async ({ outdir, bumper }) => {
   let shouldPassThrough = false;
-  const passThroughOptions = process.argv.reduce(
+  const passThroughOptions = process$1.argv.reduce(
     (acc, value) => {
       if (shouldPassThrough) {
         acc.push(value);
@@ -4455,20 +4456,20 @@ program.command("publish").description(description).aliases(["pub", "p"]).option
       cwd: dir,
       stdio: "inherit",
       env: {
-        ...process.env,
+        ...process$1.env,
         JIEK_PUBLISH_OUTDIR: JSON.stringify(outdir),
         JIEK_PUBLISH_BUMPER: JSON.stringify(bumper)
       }
     });
   });
 });
-async function prepublish() {
+async function prepublish({ bumper } = {}) {
   const {
     JIEK_PUBLISH_OUTDIR: outdirEnv,
     JIEK_PUBLISH_BUMPER: bumperEnv
-  } = process.env;
-  const outdir = outdirEnv ? JSON.parse(outdirEnv) : "dist";
-  const bumper = bumperEnv ? JSON.parse(bumperEnv) : false;
+  } = process$1.env;
+  const outdir = outdirEnv ?? "dist";
+  bumper = bumper ?? (bumperEnv ? JSON.parse(bumperEnv) : false);
   const generateNewManifest = (dir, manifest) => {
     const { name, type, exports: entrypoints = {} } = manifest;
     if (!name) {
@@ -4555,8 +4556,8 @@ async function prepublish() {
               break;
             case "object": {
               const indexExports = index;
-              indexPublishConfig.main = indexExports["require"] ?? indexExports["default"];
-              indexPublishConfig.module = indexExports["import"] ?? indexExports["module"] ?? indexExports["default"];
+              indexPublishConfig.main = indexExports.require ?? indexExports.default;
+              indexPublishConfig.module = indexExports.import ?? indexExports.module ?? indexExports.default;
               break;
             }
           }
@@ -4576,8 +4577,19 @@ async function prepublish() {
         }
       }
     }
-    if (oldJSON["peerDependencies"]) {
-      const peerDependenciesMeta = Object.keys(oldJSON["peerDependencies"]).reduce(
+    if (oldJSON.devDependencies) {
+      newJSONString = applyEdits(
+        newJSONString,
+        modify(
+          newJSONString,
+          ["devDependencies"],
+          void 0,
+          { formattingOptions }
+        )
+      );
+    }
+    if (oldJSON.peerDependencies) {
+      const peerDependenciesMeta = Object.keys(oldJSON.peerDependencies).reduce(
         (acc, key) => {
           acc[key] = { optional: true };
           return acc;
@@ -4594,7 +4606,7 @@ async function prepublish() {
         )
       );
     }
-    if (oldJSON["files"]) {
+    if (oldJSON.files) {
       newJSONString = applyEdits(
         newJSONString,
         modify(
@@ -4611,16 +4623,16 @@ async function prepublish() {
     const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest);
     const resolveByDir = (...paths) => path.resolve(dir, ...paths);
     const oldJSONString = fs.readFileSync(resolveByDir("package.json"), "utf-8");
-    const oldJSON = JSON.parse(oldJSONString) ?? "0.0.0";
+    const oldJSON = JSON.parse(oldJSONString);
     if (typeof oldJSON.version !== "string") {
-      throw new Error(`${dir}/package.json must have a version field with a string value`);
+      throw new TypeError(`${dir}/package.json must have a version field with a string value`);
     }
     const { indent = "    " } = detectIndent(oldJSONString);
     const formattingOptions = {
       tabSize: indent.length,
       insertSpaces: true
     };
-    const newVersion = bumper ? bump(oldJSON.version, bumper) : oldJSON.version;
+    const newVersion = bumper ? bump(oldJSON.version, bumper === true ? "patch" : bumper) : oldJSON.version;
     const modifyVersionPackageJSON = applyEdits(
       oldJSONString,
       modify(oldJSONString, ["version"], newVersion, { formattingOptions })
@@ -4691,15 +4703,22 @@ async function prepublish() {
       }
     }
     if (oldJSON.files) {
-      if (!Array.isArray(oldJSON.files)) {
-        throw new Error(`${dir}/package.json files field must be an array`);
-      }
-      if (Array.isArray(oldJSON.files) && oldJSON.files.every((file) => typeof file !== "string")) {
-        throw new Error(`${dir}/package.json files field must be an array of string`);
+      if (Array.isArray(oldJSON.files)) {
+        if (oldJSON.files.every((file) => typeof file !== "string")) {
+          throw new TypeError(`${dir}/package.json files field must be an array of string`);
+        }
+      } else {
+        throw new TypeError(`${dir}/package.json files field must be an array`);
       }
     }
     const resolvedOutdirAbs = resolveByDir(resolvedOutdir);
-    const files = (oldJSON.files ?? fs.readdirSync(resolveByDir("."))).filter((file) => file === "node_modules" || resolveByDir(file) !== resolvedOutdirAbs);
+    const files = (oldJSON.files ?? fs.readdirSync(resolveByDir("."))).filter(
+      (file) => ![
+        "node_modules",
+        "package.json",
+        "pnpm-lock.yaml"
+      ].includes(file) && resolveByDir(file) !== resolvedOutdirAbs
+    );
     for (const file of files) {
       const path2 = resolveByDir(file);
       try {
@@ -4736,10 +4755,11 @@ async function postpublish() {
     }
   });
 }
+console.log(process$1.env);
 program.action(async () => {
   const {
     npm_lifecycle_event: NPM_LIFECYCLE_EVENT
-  } = process.env;
+  } = process$1.env;
   switch (NPM_LIFECYCLE_EVENT) {
     case "prepublish":
       await prepublish();
@@ -4760,7 +4780,7 @@ Prepare package.json for publish, you can add \`jk\` to the \`prepublish\` scrip
   }
 }
 `.trim();
-program.command("prepublish").description(prepublishDescription).action(prepublish);
+program.command("prepublish").description(prepublishDescription).option("-b, --bumper <bumper>", "bump version").option("-no-b, --no-bumper", "no bump version").action(prepublish);
 const postpublishDescription = `
 Restore package.json after publish, you can add \`jk\` to the \`postpublish\` script in package.json, the command will automatically run \`jk postpublish\`.
 .e.g
@@ -4772,4 +4792,27 @@ Restore package.json after publish, you can add \`jk\` to the \`postpublish\` sc
 `.trim();
 program.command("postpublish").description(postpublishDescription).action(postpublish);
 
-program.parse(process.argv);
+const { argv } = process$1;
+const env = {};
+let isPassThrough = false;
+const newArgv = argv.filter((arg) => {
+  if (isPassThrough) {
+    return true;
+  }
+  if (arg === "--") {
+    isPassThrough = true;
+    return false;
+  }
+  const m = /^--env\.(\w+)=(.*)$/.exec(arg);
+  if (m) {
+    env[m[1]] = m[2];
+    return false;
+  }
+  return true;
+});
+for (const [key, value] of Object.entries(env)) {
+  process$1.env[key] = value;
+}
+var parseArgv = () => program.parse(newArgv);
+
+parseArgv();