@solidactions/cli 0.4.0 → 0.5.0

package/README.md

@@ -36,6 +36,7 @@ solidactions deploy <project-name> <path>
 | `env:delete <key>` | Delete an environment variable |
 | `env:map <project> <key> <global-key>` | Map a global variable to a project |
 | `env:pull <project>` | Pull resolved env vars (including OAuth tokens) to a local file |
+| `env:push <project> [path]` | Push .env values to a project |
 | `schedule:set <project> <cron>` | Set a cron schedule for a workflow |
 | `schedule:list <project>` | List schedules for a project |
 | `schedule:delete <project> <id>` | Delete a schedule |

package/dist/commands/deploy.js

@@ -12,6 +12,7 @@ const form_data_1 = __importDefault(require("form-data"));
 const chalk_1 = __importDefault(require("chalk"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const init_1 = require("./init");
+const env_1 = require("../utils/env");
 /**
  * Validate project structure before deployment.
  * Checks for required files and SDK dependency.
@@ -84,94 +85,12 @@ function validateProject(sourceDir) {
     }
     return { valid: errors.length === 0, errors, warnings };
 }
-/**
- * Parse a .env file into a key-value map.
- */
-function parseEnvFile(filePath) {
-    const envMap = new Map();
-    if (!fs_1.default.existsSync(filePath)) {
-        return envMap;
-    }
-    const content = fs_1.default.readFileSync(filePath, 'utf8');
-    const lines = content.split('\n');
-    for (const line of lines) {
-        const trimmed = line.trim();
-        // Skip empty lines and comments
-        if (!trimmed || trimmed.startsWith('#')) {
-            continue;
-        }
-        const equalsIndex = trimmed.indexOf('=');
-        if (equalsIndex === -1) {
-            continue;
-        }
-        const key = trimmed.substring(0, equalsIndex).trim();
-        let value = trimmed.substring(equalsIndex + 1).trim();
-        // Remove surrounding quotes if present
-        if ((value.startsWith('"') && value.endsWith('"')) ||
-            (value.startsWith("'") && value.endsWith("'"))) {
-            value = value.slice(1, -1);
-        }
-        envMap.set(key, value);
-    }
-    return envMap;
-}
-/**
- * Parse YAML env declarations into structured format.
- * Handles the new simplified format:
- *   - VAR_NAME           -> { key: "VAR_NAME", mappedTo: null }
- *   - VAR_NAME: GLOBAL   -> { key: "VAR_NAME", mappedTo: "GLOBAL" }
- */
-function parseYamlEnvVars(config) {
-    const parsedVars = [];
-    if (!config.env || !Array.isArray(config.env)) {
-        return parsedVars;
-    }
-    for (const item of config.env) {
-        if (typeof item === 'string') {
-            // Simple string: - VAR_NAME (declared only, needs configuration)
-            parsedVars.push({ key: item, mappedTo: null, oauthName: null });
-        }
-        else if (typeof item === 'object' && item !== null) {
-            // Object: - VAR_NAME: GLOBAL_NAME or - VAR_NAME: { oauth: connection-name }
-            const keys = Object.keys(item);
-            if (keys.length === 1) {
-                const key = keys[0];
-                const value = item[key];
-                if (typeof value === 'object' && value !== null && 'oauth' in value) {
-                    if (typeof value.oauth !== 'string' || !value.oauth) {
-                        throw new Error(`Invalid env config for ${key}: 'oauth' must be a non-empty string`);
-                    }
-                    parsedVars.push({ key, mappedTo: null, oauthName: value.oauth });
-                }
-                else {
-                    parsedVars.push({ key, mappedTo: value || null, oauthName: null });
-                }
-            }
-        }
-    }
-    return parsedVars;
-}
-/**
- * Extract declared variable keys from solidactions.yaml env config.
- * Returns a set of env var keys that are declared in YAML.
- */
-function getYamlDeclaredVars(config) {
-    const parsedVars = parseYamlEnvVars(config);
-    return new Set(parsedVars.map(v => v.key));
-}
-/**
- * Check if deployEnv is enabled in the config.
- * New format has deployEnv at top level.
- */
-function isDeployEnvEnabled(config) {
-    return config.deployEnv === true;
-}
 /**
  * Push YAML env declarations to the project.
  * This registers all YAML-declared vars and their mappings.
  */
 async function pushYamlDeclarations(host, apiKey, projectSlug, yamlConfig) {
-    const parsedVars = parseYamlEnvVars(yamlConfig);
+    const parsedVars = (0, env_1.parseYamlEnvVars)(yamlConfig);
     if (parsedVars.length === 0) {
         return;
     }
@@ -196,71 +115,6 @@ async function pushYamlDeclarations(host, apiKey, projectSlug, yamlConfig) {
         console.error(chalk_1.default.yellow('Warning: Failed to sync YAML declarations:'), error.response?.data?.message || error.message);
     }
 }
-/**
- * Push environment variables from .env file to project.
- * Only pushes vars that are declared in solidactions.yaml.
- */
-async function pushEnvVars(host, apiKey, projectSlug, sourceDir, environment, yamlConfig) {
-    // Get vars declared in YAML
-    const declaredVars = getYamlDeclaredVars(yamlConfig);
-    if (declaredVars.size === 0) {
-        console.log(chalk_1.default.gray('No environment variables declared in solidactions.yaml'));
-        return;
-    }
-    // Read the .env file for this environment
-    const envFileName = environment === 'production' ? '.env' : `.env.${environment}`;
-    const envFilePath = path_1.default.join(sourceDir, envFileName);
-    if (!fs_1.default.existsSync(envFilePath)) {
-        console.log(chalk_1.default.yellow(`⚠ ${envFileName} not found, skipping env push`));
-        // Warn about each missing declared var
-        for (const key of declaredVars) {
-            console.log(chalk_1.default.yellow(`  ⚠ ${key}: no value (not in ${envFileName})`));
-        }
-        return;
-    }
-    // Parse the .env file
-    const envValues = parseEnvFile(envFilePath);
-    // Filter to only YAML-declared vars
-    const variables = [];
-    const missing = [];
-    for (const key of declaredVars) {
-        const value = envValues.get(key);
-        if (value !== undefined) {
-            // Mark vars containing "secret", "key", "token", "password" as secrets
-            const isSecret = /secret|key|token|password|credential/i.test(key);
-            variables.push({ key, value, is_secret: isSecret });
-        }
-        else {
-            missing.push(key);
-        }
-    }
-    // Warn about missing vars
-    for (const key of missing) {
-        console.log(chalk_1.default.yellow(`⚠ ${key}: not found in ${envFileName}`));
-    }
-    if (variables.length === 0) {
-        console.log(chalk_1.default.yellow('No matching environment variables to push'));
-        return;
-    }
-    // Push to API
-    try {
-        const response = await axios_1.default.post(`${host}/api/v1/projects/${projectSlug}/variable-mappings/bulk`, { variables }, {
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-            },
-        });
-        const { created, updated } = response.data;
-        console.log(chalk_1.default.green(`✓ Pushed ${variables.length} environment variables from ${envFileName}`));
-        if (created > 0 || updated > 0) {
-            console.log(chalk_1.default.gray(`  (${created} created, ${updated} updated)`));
-        }
-    }
-    catch (error) {
-        console.error(chalk_1.default.red('Failed to push environment variables:'), error.response?.data?.message || error.message);
-    }
-}
 async function deploy(projectName, sourcePath, options = {}) {
     const config = (0, init_1.getConfig)();
     if (!config?.apiKey) {
@@ -399,11 +253,6 @@ async function deploy(projectName, sourcePath, options = {}) {
                         if (yamlConfig) {
                             await pushYamlDeclarations(config.host, config.apiKey, projectSlug, yamlConfig);
                         }
-                        // Push .env values if deployEnv is enabled
-                        if (yamlConfig && isDeployEnvEnabled(yamlConfig)) {
-                            console.log(chalk_1.default.blue('\nPushing environment variables...'));
-                            await pushEnvVars(config.host, config.apiKey, projectSlug, sourceDir, environment, yamlConfig);
-                        }
                         fs_1.default.unlinkSync(zipPath);
                         process.exit(0);
                     }

package/dist/commands/dev.js

@@ -8,6 +8,7 @@ const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const chalk_1 = __importDefault(require("chalk"));
+const dotenv_1 = __importDefault(require("dotenv"));
 async function dev(file, options) {
     // Resolve the workflow file path
     const filePath = path_1.default.resolve(file);
@@ -35,6 +36,12 @@ async function dev(file, options) {
         console.log(chalk_1.default.gray('Update to the latest SDK version: npm install @solidactions/sdk@latest'));
         process.exit(1);
     }
+    // Load .env file from project root
+    const envPath = path_1.default.join(projectDir, '.env');
+    if (fs_1.default.existsSync(envPath)) {
+        dotenv_1.default.config({ path: envPath });
+        console.log(chalk_1.default.gray(`Loaded .env from ${projectDir}`));
+    }
     // Validate input JSON if provided
     const input = options.input || '{}';
     try {

package/dist/commands/env-push.js

@@ -0,0 +1,208 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.envPush = envPush;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const axios_1 = __importDefault(require("axios"));
+const chalk_1 = __importDefault(require("chalk"));
+const prompts_1 = __importDefault(require("prompts"));
+const init_1 = require("./init");
+const env_1 = require("../utils/env");
+async function envPush(projectName, sourcePath, options = {}) {
+    const config = (0, init_1.getConfig)();
+    if (!config?.apiKey) {
+        console.error(chalk_1.default.red('Not initialized. Run "solidactions init <api-key>" first.'));
+        process.exit(1);
+    }
+    const sourceDir = path_1.default.resolve(sourcePath);
+    const environment = options.env || 'dev';
+    // Read solidactions.yaml
+    const yamlPath = path_1.default.join(sourceDir, 'solidactions.yaml');
+    if (!fs_1.default.existsSync(yamlPath)) {
+        console.error(chalk_1.default.red('solidactions.yaml not found in ' + sourceDir));
+        console.log(chalk_1.default.gray('Make sure you\'re in a SolidActions project directory.'));
+        process.exit(1);
+    }
+    let yamlConfig;
+    try {
+        yamlConfig = (0, env_1.loadSolidActionsConfig)(yamlPath);
+    }
+    catch (err) {
+        console.error(chalk_1.default.red('Failed to parse solidactions.yaml:'), err.message);
+        process.exit(1);
+    }
+    // Get YAML-declared vars
+    const declaredVars = (0, env_1.getYamlDeclaredVars)(yamlConfig);
+    // Determine env file
+    const envFileName = environment === 'production' ? '.env' : `.env.${environment}`;
+    const envFilePath = path_1.default.join(sourceDir, envFileName);
+    if (!fs_1.default.existsSync(envFilePath)) {
+        console.error(chalk_1.default.red(`${envFileName} not found in ${sourceDir}`));
+        console.log(chalk_1.default.gray(`Create ${envFileName} with your environment variables, or use a different --env.`));
+        process.exit(1);
+    }
+    // Parse the .env file
+    const envValues = (0, env_1.parseEnvFile)(envFilePath);
+    if (envValues.size === 0) {
+        console.log(chalk_1.default.yellow(`${envFileName} is empty — nothing to push.`));
+        process.exit(0);
+    }
+    // Filter to YAML-declared vars only (unless --include-undeclared)
+    let keysToProcess;
+    if (options.includeUndeclared) {
+        keysToProcess = Array.from(envValues.keys());
+    }
+    else {
+        if (declaredVars.size === 0) {
+            console.log(chalk_1.default.yellow('No environment variables declared in solidactions.yaml.'));
+            console.log(chalk_1.default.gray('Use --include-undeclared to push all vars from the .env file.'));
+            process.exit(0);
+        }
+        keysToProcess = Array.from(envValues.keys()).filter(k => declaredVars.has(k));
+        // Warn about YAML-declared vars missing from .env
+        for (const key of declaredVars) {
+            if (!envValues.has(key)) {
+                console.log(chalk_1.default.yellow(`⚠ ${key}: declared in YAML but not found in ${envFileName}`));
+            }
+        }
+    }
+    if (keysToProcess.length === 0) {
+        console.log(chalk_1.default.yellow('No matching variables to push.'));
+        if (!options.includeUndeclared && envValues.size > 0) {
+            console.log(chalk_1.default.gray('Your .env has variables not declared in solidactions.yaml. Use --include-undeclared to push them.'));
+        }
+        process.exit(0);
+    }
+    // Build project slug
+    const projectSlug = environment === 'production'
+        ? projectName
+        : `${projectName}-${environment}`;
+    console.log(chalk_1.default.blue(`Pushing env vars to "${projectName}" (${environment})...`));
+    // Fetch current server state
+    let serverMappings = [];
+    try {
+        const response = await axios_1.default.get(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings`, {
+            headers: {
+                'Authorization': `Bearer ${config.apiKey}`,
+                'Accept': 'application/json',
+            },
+        });
+        serverMappings = response.data || [];
+    }
+    catch (error) {
+        if (error.response?.status === 401) {
+            console.error(chalk_1.default.red('Authentication failed. Run "solidactions init <api-key>" to re-configure.'));
+            process.exit(1);
+        }
+        else if (error.response?.status === 404) {
+            console.error(chalk_1.default.red(`Project "${projectSlug}" not found.`));
+            console.log(chalk_1.default.gray(`Deploy first with: solidactions deploy ${projectName} --env ${environment}` + (environment !== 'production' ? ' --create' : '')));
+            process.exit(1);
+        }
+        throw error;
+    }
+    // Build a lookup of server state by env_name
+    const serverState = new Map();
+    for (const mapping of serverMappings) {
+        serverState.set(mapping.env_name, mapping);
+    }
+    const entries = [];
+    for (const key of keysToProcess) {
+        const value = envValues.get(key);
+        const isSecret = /secret|key|token|password|credential/i.test(key);
+        const existing = serverState.get(key);
+        let action;
+        if (!existing || existing.status === 'not_configured' || existing.has_value === false) {
+            action = 'create';
+        }
+        else {
+            action = 'update';
+        }
+        // If --new-only, skip updates
+        if (options.newOnly && action === 'update') {
+            action = 'skip';
+        }
+        entries.push({ key, value, is_secret: isSecret, action });
+    }
+    const toCreate = entries.filter(e => e.action === 'create');
+    const toUpdate = entries.filter(e => e.action === 'update');
+    const toSkip = entries.filter(e => e.action === 'skip');
+    const toPush = entries.filter(e => e.action !== 'skip');
+    if (toPush.length === 0) {
+        console.log(chalk_1.default.yellow('Nothing to push — all variables are already configured.'));
+        if (toSkip.length > 0) {
+            console.log(chalk_1.default.gray(`${toSkip.length} variable(s) skipped (--new-only).`));
+        }
+        process.exit(0);
+    }
+    // Display diff table
+    console.log('');
+    console.log(chalk_1.default.bold('  KEY'.padEnd(36) + 'ACTION'.padEnd(12) + 'NOTES'));
+    console.log(chalk_1.default.gray('  ' + '─'.repeat(56)));
+    for (const entry of entries) {
+        const keyCol = ('  ' + entry.key).padEnd(36);
+        let actionCol;
+        let notesCol;
+        switch (entry.action) {
+            case 'create':
+                actionCol = chalk_1.default.green('create'.padEnd(12));
+                notesCol = chalk_1.default.gray('(new)');
+                break;
+            case 'update':
+                actionCol = chalk_1.default.yellow('update'.padEnd(12));
+                notesCol = chalk_1.default.gray('(has existing value)');
+                break;
+            case 'skip':
+                actionCol = chalk_1.default.gray('skip'.padEnd(12));
+                notesCol = chalk_1.default.gray('(--new-only)');
+                break;
+        }
+        console.log(keyCol + actionCol + notesCol);
+    }
+    console.log('');
+    // Confirm unless --yes
+    if (!options.yes) {
+        const summary = [];
+        if (toCreate.length > 0)
+            summary.push(`${toCreate.length} create`);
+        if (toUpdate.length > 0)
+            summary.push(`${toUpdate.length} update`);
+        if (toSkip.length > 0)
+            summary.push(`${toSkip.length} skip`);
+        const response = await (0, prompts_1.default)({
+            type: 'confirm',
+            name: 'confirm',
+            message: `Push ${toPush.length} variable(s) to ${projectSlug}? (${summary.join(', ')})`,
+            initial: true,
+        });
+        if (!response.confirm) {
+            console.log(chalk_1.default.gray('Cancelled.'));
+            return;
+        }
+    }
+    // Push via bulk API
+    const variables = toPush.map(e => ({
+        key: e.key,
+        value: e.value,
+        is_secret: e.is_secret,
+    }));
+    try {
+        const response = await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings/bulk`, { variables }, {
+            headers: {
+                'Authorization': `Bearer ${config.apiKey}`,
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+            },
+        });
+        const { created, updated } = response.data;
+        console.log(chalk_1.default.green(`\n✓ Pushed ${toPush.length} variable(s) to ${projectSlug}`));
+        console.log(chalk_1.default.gray(`  ${created} created, ${updated} updated` + (toSkip.length > 0 ? `, ${toSkip.length} skipped` : '')));
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Failed to push environment variables:'), error.response?.data?.message || error.message);
+        process.exit(1);
+    }
+}

package/dist/index.js

@@ -14,6 +14,7 @@ const env_list_1 = require("./commands/env-list");
 const env_delete_1 = require("./commands/env-delete");
 const env_map_1 = require("./commands/env-map");
 const env_pull_1 = require("./commands/env-pull");
+const env_push_1 = require("./commands/env-push");
 const schedule_set_1 = require("./commands/schedule-set");
 const schedule_list_1 = require("./commands/schedule-list");
 const schedule_delete_1 = require("./commands/schedule-delete");
@@ -173,6 +174,18 @@ program
     .action((project, options) => {
     (0, env_pull_1.envPull)(project, options);
 });
+program
+    .command('env:push')
+    .description('Push environment variables from .env file to a project')
+    .argument('<project>', 'Project name')
+    .argument('[path]', 'Source directory with solidactions.yaml and .env file', '.')
+    .option('-e, --env <environment>', 'Target environment (production/staging/dev)', 'dev')
+    .option('--new-only', 'Only push new or empty variables (skip existing)')
+    .option('--include-undeclared', 'Also push vars not declared in solidactions.yaml')
+    .option('-y, --yes', 'Skip confirmation prompt')
+    .action((project, path, options) => {
+    (0, env_push_1.envPush)(project, path, options);
+});
 // =============================================================================
 // Scheduling
 // =============================================================================

package/dist/utils/env.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseEnvFile = parseEnvFile;
+exports.parseYamlEnvVars = parseYamlEnvVars;
+exports.getYamlDeclaredVars = getYamlDeclaredVars;
+exports.loadSolidActionsConfig = loadSolidActionsConfig;
+const fs_1 = __importDefault(require("fs"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+/**
+ * Parse a .env file into a key-value map.
+ */
+function parseEnvFile(filePath) {
+    const envMap = new Map();
+    if (!fs_1.default.existsSync(filePath)) {
+        return envMap;
+    }
+    const content = fs_1.default.readFileSync(filePath, 'utf8');
+    const lines = content.split('\n');
+    for (const line of lines) {
+        const trimmed = line.trim();
+        // Skip empty lines and comments
+        if (!trimmed || trimmed.startsWith('#')) {
+            continue;
+        }
+        const equalsIndex = trimmed.indexOf('=');
+        if (equalsIndex === -1) {
+            continue;
+        }
+        const key = trimmed.substring(0, equalsIndex).trim();
+        let value = trimmed.substring(equalsIndex + 1).trim();
+        // Remove surrounding quotes if present
+        if ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))) {
+            value = value.slice(1, -1);
+        }
+        envMap.set(key, value);
+    }
+    return envMap;
+}
+/**
+ * Parse YAML env declarations into structured format.
+ * Handles the new simplified format:
+ *   - VAR_NAME           -> { key: "VAR_NAME", mappedTo: null }
+ *   - VAR_NAME: GLOBAL   -> { key: "VAR_NAME", mappedTo: "GLOBAL" }
+ */
+function parseYamlEnvVars(config) {
+    const parsedVars = [];
+    if (!config.env || !Array.isArray(config.env)) {
+        return parsedVars;
+    }
+    for (const item of config.env) {
+        if (typeof item === 'string') {
+            // Simple string: - VAR_NAME (declared only, needs configuration)
+            parsedVars.push({ key: item, mappedTo: null, oauthName: null });
+        }
+        else if (typeof item === 'object' && item !== null) {
+            // Object: - VAR_NAME: GLOBAL_NAME or - VAR_NAME: { oauth: connection-name }
+            const keys = Object.keys(item);
+            if (keys.length === 1) {
+                const key = keys[0];
+                const value = item[key];
+                if (typeof value === 'object' && value !== null && 'oauth' in value) {
+                    if (typeof value.oauth !== 'string' || !value.oauth) {
+                        throw new Error(`Invalid env config for ${key}: 'oauth' must be a non-empty string`);
+                    }
+                    parsedVars.push({ key, mappedTo: null, oauthName: value.oauth });
+                }
+                else {
+                    parsedVars.push({ key, mappedTo: value || null, oauthName: null });
+                }
+            }
+        }
+    }
+    return parsedVars;
+}
+/**
+ * Extract declared variable keys from solidactions.yaml env config.
+ * Returns a set of env var keys that are declared in YAML.
+ */
+function getYamlDeclaredVars(config) {
+    const parsedVars = parseYamlEnvVars(config);
+    return new Set(parsedVars.map(v => v.key));
+}
+/**
+ * Load and parse a solidactions.yaml config file.
+ */
+function loadSolidActionsConfig(yamlPath) {
+    const content = fs_1.default.readFileSync(yamlPath, 'utf8');
+    return js_yaml_1.default.load(content);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidactions/cli",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "description": "SolidActions CLI - Deploy and manage workflow automation",
     "main": "dist/index.js",
     "bin": {
@@ -41,6 +41,7 @@
         "axios": "^1.6.0",
         "chalk": "^4.1.2",
         "commander": "^11.0.0",
+        "dotenv": "^17.3.1",
         "form-data": "^4.0.0",
         "fs-extra": "^11.0.0",
         "js-yaml": "^4.1.0",