pakstr 0.26.0 → 0.27.0

package/dist/commands/init.js

@@ -7,6 +7,7 @@ exports.initCommand = initCommand;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
+const promises_1 = require("readline/promises");
 const pakstrConfig_1 = require("../core/pakstrConfig");
 const nostr_1 = require("../core/nostr");
 /**
@@ -29,8 +30,9 @@ async function initCommand(options = {}) {
         throw new Error(`${configPath} already exists. Use --force to overwrite, or remove it first.`);
     }
     const pkg = readPackageJson();
-    const { appId, sanitized: appIdSanitized } = inferAppId(pkg);
-    const appName = inferAppName(pkg) ?? appNameFromAppId(appId);
+    const { appId: inferredAppId, sanitized: appIdSanitized } = inferAppId(pkg);
+    const { appId, overridden: appIdOverridden } = await confirmAppId(inferredAppId, options);
+    const appName = inferAppName(pkg) ?? appNameFromAppId(inferredAppId);
     const versionName = (pkg && typeof pkg.version === "string" ? pkg.version : "1.0.0");
     const versionCode = 1;
     const web = inferWebDir();
@@ -46,7 +48,7 @@ async function initCommand(options = {}) {
     });
     fs_1.default.writeFileSync(configPath, yaml, "utf8");
     console.log(`✅ Wrote ${configPath}`);
-    if (appIdSanitized) {
+    if (appIdSanitized && !appIdOverridden) {
         console.log(`⚠️  Your package.json name contains characters that aren't valid in an Android package`);
         console.log(`    name (e.g. hyphens). pakstr sanitized it to appId "${appId}". Edit`);
         console.log(`    ${pakstrConfig_1.PAKSTR_CONFIG_FILENAME} if you'd prefer a different value.`);
@@ -235,6 +237,40 @@ function escapeYamlScalar(value) {
     }
     return value;
 }
+async function confirmAppId(inferredAppId, options) {
+    const prompt = options.promptAppId ?? (isInteractive() ? promptForAppId : null);
+    if (!prompt)
+        return { appId: inferredAppId, overridden: false };
+    const response = await prompt(inferredAppId);
+    if (response === "")
+        return { appId: inferredAppId, overridden: false };
+    validateAppId(response);
+    return { appId: response, overridden: response !== inferredAppId };
+}
+function isInteractive() {
+    return process.stdin.isTTY === true && process.stdout.isTTY === true;
+}
+async function promptForAppId(defaultAppId) {
+    const readline = (0, promises_1.createInterface)({ input: process.stdin, output: process.stdout });
+    try {
+        return await readline.question(`App ID [${defaultAppId}]: `);
+    }
+    finally {
+        readline.close();
+    }
+}
+function validateAppId(appId) {
+    if (appId !== appId.trim()) {
+        throw new Error("App ID must not have leading or trailing whitespace");
+    }
+    if (Buffer.byteLength(appId, "utf8") > 255) {
+        throw new Error("App ID must be ≤ 255 UTF-8 bytes");
+    }
+    if (!pakstrConfig_1.APP_ID_PATTERN.test(appId)) {
+        throw new Error("App ID must be a valid Android package name: dot-separated segments of" +
+            ` lower-case letters, digits, and underscores (no hyphens). Got: "${appId}"`);
+    }
+}
 function readPackageJson() {
     const p = path_1.default.join(process.cwd(), "package.json");
     if (!fs_1.default.existsSync(p))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",