@underlingscloud/cli 0.2.1 → 0.2.3

package/dist/commands/project-run.d.ts

@@ -0,0 +1,8 @@
+export declare const runProject: (commandParts: string[]) => Promise<void>;
+export declare const envProject: (options: {
+    project?: string;
+    branch?: string;
+    format?: string;
+    filter?: string;
+}) => Promise<void>;
+export declare function fetchProjectVariables(projectSlug: string, branch: string, token: string): Promise<Record<string, string>>;

package/dist/commands/project-run.js

@@ -0,0 +1,193 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.envProject = exports.runProject = void 0;
+exports.fetchProjectVariables = fetchProjectVariables;
+const cross_spawn_1 = __importDefault(require("cross-spawn"));
+const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
+const axios_1 = __importDefault(require("axios"));
+const constants_1 = require("../constants");
+const config_1 = require("../utils/config");
+const auth_1 = require("../utils/auth");
+const runProject = async (commandParts) => {
+    if (commandParts.length === 0) {
+        console.error(chalk_1.default.red('Error: No command provided to run.'));
+        console.log('Usage: underlings project run <command>');
+        return;
+    }
+    if (!(0, auth_1.isAuthenticated)()) {
+        console.error(chalk_1.default.red('Error: You are not logged in.'));
+        console.log('Run "underlings auth login" to authenticate.');
+        return;
+    }
+    const token = (0, auth_1.getAuthToken)();
+    // Read project config
+    if (!(0, config_1.hasProjectConfig)()) {
+        console.error(chalk_1.default.red('Error: No ulproject.json (or ccproject.json) found in the ancestry tree.'));
+        console.log('Please run "underlings project init" in your repository root.');
+        return;
+    }
+    let config;
+    try {
+        config = (0, config_1.readProjectConfig)();
+    }
+    catch (e) {
+        console.error(chalk_1.default.red('Error reading project config file.'));
+        return;
+    }
+    if (!config.project) {
+        console.error(chalk_1.default.red('Error: Invalid project config. Missing "project" identifier.'));
+        return;
+    }
+    // Get git branch
+    let branch;
+    try {
+        branch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD').toString().trim();
+    }
+    catch (e) {
+        console.error(chalk_1.default.red('Error: Could not determine git branch. Are you in a git repository?'));
+        return;
+    }
+    if (!branch) {
+        console.error(chalk_1.default.red('Error: Current branch is empty.'));
+        return;
+    }
+    console.log(chalk_1.default.dim(`Detected branch: ${branch}`));
+    // Fetch project variables
+    console.log(chalk_1.default.blue('Fetching project variables...'));
+    let envVars = {};
+    try {
+        envVars = await fetchProjectVariables(config.project, branch, token);
+        console.log(chalk_1.default.green(`Successfully loaded ${Object.keys(envVars).length} variables for project: ${config.project}`));
+    }
+    catch (error) {
+        const msg = error.message || '';
+        const isNetworkError = error.code === 'ECONNREFUSED' || error.code === 'ECONNABORTED'
+            || error.code === 'ENOTFOUND' || error.code === 'ERR_NETWORK'
+            || msg.includes('Network Error') || msg.includes('ECONNREFUSED');
+        if (isNetworkError) {
+            console.error('');
+            console.error(chalk_1.default.yellow('⚠️  Could not reach the Underlings API'));
+            console.error('');
+        }
+        else {
+            console.error(chalk_1.default.red('Failed to fetch variables:'), msg);
+        }
+        return;
+    }
+    // Execute command
+    const [cmd, ...args] = commandParts;
+    console.log(chalk_1.default.dim(`> Executing: ${cmd} ${args.join(' ')}`));
+    const child = (0, cross_spawn_1.default)(cmd, args, {
+        stdio: 'inherit',
+        env: {
+            ...process.env,
+            ...envVars
+        }
+    });
+    child.on('exit', (code) => {
+        process.exit(code || 0);
+    });
+};
+exports.runProject = runProject;
+const envProject = async (options) => {
+    if (!(0, auth_1.isAuthenticated)()) {
+        console.error(chalk_1.default.red('Error: You are not logged in.'));
+        process.exit(1);
+    }
+    const token = (0, auth_1.getAuthToken)();
+    // Determine project slug
+    let projectSlug = options.project;
+    if (!projectSlug) {
+        if (!(0, config_1.hasProjectConfig)()) {
+            console.error(chalk_1.default.red('Error: No project config found. Use --project <slug> or run from a directory with ulproject.json.'));
+            process.exit(1);
+        }
+        projectSlug = (0, config_1.readProjectConfig)().project;
+    }
+    // Determine branch
+    let branch = options.branch || 'main';
+    if (!options.branch) {
+        try {
+            branch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD').toString().trim();
+        }
+        catch {
+            // Fall back to 'main' if not in a git repo
+        }
+    }
+    // Fetch vars
+    let envVars;
+    try {
+        envVars = await fetchProjectVariables(projectSlug, branch, token);
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Failed to fetch variables:'), error.message);
+        process.exit(1);
+    }
+    // Apply filter
+    if (options.filter) {
+        const prefix = options.filter;
+        envVars = Object.fromEntries(Object.entries(envVars).filter(([key]) => key.startsWith(prefix)));
+    }
+    const format = options.format || 'shell';
+    const sorted = Object.entries(envVars).sort(([a], [b]) => a.localeCompare(b));
+    switch (format) {
+        case 'yaml':
+            for (const [key, value] of sorted) {
+                const escaped = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
+                console.log(`${key}: "${escaped}"`);
+            }
+            break;
+        case 'docker-build-args':
+            for (const [key, value] of sorted) {
+                console.log(`--build-arg ${key}=${value}`);
+            }
+            break;
+        case 'dotenv':
+            for (const [key, value] of sorted) {
+                const escaped = value.replace(/"/g, '\\"');
+                console.log(`${key}="${escaped}"`);
+            }
+            break;
+        case 'shell':
+        default:
+            for (const [key, value] of sorted) {
+                console.log(`${chalk_1.default.cyan(key)}=${value}`);
+            }
+            break;
+    }
+};
+exports.envProject = envProject;
+async function fetchProjectVariables(projectSlug, branch, token) {
+    const query = `
+        query GetProjectVariables($projectSlug: String!, $branch: String!) {
+            projectVariables(projectSlug: $projectSlug, branch: $branch, includeSystem: true) {
+                key
+                valueType
+                value
+                isSecret
+            }
+        }
+    `;
+    const result = await axios_1.default.post((0, constants_1.getApiUrl)(), {
+        query,
+        variables: { projectSlug, branch }
+    }, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`
+        }
+    });
+    if (result.data.errors) {
+        throw new Error(result.data.errors[0].message);
+    }
+    const variables = result.data.data.projectVariables;
+    const envMap = {};
+    variables.forEach((v) => {
+        envMap[v.key] = v.value;
+    });
+    return envMap;
+}

package/dist/commands/run.js

@@ -64,7 +64,27 @@ const run = async (commandParts) => {
         console.log(chalk_1.default.green(`Successfully loaded ${Object.keys(envVars).length} variables for service: ${config.service}`));
     }
     catch (error) {
-        console.error(chalk_1.default.red('Failed to fetch variables:'), error.message);
+        const msg = error.message || '';
+        const isNetworkError = error.code === 'ECONNREFUSED' || error.code === 'ECONNABORTED'
+            || error.code === 'ENOTFOUND' || error.code === 'ERR_NETWORK'
+            || msg.includes('Network Error') || msg.includes('ECONNREFUSED');
+        if (isNetworkError) {
+            console.error('');
+            console.error(chalk_1.default.yellow('⚠️  Could not reach the Underlings API'));
+            console.error('');
+            console.error(chalk_1.default.white("  Don't panic! Here's what to do:"));
+            console.error('');
+            console.error(chalk_1.default.dim('  1. Check if the API is running (is it deployed? is your internet on?)'));
+            console.error(chalk_1.default.dim('  2. If you need to work offline, copy your .env file and edit DATABASE_URL manually'));
+            console.error(chalk_1.default.dim(`  3. Then run the command directly without underlings run:`));
+            console.error(chalk_1.default.dim(`     ${chalk_1.default.cyan(commandParts.join(' '))}`));
+            console.error('');
+            console.error(chalk_1.default.dim(`  API URL: ${(0, constants_1.getApiUrl)()}`));
+            console.error('');
+        }
+        else {
+            console.error(chalk_1.default.red('Failed to fetch variables:'), msg);
+        }
         return;
     }
     // Execute command
@@ -135,17 +155,11 @@ const env = async (options) => {
     switch (format) {
         case 'yaml':
             // YAML format for gcloud --env-vars-file
+            // Always quote values to prevent gcloud from interpreting
+            // numeric strings as integers (e.g. phone numbers, numeric IDs)
             for (const [key, value] of sorted) {
-                // YAML values with special chars need quoting
-                const needsQuote = /[:{}\[\],&*#?|\-<>=!%@`"'\n\\]/.test(value) || value.includes(' ');
-                if (needsQuote) {
-                    // Use double-quoted YAML string, escaping backslashes and double quotes
-                    const escaped = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
-                    console.log(`${key}: "${escaped}"`);
-                }
-                else {
-                    console.log(`${key}: ${value}`);
-                }
+                const escaped = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
+                console.log(`${key}: "${escaped}"`);
             }
             break;
         case 'docker-build-args':
@@ -176,8 +190,10 @@ async function fetchServiceVariables(serviceSlug, branch, token) {
         query GetServiceVariables($serviceSlug: String!, $branch: String!) {
             serviceVariables(serviceSlug: $serviceSlug, branch: $branch, includeSystem: true) {
                 key
+                valueType
                 value
                 isSecret
+                sourceServiceSlug
             }
         }
     `;
@@ -195,8 +211,21 @@ async function fetchServiceVariables(serviceSlug, branch, token) {
     }
     const variables = result.data.data.serviceVariables;
     const envMap = {};
+    const overrideProxyUrl = process.env.UL_OVERRIDE_PROXY_URL;
     variables.forEach((v) => {
-        envMap[v.key] = v.value;
+        // Precise granular override for service-to-service mapping (slugs like ul-api become UL_OVERRIDE_SERVICE_UL_API)
+        const envKey = v.sourceServiceSlug ? `UL_OVERRIDE_SERVICE_${v.sourceServiceSlug.toUpperCase().replace(/-/g, '_')}` : null;
+        const granularOverride = envKey ? process.env[envKey] : null;
+        if (v.valueType === 'SERVICE_URL' && granularOverride) {
+            envMap[v.key] = granularOverride;
+        }
+        else if (v.valueType === 'SERVICE_URL' && overrideProxyUrl) {
+            // Fallback to legacy global proxy if set
+            envMap[v.key] = overrideProxyUrl;
+        }
+        else {
+            envMap[v.key] = v.value;
+        }
     });
     return envMap;
 }

package/dist/index.js

@@ -75,6 +75,23 @@ project.command('init')
     const { initProject } = await Promise.resolve().then(() => __importStar(require('./commands/project')));
     await initProject();
 });
+project.command('run [command...]')
+    .description('Run a command with injected project-level variables')
+    .allowUnknownOption()
+    .action(async (commandParts) => {
+    const { runProject } = await Promise.resolve().then(() => __importStar(require('./commands/project-run')));
+    await runProject(commandParts);
+});
+project.command('env')
+    .description('Print resolved project-level environment variables (like Neon DATABASE_URL)')
+    .option('-p, --project <slug>', 'Project slug (overrides ulproject.json)')
+    .option('-b, --branch <name>', 'Branch name (overrides git detection)')
+    .option('-f, --format <fmt>', 'Output format: shell, yaml, docker-build-args, dotenv', 'shell')
+    .option('--filter <prefix>', 'Only include vars matching prefix (e.g. DATABASE_URL)')
+    .action(async (options) => {
+    const { envProject } = await Promise.resolve().then(() => __importStar(require('./commands/project-run')));
+    await envProject(options);
+});
 // ─── Service ────────────────────────────────────────────────────────────────
 const service = program.command('service').description('Service management commands');
 service.command('init')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@underlingscloud/cli",
-    "version": "0.2.1",
+    "version": "0.2.3",
     "description": "Underlings Developer Utilities CLI",
     "main": "dist/index.js",
     "bin": {
@@ -37,4 +37,4 @@
         "directory": "packages/cli"
     },
     "license": "MIT"
-}
+}