@pmate/cli 0.25.2 → 0.25.3

package/dist/index.js

@@ -22375,13 +22375,14 @@ var AndroidApkReleaseService = class {
     if (!gradlew) {
       throw new Error(`Gradle wrapper not found in ${appDir} or ${repoRoot}`);
     }
+    const gradleCwd = import_node_path24.default.dirname(gradlew);
     const normalizedVariant = variant.toLowerCase();
     const taskSuffix = `assemble${capitalize(normalizedVariant)}`;
     const tasks = [`:app:${taskSuffix}`, taskSuffix];
     let lastError;
     for (const task of tasks) {
       try {
-        await runCommand(gradlew, [task], repoRoot);
+        await runCommand(gradlew, [task], gradleCwd);
         return findLatestApk(repoRoot, appDir, normalizedVariant);
       } catch (error) {
         lastError = error;
@@ -22391,8 +22392,11 @@ var AndroidApkReleaseService = class {
   }
   async readApkMetadata(apkPath) {
     const readers = [
+      async () => readGradleOutputMetadata(apkPath),
       async () => parseAaptBadging(await runCommandCapture("aapt", ["dump", "badging", apkPath])),
-      async () => parseApkAnalyzerManifest(await runCommandCapture("apkanalyzer", ["manifest", "print", apkPath]))
+      async () => parseApkAnalyzerManifest(await runCommandCapture("apkanalyzer", ["manifest", "print", apkPath])),
+      async () => parseAaptBadging(await runAndroidSdkToolCapture("aapt", ["dump", "badging", apkPath])),
+      async () => parseApkAnalyzerManifest(await runAndroidSdkToolCapture("apkanalyzer", ["manifest", "print", apkPath]))
     ];
     const errors = [];
     for (const reader of readers) {
@@ -22402,7 +22406,9 @@ var AndroidApkReleaseService = class {
         errors.push(error instanceof Error ? error.message : String(error));
       }
     }
-    throw new Error(`Cannot read APK metadata. Install Android SDK build-tools. ${errors.join(" | ")}`);
+    throw new Error(
+      `Cannot read APK metadata. Expected Gradle output-metadata.json or Android SDK tools aapt/apkanalyzer. ${errors.join(" | ")}`
+    );
   }
   async findExistingObject(objectKey) {
     const parentPrefix = objectKey.split("/").slice(0, -1).join("/");
@@ -22473,6 +22479,17 @@ function parseApkAnalyzerManifest(output) {
   }
   return { applicationId, versionName, versionCode };
 }
+function parseGradleOutputMetadata(source, apkFileName) {
+  const payload = JSON.parse(source);
+  const element = (apkFileName ? payload.elements?.find((item) => item.outputFile === apkFileName) : void 0) ?? payload.elements?.find((item) => item.versionName != null && item.versionCode != null);
+  const applicationId = payload.applicationId;
+  const versionName = element?.versionName;
+  const versionCode = Number(element?.versionCode);
+  if (!applicationId || !versionName || !Number.isFinite(versionCode)) {
+    throw new Error("Gradle output metadata is missing applicationId, versionName, or versionCode");
+  }
+  return { applicationId, versionName, versionCode };
+}
 function bumpAndroidProjectVersion(appDir, bump) {
   const candidates = [
     import_node_path24.default.join(appDir, "app", "build.gradle.kts"),
@@ -22501,6 +22518,13 @@ function findLatestApk(repoRoot, appDir, variant) {
   files.sort((a, b) => (0, import_node_fs20.statSync)(b).mtimeMs - (0, import_node_fs20.statSync)(a).mtimeMs);
   return files[0];
 }
+function readGradleOutputMetadata(apkPath) {
+  const metadataPath = import_node_path24.default.join(import_node_path24.default.dirname(apkPath), "output-metadata.json");
+  if (!(0, import_node_fs20.existsSync)(metadataPath)) {
+    throw new Error(`Gradle output metadata not found: ${metadataPath}`);
+  }
+  return parseGradleOutputMetadata((0, import_node_fs20.readFileSync)(metadataPath, "utf8"), import_node_path24.default.basename(apkPath));
+}
 function listApks(dir) {
   if (!(0, import_node_fs20.existsSync)(dir)) return [];
   return (0, import_node_fs20.readdirSync)(dir).filter((entry) => entry.endsWith(".apk")).map((entry) => import_node_path24.default.join(dir, entry)).filter((entry) => (0, import_node_fs20.statSync)(entry).isFile());
@@ -22529,6 +22553,30 @@ function runCommandCapture(command, args, cwd) {
     });
   });
 }
+async function runAndroidSdkToolCapture(toolName, args) {
+  const toolPath = findAndroidSdkTool(toolName);
+  if (!toolPath) {
+    throw new Error(`Android SDK tool not found: ${toolName}`);
+  }
+  return runCommandCapture(toolPath, args);
+}
+function findAndroidSdkTool(toolName) {
+  const sdkRoots = [process.env.ANDROID_HOME, process.env.ANDROID_SDK_ROOT].filter((item) => Boolean(item)).map((item) => import_node_path24.default.resolve(item));
+  for (const sdkRoot of sdkRoots) {
+    const candidates = toolName === "aapt" ? listVersionedToolCandidates(import_node_path24.default.join(sdkRoot, "build-tools"), toolName) : [
+      import_node_path24.default.join(sdkRoot, "cmdline-tools", "latest", "bin", toolName),
+      ...listVersionedToolCandidates(import_node_path24.default.join(sdkRoot, "cmdline-tools"), import_node_path24.default.join("bin", toolName)),
+      import_node_path24.default.join(sdkRoot, "tools", "bin", toolName)
+    ];
+    const match = candidates.find((candidate) => (0, import_node_fs20.existsSync)(candidate));
+    if (match) return match;
+  }
+  return void 0;
+}
+function listVersionedToolCandidates(parentDir, relativeToolPath) {
+  if (!(0, import_node_fs20.existsSync)(parentDir)) return [];
+  return (0, import_node_fs20.readdirSync)(parentDir).map((entry) => import_node_path24.default.join(parentDir, entry)).filter((entry) => (0, import_node_fs20.statSync)(entry).isDirectory()).sort((a, b) => import_node_path24.default.basename(b).localeCompare(import_node_path24.default.basename(a), void 0, { numeric: true })).map((entry) => import_node_path24.default.join(entry, relativeToolPath));
+}
 function sha256File(filePath) {
   return new Promise((resolve, reject) => {
     const hash = (0, import_node_crypto4.createHash)("sha256");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {