expo-release-it 0.3.2 → 0.5.0

package/build/index.js

@@ -6,17 +6,16 @@ var package_default = {
   name: "expo-release-it",
   module: "src/index.ts",
   type: "module",
-  version: "0.3.1",
+  version: "0.4.0",
   license: "MIT",
-  homepage: "https://github.com/mym0404/expo-release-it",
+  homepage: "https://expo-release-it.mjstudio.net/",
   repository: "https://github.com/mym0404/expo-release-it",
   scripts: {
-    build: "tsup",
-    dev: "yarn run build && NODE_ENV=development node bin/expo-release-it.mjs",
-    release: "yarn build && release-it",
-    android: "expo run:android",
-    ios: "expo run:ios",
-    t: "tsc --noEmit -p ."
+    build: "pnpm build:json-schema-type && tsup",
+    "build:json-schema-type": "json2ts --input expo-release-it.schema.json --output src/type/ExpoReleaseItConfiguration.d.ts",
+    dev: "pnpm build && NODE_ENV=development node bin/expo-release-it.mjs",
+    release: "pnpm build && pnpm run t && release-it",
+    t: "lefthook run check"
   },
   dependencies: {
     "@inquirer/prompts": "^7.4.1",
@@ -26,8 +25,8 @@ var package_default = {
     execa: "^9.5.2",
     "fs-extra": "^11.3.0",
     ora: "^8.2.0",
-    react: "18.3.1",
-    "react-native": "0.76.9",
+    react: "catalog:native",
+    "react-native": "catalog:native",
     semver: "^7.7.1",
     url: "^0.11.4"
   },
@@ -36,29 +35,29 @@ var package_default = {
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/fs-extra": "^11.0.4",
     "@types/semver": "^7.7.0",
+    "json-schema-to-typescript": "^15.0.4",
     lefthook: "^1.11.11",
-    prettier: "3.5.3",
+    prettier: "catalog:",
     "release-it": "^19.0.1",
     "tiny-glob": "^0.2.9",
     tsup: "^8.4.0",
-    typescript: "^5.8.3"
+    typescript: "catalog:",
+    vitest: "^3.1.2"
   },
-  workspaces: [
-    "example"
-  ],
   bin: "./bin/expo-release-it.mjs",
   files: [
     "build",
     "package.json",
     "bin",
-    "template"
+    "template",
+    "expo-release-it.schema.json"
   ],
-  packageManager: "yarn@4.9.1",
   commitlint: {
     extends: [
       "@commitlint/config-conventional"
     ]
-  }
+  },
+  packageManager: "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
 };
 
 // src/util/FileUtil.ts
@@ -127,7 +126,9 @@ var OptionHolder = {
     rootDir: resolve2(fileURLToPath(import.meta.url), "../.."),
     templateDir: resolve2(fileURLToPath(import.meta.url), "../../template")
   },
-  input: {},
+  input: {
+    git: {}
+  },
   keyholderMap: {},
   templateDirNames: ["key"],
   projectDir: "",
@@ -175,21 +176,6 @@ var InqueryInputs = {
       });
     }
   },
-  platformAll: async () => {
-    if (!OptionHolder.input.platformAll) {
-      OptionHolder.input.platformAll = await select({
-        message: constructInquirerFormattedMessage({
-          name: "Platform",
-          explanation: `Platforms to run action`
-        }),
-        choices: [
-          { name: "all", value: "all", description: "Both" },
-          { name: "ios", value: "ios", description: "Release ios" },
-          { name: "android", value: "android", description: "Release android" }
-        ]
-      });
-    }
-  },
   podinstall: async () => {
     if (OptionHolder.input.platform === "ios") {
       OptionHolder.input.pod = await select({
@@ -294,6 +280,11 @@ async function hydrateKeyholderFileValues() {
   }
 }
 
+// src/util/EnvUtil.ts
+var isDev = process.env.NODE_ENV === "development";
+var isWin = process.platform.startsWith("win");
+var isTest = process.env.NODE_ENV === "test";
+
 // src/util/throwError.ts
 function throwError(message, e) {
   if (e) {
@@ -301,11 +292,15 @@ function throwError(message, e) {
   } else {
     logger.error(message);
   }
+  if (isTest) {
+    throw new Error("throwError");
+  }
   process.exit(1);
 }
 
 // src/util/setup/VersionUtil.ts
 import semver from "semver";
+import { padZero } from "@mj-studio/js-util";
 var versionNameRegex = () => /const\s+VERSION_NAME\s*?=\s*?['"]([\d\.]*?)['"]\s*?;?/;
 var versionCodeRegex = () => /const\s+VERSION_CODE\s*?=\s*?(\d+)\s*?;?/;
 async function parseBinaryVersions() {
@@ -396,14 +391,80 @@ async function injectBinaryVersions({
     writeJson(filePath, json);
   }
 }
+function checkVersionCodeIsTiedWithVersionName(versionName, versionCode) {
+  if (!semver.valid(versionName)) return false;
+  return generateVersionCodeTiedWithVersionName(versionName) === versionCode;
+}
+function generateVersionCodeTiedWithVersionName(versionName) {
+  if (!semver.valid(versionName))
+    throwError(
+      "Version Name is not a valid semver format when running `generateVersionCodeTiedWithVersionName`"
+    );
+  const major = semver.major(versionName);
+  const minor = semver.minor(versionName);
+  const patch = semver.patch(versionName);
+  return `${major}${padZero(minor, 3)}${padZero(patch, 3)}`;
+}
 
-// src/util/EnvUtil.ts
-var isDev = process.env.NODE_ENV === "development";
-var isWin = process.platform.startsWith("win");
+// src/util/parseConfigFile.ts
+import { is as is2 } from "@mj-studio/js-util";
+async function parseConfigFile() {
+  const candidates = [
+    join2(OptionHolder.resourcesDir, "expo-release-it.config.json"),
+    join2(OptionHolder.projectDir, "expo-release-it.config.json")
+  ];
+  if (OptionHolder.input.config) {
+    candidates.unshift(OptionHolder.input.config);
+  }
+  const validConfigFilePath = candidates.find(
+    (candidate) => exist(candidate) && is2.object(readJsonSlow(candidate))
+  );
+  if (!validConfigFilePath) return;
+  const config = readJsonSlow(validConfigFilePath);
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input,
+    "semverIncrement",
+    config.bump?.increment
+  );
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input,
+    "androidOutput",
+    config.build?.androidBuildOutput ?? config.upload?.androidBuildOutput
+  );
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input,
+    "uploadMetadata",
+    config.upload?.uploadMetadata ?? config.submit?.uploadMetadata
+  );
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input,
+    "uploadScreenshot",
+    config.upload?.uploadScreenshot ?? config.submit?.uploadScreenshot
+  );
+  assignIfValueIsValidAndNotSetAlready(OptionHolder.input.git, "commit", config.bump?.git?.commit);
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input.git,
+    "commitMessage",
+    config.bump?.git?.commitMessage
+  );
+  assignIfValueIsValidAndNotSetAlready(OptionHolder.input.git, "tag", config.bump?.git?.tag);
+  assignIfValueIsValidAndNotSetAlready(
+    OptionHolder.input.git,
+    "tagName",
+    config.bump?.git?.tagName
+  );
+  assignIfValueIsValidAndNotSetAlready(OptionHolder.input.git, "push", config.bump?.git?.push);
+}
+function assignIfValueIsValidAndNotSetAlready(object, key, value) {
+  if (!object[key] && value) {
+    object[key] = value;
+  }
+}
 
 // src/util/setup/setup.ts
 async function setup() {
   await setupBasicOptions();
+  await parseConfigFile();
   await hydrateKeyholderFileValues();
   await parseBinaryVersions();
 }
@@ -575,17 +636,33 @@ var yesShell = (command, args = [], options) => {
 };
 
 // src/command/bump.ts
+import { select as select2 } from "@inquirer/prompts";
+import { is as is3 } from "@mj-studio/js-util";
 async function bump({ options }) {
   Object.assign(OptionHolder.input, options);
   await preCheck();
   await setup();
-  const nextVersionName = semver2.inc(OptionHolder.versionName, "patch");
-  const nextVersionCode = Number(OptionHolder.versionCode) + 1 + "";
+  const nextVersionName = semver2.inc(OptionHolder.versionName, OptionHolder.input.semverIncrement);
+  const nextVersionCode = (() => {
+    if (checkVersionCodeIsTiedWithVersionName(OptionHolder.versionName, OptionHolder.versionCode)) {
+      return generateVersionCodeTiedWithVersionName(nextVersionName);
+    } else {
+      logger.warn(
+        "version name is not tied with version code like (1.3.5=1003005). Version code is just incremented by 1."
+      );
+      return Number(OptionHolder.versionCode) + 1 + "";
+    }
+  })();
   logger.info(`Next Version: ${nextVersionName}(${nextVersionCode})`);
   await injectBinaryVersions({ versionName: nextVersionName, versionCode: nextVersionCode });
   logger.success("Binary versions have been bumped in expo config file");
+  await processCommit({ nextVersionName, nextVersionCode });
+  if (OptionHolder.input.git.commit) {
+    await promptTagAndPush({ nextVersionName, nextVersionCode });
+  }
 }
 async function preCheck() {
+  if (isDev) return;
   try {
     let hasChange = false;
     try {
@@ -600,6 +677,73 @@ async function preCheck() {
     throwError("Precheck Failed", e);
   }
 }
+async function processCommit({
+  nextVersionCode,
+  nextVersionName
+}) {
+  if (!is3.boolean(OptionHolder.input.git.commit)) {
+    OptionHolder.input.git.commit = await select2({
+      message: constructInquirerFormattedMessage({ name: "Commit?" }),
+      choices: [
+        { name: "yes", value: true },
+        { name: "no", value: false }
+      ]
+    });
+  }
+  if (!is3.notEmptyString(OptionHolder.input.git.commitMessage)) {
+    OptionHolder.input.git.commitMessage = "chore: release $(version) \u{1F680}";
+  }
+  if (OptionHolder.input.git.commit) {
+    await exe("git", ["add", "--all"]);
+    await exe("git", [
+      "commit",
+      "-m",
+      OptionHolder.input.git.commitMessage.replaceAll(
+        "$(version)",
+        `${nextVersionName}(${nextVersionCode})`
+      )
+    ]);
+  }
+}
+async function promptTagAndPush({
+  nextVersionCode,
+  nextVersionName
+}) {
+  if (!is3.boolean(OptionHolder.input.git.tag)) {
+    OptionHolder.input.git.tag = await select2({
+      message: constructInquirerFormattedMessage({ name: "Tag?" }),
+      choices: [
+        { name: "yes", value: true },
+        { name: "no", value: false }
+      ]
+    });
+  }
+  if (!is3.notEmptyString(OptionHolder.input.git.tagName)) {
+    OptionHolder.input.git.tagName = "v$(version)";
+  }
+  const tagName = OptionHolder.input.git.tagName.replaceAll(
+    "$(version)",
+    `${nextVersionName}(${nextVersionCode})`
+  );
+  if (OptionHolder.input.git.tag) {
+    await exe("git", ["tag", "-a", tagName, "-m", tagName]);
+  }
+  if (!is3.boolean(OptionHolder.input.git.push)) {
+    OptionHolder.input.git.push = await select2({
+      message: constructInquirerFormattedMessage({ name: "Push?" }),
+      choices: [
+        { name: "yes", value: true },
+        { name: "no", value: false }
+      ]
+    });
+  }
+  if (OptionHolder.input.git.push) {
+    if (OptionHolder.input.git.tag) {
+      await exe("git", ["push", "origin", tagName]);
+    }
+    await exe("git", ["push"]);
+  }
+}
 
 // src/util/iterateAllFiles.ts
 async function iterateAllFiles(root, callback) {
@@ -781,12 +925,12 @@ async function prepareIos() {
 import chalk6 from "chalk";
 
 // src/util/calculateElapsed.ts
-import { padZero } from "@mj-studio/js-util";
+import { padZero as padZero2 } from "@mj-studio/js-util";
 function calculateElapsed(t) {
   let seconds = Math.floor((Date.now() - t) / 1e3);
   const minutes = Math.floor(seconds / 60);
   seconds = seconds % 60;
-  return `${minutes}:${padZero(seconds)}`;
+  return `${minutes}:${padZero2(seconds)}`;
 }
 
 // src/util/FastlaneOption.ts
@@ -1070,17 +1214,22 @@ var androidBuildOutputOption = new Option(
   "--androidOutput <output>",
   "Android Build Output"
 ).choices(["aab", "apk"]);
+var configFileOption = new Option("--config <filePath>", "expo-release-it.config.json path");
 var run = () => {
   const program = new Command();
   program.name("expo-release-it").description(
     "Opinionated Expo CICD workflow CLI for building & uploading & submitting Expo projects on your machine"
   ).version(OptionHolder.cli.version);
-  program.command("init").description("Configure resources and environment").action(async (options) => handleError(init({ options })));
-  program.command("bump").description("Bump binary release patch version with modifying app.json").action(async (options) => handleError(bump({ options })));
-  program.command("build").description("Build artifacts").addOption(platformOption).addOption(androidBuildOutputOption).action(async (options) => handleError(build({ options })));
-  program.command("upload").description("Upload artifact to play console internal test track(android) and testflight(ios)").addOption(platformOption).addOption(androidBuildOutputOption).option("-m --uploadMetadata", "Upload store text metadatas").option("-s --uploadScreenshot", "Upload store screenshots").action(async (options) => handleError(upload({ options })));
-  program.command("submit").description("Submit Google Play Console & App Store Connect Review with latest testing track").addOption(platformOption).option("-m --uploadMetadata", "Upload store text metadatas").option("-s --uploadScreenshot", "Upload store screenshots").action(async (options) => handleError(submit({ options })));
-  program.command("pull").description("Download metadatas from stores").addOption(platformOption).option("-l --useLiveVersionIos", "Download metadatas from live version rather than draft").action(async (options) => handleError(pull({ options })));
+  program.command("init").description("Configure resources and environment").addOption(configFileOption).action(async (options) => handleError(init({ options })));
+  program.command("bump").description("Bump binary release patch version with modifying app.json").addOption(
+    new Option("-i --increment <increment>", "Version increment mode").default("patch").choices(["major", "minor", "patch"])
+  ).addOption(configFileOption).action(
+    async (options) => handleError(bump({ options: { ...options, semverIncrement: options.increment } }))
+  );
+  program.command("build").description("Build artifacts").addOption(platformOption).addOption(androidBuildOutputOption).addOption(configFileOption).action(async (options) => handleError(build({ options })));
+  program.command("upload").description("Upload artifact to play console internal test track(android) and testflight(ios)").addOption(platformOption).addOption(androidBuildOutputOption).option("-m --uploadMetadata", "Upload store text metadatas").option("-s --uploadScreenshot", "Upload store screenshots").addOption(configFileOption).action(async (options) => handleError(upload({ options })));
+  program.command("submit").description("Submit Google Play Console & App Store Connect Review with latest testing track").addOption(platformOption).option("-m --uploadMetadata", "Upload store text metadatas").option("-s --uploadScreenshot", "Upload store screenshots").addOption(configFileOption).action(async (options) => handleError(submit({ options })));
+  program.command("pull").description("Download metadatas from stores").addOption(platformOption).option("-l --useLiveVersionIos", "Download metadatas from live version rather than draft").addOption(configFileOption).action(async (options) => handleError(pull({ options })));
   program.parse();
 };
 async function handleError(promise) {