@pitcher/cli-scripts 2.1.2 → 2.2.1

package/dist/src/core/http.js

@@ -0,0 +1,60 @@
+import axios from 'axios';
+import { createCliError, isCliError } from './errors.js';
+export function makeClient(baseUrl, apiKey) {
+    return axios.create({
+        baseURL: baseUrl,
+        headers: {
+            accept: 'application/json',
+            'x-api-key': apiKey,
+        },
+    });
+}
+/**
+ * Build a human-readable message from a server error body. Handles DRF shapes:
+ * a `detail`/`error` string, `non_field_errors`, and field-level error arrays
+ * (e.g. `{ version: ["already exists"] }`). Falls back to the raw body so the
+ * full server response is visible in logs instead of a bare status line.
+ */
+export function extractApiMessage(data, fallback) {
+    if (data == null)
+        return fallback;
+    if (typeof data === 'string')
+        return data.trim() || fallback;
+    if (typeof data !== 'object')
+        return String(data);
+    const obj = data;
+    if (typeof obj.detail === 'string' && obj.detail)
+        return obj.detail;
+    if (typeof obj.error === 'string' && obj.error)
+        return obj.error;
+    const parts = [];
+    for (const [key, val] of Object.entries(obj)) {
+        const text = Array.isArray(val) ? val.join('; ') : typeof val === 'string' ? val : JSON.stringify(val);
+        parts.push(key === 'non_field_errors' ? text : `${key}: ${text}`);
+    }
+    if (parts.length)
+        return parts.join(' | ');
+    return fallback;
+}
+export function toCliError(e) {
+    if (isCliError(e))
+        return e;
+    const err = (e ?? {});
+    const data = err.response?.data;
+    const apiMessage = extractApiMessage(data, err.message || 'Request failed');
+    const status = err.response?.status;
+    if (typeof status === 'number') {
+        if (status === 401 || status === 403)
+            return createCliError('AUTH', apiMessage);
+        if (status === 404)
+            return createCliError('NOT_FOUND', apiMessage);
+        if (status === 409)
+            return createCliError('CONFLICT', apiMessage);
+        if (status >= 400 && status < 500)
+            return createCliError('VALIDATION', apiMessage);
+        return createCliError('NETWORK', apiMessage);
+    }
+    if (err.isAxiosError)
+        return createCliError('NETWORK', apiMessage);
+    return createCliError('UNKNOWN', apiMessage);
+}

package/dist/src/core/output.d.ts

@@ -0,0 +1,22 @@
+import type { Envelope } from './envelope.js';
+export interface Writer {
+    out: (s: string) => void;
+    err: (s: string) => void;
+}
+export declare const defaultWriter: Writer;
+export declare function shouldUseJson(opts: {
+    output?: string;
+}, isTty: boolean): boolean;
+export declare function log(msg: string, { quiet, write }: {
+    quiet?: boolean;
+    write?: Writer;
+}): void;
+export declare function renderEnvelope(env: Envelope<unknown>, { json, quiet, write }: {
+    json: boolean;
+    quiet?: boolean;
+    write?: Writer;
+}): number;
+export declare function emitEnvelope(env: Envelope<unknown>, globals: {
+    output?: string;
+    quiet?: boolean;
+}, isTty?: boolean): void;

package/dist/src/core/output.js

@@ -0,0 +1,45 @@
+export const defaultWriter = {
+    out: (s) => process.stdout.write(s + '\n'),
+    err: (s) => process.stderr.write(s + '\n'),
+};
+export function shouldUseJson(opts, isTty) {
+    if (opts.output === 'json')
+        return true;
+    if (opts.output === 'text')
+        return false;
+    return !isTty;
+}
+export function log(msg, { quiet, write = defaultWriter }) {
+    if (quiet)
+        return;
+    write.err(msg);
+}
+function formatHuman(data) {
+    if (typeof data === 'string')
+        return data;
+    return JSON.stringify(data, null, 2);
+}
+export function renderEnvelope(env, { json, quiet, write = defaultWriter }) {
+    if (json) {
+        write.out(JSON.stringify(env));
+        return env.error?.exitCode ?? 0;
+    }
+    if (env.ok) {
+        if (!quiet && env.data !== undefined)
+            write.out(formatHuman(env.data));
+    }
+    else if (env.error) {
+        write.err(`Error [${env.error.code}]: ${env.error.message}`);
+    }
+    if (!quiet && env.warnings?.length) {
+        for (const w of env.warnings)
+            write.err(`warning: ${w}`);
+    }
+    return env.error?.exitCode ?? 0;
+}
+export function emitEnvelope(env, globals, isTty = Boolean(process.stdout.isTTY)) {
+    const json = shouldUseJson(globals, isTty);
+    // Set exitCode and let the process drain naturally — process.exit() can
+    // truncate piped stdout before the envelope flushes in non-TTY mode.
+    process.exitCode = renderEnvelope(env, { json, quiet: globals.quiet });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pitcher/cli-scripts",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "The Pitcher CLI for various tasks in its ecosystem.",
   "author": "Pitcher AG",
   "license": "MIT",
@@ -14,6 +14,8 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "build": "tsc",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "yarn build"
   },
   "bin": {
@@ -25,13 +27,14 @@
   "devDependencies": {
     "@types/archiver": "^7.0.0",
     "@types/node": "^24.10.9",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.9"
   },
   "dependencies": {
     "archiver": "^7.0.1",
-    "axios": "^1.13.5",
+    "axios": "^1.16.0",
     "chokidar": "^5.0.0",
     "commander": "^14.0.3",
-    "form-data": "^4.0.5"
+    "form-data": "^4.0.6"
   }
 }

package/dist/copyInstanceFiles.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createCopyInstanceFilesCommand(): Command;

package/dist/copyInstanceFiles.js

@@ -1,17 +0,0 @@
-import { Command } from "commander";
-export function createCopyInstanceFilesCommand() {
-    const program = new Command("copy-instance-files");
-    program
-        .arguments("<fromInstance> <toInstance>")
-        .requiredOption("--api-key <apiKey>", "API Key", process.env.PITCHER_API_KEY)
-        .requiredOption("--org <orgName>", "Organization Name", process.env.PITCHER_ORG)
-        .description('clone instance files into another one e.g. "p copy-instance-files <fromInstanceId> <toInstanceId> --org mondelez --api-key myapikey"')
-        .action((sourceInstanceId, destinationInstanceId, options) => {
-        console.log("clone instance files command called", {
-            sourceInstanceId,
-            destinationInstanceId,
-            options,
-        });
-    });
-    return program;
-}

package/dist/package.json

@@ -1,40 +0,0 @@
-{
-    "name": "@pitcher/cli-scripts",
-    "version": "1.0.6",
-    "description": "The Pitcher CLI for various tasks in its ecosystem.",
-    "author": "Pitcher AG",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/PitcherAG/ng-scripts.git"
-    },
-    "keywords": [
-        "pitcher",
-        "cli",
-        "ng-scripts"
-    ],
-    "type": "module",
-    "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
-    "scripts": {
-        "build": "tsc",
-        "prepublishOnly": "npm run build"
-    },
-    "bin": {
-        "p": "node --no-warnings ./dist/index.js"
-    },
-    "files": [
-        "dist"
-    ],
-    "devDependencies": {
-        "@types/archiver": "^6.0.2",
-        "@types/node": "^20.0.0",
-        "typescript": "^5.4.5"
-    },
-    "dependencies": {
-        "archiver": "^7.0.1",
-        "axios": "^1.7.2",
-        "commander": "^12.1.0",
-        "form-data": "^4.0.0"
-    }
-}

package/dist/publishApp.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createPublishAppCommand(): Command;

package/dist/publishApp.js

@@ -1,93 +0,0 @@
-import { Command } from "commander";
-import archiver from "archiver";
-import axios from "axios";
-import fs from "fs";
-import path from "path";
-import FormData from "form-data";
-import { fileURLToPath } from 'url';
-export function createPublishAppCommand() {
-    const program = new Command("publish-app");
-    program
-        .arguments("[folder]")
-        .requiredOption("--api-key <apiKey>", "API Key for authentication")
-        .option("--org <organization>", "Organization subdomain", "dev")
-        .option("--increment-version", "Increment version in app.json")
-        .option("--dry-run", "Perform a dry run without publishing")
-        .option("--publish-url <url>", "Explicit publish URL")
-        .description('zip the contents of a folder and publish as an app to a pitcher org URL. for current folder: "p publish-app --api-key myapikey"')
-        .action(async (folder = ".", options) => {
-        try {
-            const folderPath = path.resolve(folder);
-            if (options.incrementVersion) {
-                const appJsonPath = path.join(folderPath, "app.json");
-                if (fs.existsSync(appJsonPath)) {
-                    const appJson = JSON.parse(fs.readFileSync(appJsonPath, "utf-8"));
-                    const now = new Date();
-                    const year = now.getFullYear();
-                    const month = String(now.getMonth() + 1).padStart(2, "0");
-                    const day = String(now.getDate()).padStart(2, "0");
-                    const timestamp = now.getTime();
-                    const version = `${year}.${month}.${day}.${timestamp}`;
-                    appJson.version = version;
-                    fs.writeFileSync(appJsonPath, JSON.stringify(appJson, null, 2));
-                    console.log(`Updated app.json version to ${version}`);
-                }
-                else {
-                    console.error("app.json not found in the specified folder.");
-                    return;
-                }
-            }
-            const currentDir = path.dirname(fileURLToPath(import.meta.url));
-            const zipFilePath = path.join(currentDir, "app.zip");
-            const output = fs.createWriteStream(zipFilePath);
-            const archive = archiver("zip", {
-                zlib: { level: 9 },
-            });
-            output.on("close", async () => {
-                console.log(`Zipped ${archive.pointer()} total bytes`);
-                const formData = new FormData();
-                formData.append("file", fs.createReadStream(zipFilePath));
-                const publishUrl = options.publishUrl || `https://${options.org}.my.pitcher.com/api/v1/apps/publish/`;
-                if (options.dryRun) {
-                    console.log("Dry run mode enabled. The following data would be published:");
-                    console.log("Publish URL:", publishUrl);
-                    console.log("Headers:", {
-                        ...formData.getHeaders(),
-                        "x-api-key": options.apiKey,
-                    });
-                    console.log("app.json content:", fs.readFileSync(path.join(folderPath, "app.json"), "utf-8"));
-                    fs.unlinkSync(zipFilePath);
-                }
-                else {
-                    try {
-                        const response = await axios.post(publishUrl, formData, {
-                            headers: {
-                                ...formData.getHeaders(),
-                                "x-api-key": options.apiKey,
-                            },
-                        });
-                        console.log("Publish response:", response.data);
-                    }
-                    catch (e) {
-                        const error = e;
-                        const errData = error?.response?.data;
-                        console.error("Error publishing:", errData?.detail ?? errData);
-                    }
-                    finally {
-                        fs.unlinkSync(zipFilePath);
-                    }
-                }
-            });
-            archive.on("error", (err) => {
-                throw err;
-            });
-            archive.pipe(output);
-            archive.directory(folderPath, false);
-            await archive.finalize();
-        }
-        catch (error) {
-            console.error("Error zipping or publishing:", error);
-        }
-    });
-    return program;
-}

package/dist/src/copyInstanceFiles.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createCopyInstanceFilesCommand(): Command;

package/dist/src/copyInstanceFiles.js

@@ -1,17 +0,0 @@
-import { Command } from "commander";
-export function createCopyInstanceFilesCommand() {
-    const program = new Command("copy-instance-files");
-    program
-        .arguments("<fromInstance> <toInstance>")
-        .requiredOption("--api-key <apiKey>", "API Key", process.env.PITCHER_API_KEY)
-        .requiredOption("--org <orgName>", "Organization Name", process.env.PITCHER_ORG)
-        .description('clone instance files into another one e.g. "p copy-instance-files <fromInstanceId> <toInstanceId> --org pitcher --api-key myapikey"')
-        .action((sourceInstanceId, destinationInstanceId, options) => {
-        console.log("clone instance files command called", {
-            sourceInstanceId,
-            destinationInstanceId,
-            options,
-        });
-    });
-    return program;
-}

package/dist/src/devSync.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createDevSyncCommand(): Command;

package/dist/src/devSync.js

@@ -1,250 +0,0 @@
-import { Command } from "commander";
-import archiver from "archiver";
-import axios from "axios";
-import chokidar from "chokidar";
-import fs from "fs";
-import path from "path";
-import FormData from "form-data";
-function findDistPath() {
-    const cwd = process.cwd();
-    // Check if app.json exists in current directory
-    if (fs.existsSync(path.join(cwd, "app.json"))) {
-        return cwd;
-    }
-    // Check if app.json exists in dist subdirectory
-    const distPath = path.join(cwd, "dist");
-    if (fs.existsSync(path.join(distPath, "app.json"))) {
-        return distPath;
-    }
-    console.error("❌ Could not find app.json in current directory or ./dist");
-    console.error("   Run this command from your app's dist folder or from the project root.");
-    process.exit(1);
-}
-function readAppJson(distPath) {
-    const appJsonPath = path.join(distPath, "app.json");
-    if (!fs.existsSync(appJsonPath)) {
-        throw new Error(`app.json not found in ${distPath}`);
-    }
-    const content = fs.readFileSync(appJsonPath, "utf-8");
-    const appJson = JSON.parse(content);
-    if (!appJson.name) {
-        throw new Error('app.json must contain a "name" field');
-    }
-    return appJson;
-}
-async function createZipBuffer(distPath) {
-    return new Promise((resolve, reject) => {
-        const chunks = [];
-        const archive = archiver("zip", { zlib: { level: 9 } });
-        archive.on("data", (chunk) => chunks.push(chunk));
-        archive.on("end", () => resolve(Buffer.concat(chunks)));
-        archive.on("error", reject);
-        archive.directory(distPath, false);
-        archive.finalize();
-    });
-}
-async function syncToApi(distPath, org, appName, fileId, apiKey) {
-    console.log(`Creating zip from ${distPath}...`);
-    const zipBuffer = await createZipBuffer(distPath);
-    console.log(`Zip created: ${(zipBuffer.length / 1024).toFixed(2)} KB`);
-    const formData = new FormData();
-    formData.append("app_name", appName);
-    formData.append("file_id", fileId);
-    formData.append("zip", zipBuffer, {
-        filename: "app.zip",
-        contentType: "application/zip",
-    });
-    const endpoint = `https://${org}.my.pitcher.com/core/api/protected/development/s3-app-sync`;
-    console.log(`Uploading to ${endpoint}...`);
-    try {
-        const response = await axios.post(endpoint, formData, {
-            headers: {
-                "x-api-key": apiKey,
-                ...formData.getHeaders(),
-            },
-            maxBodyLength: Infinity,
-            maxContentLength: Infinity,
-        });
-        return response.data;
-    }
-    catch (error) {
-        const axiosError = error;
-        const errData = axiosError?.response?.data;
-        throw new Error(`Upload failed (${axiosError?.response?.status}): ${errData?.error || errData?.detail || axiosError.message}`);
-    }
-}
-async function revertDevOverride(org, fileId, apiKey) {
-    const endpoint = `https://${org}.my.pitcher.com/core/api/protected/development/s3-app-sync`;
-    try {
-        const response = await axios.delete(endpoint, {
-            headers: {
-                "x-api-key": apiKey,
-                "Content-Type": "application/json",
-            },
-            data: { file_id: fileId },
-        });
-        console.log("✅ Dev override reverted");
-        console.log(`   Restored version: ${response.data.restored_version}`);
-    }
-    catch (error) {
-        const axiosError = error;
-        const errData = axiosError?.response?.data;
-        throw new Error(`Revert failed (${axiosError?.response?.status}): ${errData?.error || errData?.detail || axiosError.message}`);
-    }
-}
-export function createDevSyncCommand() {
-    const program = new Command("dev-sync");
-    program.description("Sync a marketplace app to S3 for live development testing");
-    program
-        .command("sync")
-        .description("One-time sync of the app to S3")
-        .requiredOption("--file-id <id>", "File ID of the installed app (pitcher_file.id)")
-        .option("--api-key <apiKey>", "API Key for authentication")
-        .option("--org <organization>", "Organization subdomain", "dev")
-        .action(async (options) => {
-        try {
-            const apiKey = options.apiKey || process.env.NG_API_KEY;
-            if (!apiKey) {
-                console.error("Error: API key is required. Provide it via --api-key or set the NG_API_KEY environment variable.");
-                process.exit(1);
-            }
-            const distPath = findDistPath();
-            const appJson = readAppJson(distPath);
-            console.log(`Syncing ${appJson.name}...`);
-            console.log(`   From: ${distPath}`);
-            const result = await syncToApi(distPath, options.org, appJson.name, options.fileId, apiKey);
-            console.log("\n✅ Sync completed!");
-            console.log(`   Dev version: ${result.dev_version}`);
-            console.log(`   Original version: ${result.original_version}`);
-            console.log(`   Files uploaded: ${result.files_uploaded}`);
-            console.log(`   S3 prefix: ${result.s3_prefix}`);
-        }
-        catch (error) {
-            console.error("❌ Sync failed:", error instanceof Error ? error.message : error);
-            process.exit(1);
-        }
-    });
-    program
-        .command("watch")
-        .description("Watch the dist folder and sync on changes")
-        .requiredOption("--file-id <id>", "File ID of the installed app (pitcher_file.id)")
-        .option("--api-key <apiKey>", "API Key for authentication")
-        .option("--org <organization>", "Organization subdomain", "dev")
-        .option("--debounce <ms>", "Debounce time in milliseconds", "2500")
-        .action(async (options) => {
-        const apiKey = options.apiKey || process.env.NG_API_KEY;
-        if (!apiKey) {
-            console.error("Error: API key is required. Provide it via --api-key or set the NG_API_KEY environment variable.");
-            process.exit(1);
-        }
-        const distPath = findDistPath();
-        const debounceMs = parseInt(options.debounce, 10);
-        let appJson;
-        try {
-            appJson = readAppJson(distPath);
-        }
-        catch (error) {
-            console.error("❌ Could not read app.json. Make sure the dist folder exists and contains app.json.");
-            process.exit(1);
-        }
-        console.log(`👀 Watching ${distPath} for changes...`);
-        console.log(`   App: ${appJson.name}`);
-        console.log(`   Org: ${options.org}`);
-        console.log(`   File ID: ${options.fileId}`);
-        console.log(`   Debounce: ${debounceMs}ms`);
-        console.log("");
-        let syncTimeout = null;
-        let isSyncing = false;
-        let isShuttingDown = false;
-        const doSync = async () => {
-            if (isShuttingDown)
-                return;
-            if (isSyncing) {
-                console.log("⏳ Sync already in progress, queuing...");
-                syncTimeout = setTimeout(doSync, debounceMs);
-                return;
-            }
-            isSyncing = true;
-            const startTime = Date.now();
-            try {
-                const currentAppJson = readAppJson(distPath);
-                console.log(`\n🔄 Syncing ${currentAppJson.name}...`);
-                const result = await syncToApi(distPath, options.org, currentAppJson.name, options.fileId, apiKey);
-                const duration = ((Date.now() - startTime) / 1000).toFixed(1);
-                console.log(`✅ Synced in ${duration}s - ${result.files_uploaded} files`);
-            }
-            catch (error) {
-                console.error("❌ Sync failed:", error instanceof Error ? error.message : error);
-            }
-            finally {
-                isSyncing = false;
-            }
-        };
-        const watcher = chokidar.watch(distPath, {
-            persistent: true,
-            ignoreInitial: true,
-            awaitWriteFinish: {
-                stabilityThreshold: 500,
-                pollInterval: 100,
-            },
-        });
-        watcher.on("all", (_event, filePath) => {
-            if (syncTimeout) {
-                clearTimeout(syncTimeout);
-            }
-            console.log(`📝 Change detected: ${path.relative(distPath, filePath)}`);
-            syncTimeout = setTimeout(doSync, debounceMs);
-        });
-        // Graceful shutdown - revert dev override (register before initial sync)
-        const shutdown = async (signal) => {
-            if (isShuttingDown)
-                return;
-            isShuttingDown = true;
-            console.log(`\n👋 ${signal} received...`);
-            watcher.close();
-            if (syncTimeout)
-                clearTimeout(syncTimeout);
-            // Wait for any in-progress sync to complete
-            if (isSyncing) {
-                console.log("⏳ Waiting for sync to complete...");
-                while (isSyncing) {
-                    await new Promise((resolve) => setTimeout(resolve, 100));
-                }
-            }
-            console.log("🔄 Reverting dev override...");
-            try {
-                await revertDevOverride(options.org, options.fileId, apiKey);
-            }
-            catch (error) {
-                console.error("⚠️  Failed to revert:", error instanceof Error ? error.message : error);
-            }
-            process.exit(0);
-        };
-        process.on("SIGINT", () => shutdown("SIGINT"));
-        process.on("SIGTERM", () => shutdown("SIGTERM"));
-        // Initial sync
-        console.log("🚀 Initial sync...");
-        await doSync();
-    });
-    program
-        .command("revert")
-        .description("Revert the dev override and restore the original version")
-        .requiredOption("--file-id <id>", "File ID of the installed app (pitcher_file.id)")
-        .option("--api-key <apiKey>", "API Key for authentication")
-        .option("--org <organization>", "Organization subdomain", "dev")
-        .action(async (options) => {
-        try {
-            const apiKey = options.apiKey || process.env.NG_API_KEY;
-            if (!apiKey) {
-                console.error("Error: API key is required. Provide it via --api-key or set the NG_API_KEY environment variable.");
-                process.exit(1);
-            }
-            await revertDevOverride(options.org, options.fileId, apiKey);
-        }
-        catch (error) {
-            console.error("❌ Revert failed:", error instanceof Error ? error.message : error);
-            process.exit(1);
-        }
-    });
-    return program;
-}

package/dist/src/publishApp.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createPublishAppCommand(): Command;