@chriscode/hush 5.0.0 → 5.0.2

package/dist/commands/encrypt.js

@@ -1,13 +1,11 @@
-import { existsSync, unlinkSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import pc from 'picocolors';
-import { loadConfig } from '../config/loader.js';
 import { encrypt as sopsEncrypt, decrypt as sopsDecrypt } from '../core/sops.js';
 import { parseEnvContent } from '../core/parse.js';
-export async function encryptCommand(options) {
+export async function encryptCommand(ctx, options) {
     const { root } = options;
-    const config = loadConfig(root);
-    console.log(pc.blue('Encrypting secrets...\n'));
+    const config = ctx.config.loadConfig(root);
+    ctx.logger.log(pc.blue('Encrypting secrets...\n'));
     const sourceFiles = [
         { key: 'shared', path: config.sources.shared },
         { key: 'development', path: config.sources.development },
@@ -17,14 +15,14 @@ export async function encryptCommand(options) {
     for (const { key, path } of sourceFiles) {
         const sourcePath = join(root, path);
         const encryptedPath = sourcePath + '.encrypted';
-        if (!existsSync(sourcePath)) {
-            console.log(pc.dim(`  ${path} - not found, skipping`));
+        if (!ctx.fs.existsSync(sourcePath)) {
+            ctx.logger.log(pc.dim(`  ${path} - not found, skipping`));
             continue;
         }
-        const sourceContent = readFileSync(sourcePath, 'utf-8');
+        const sourceContent = ctx.fs.readFileSync(sourcePath, 'utf-8');
         const vars = parseEnvContent(sourceContent);
         sopsEncrypt(sourcePath, encryptedPath);
-        console.log(pc.green(`  ${path}`) + pc.dim(` -> ${path}.encrypted (${vars.length} vars)`));
+        ctx.logger.log(pc.green(`  ${path}`) + pc.dim(` -> ${path}.encrypted (${vars.length} vars)`));
         encryptedFiles.push({
             sourcePath,
             encryptedPath,
@@ -33,48 +31,48 @@ export async function encryptCommand(options) {
         });
     }
     if (encryptedFiles.length === 0) {
-        console.error(pc.red('\nNo source files found to encrypt'));
-        console.error(pc.dim('Create at least .hush with your secrets'));
-        process.exit(1);
+        ctx.logger.error(pc.red('\nNo source files found to encrypt'));
+        ctx.logger.error(pc.dim('Create at least .hush with your secrets'));
+        ctx.process.exit(1);
     }
-    console.log(pc.blue('\nVerifying encryption...'));
+    ctx.logger.log(pc.blue('\nVerifying encryption...'));
     let allVerified = true;
     for (const file of encryptedFiles) {
         try {
             const decrypted = sopsDecrypt(file.encryptedPath);
             const decryptedVars = parseEnvContent(decrypted);
             if (decryptedVars.length === file.originalKeyCount) {
-                console.log(pc.green(`  ${file.displayPath}.encrypted - verified (${decryptedVars.length} vars)`));
+                ctx.logger.log(pc.green(`  ${file.displayPath}.encrypted - verified (${decryptedVars.length} vars)`));
             }
             else {
-                console.log(pc.yellow(`  ${file.displayPath}.encrypted - warning: expected ${file.originalKeyCount} vars, got ${decryptedVars.length}`));
+                ctx.logger.log(pc.yellow(`  ${file.displayPath}.encrypted - warning: expected ${file.originalKeyCount} vars, got ${decryptedVars.length}`));
                 allVerified = false;
             }
         }
         catch (error) {
-            console.log(pc.red(`  ${file.displayPath}.encrypted - FAILED to decrypt`));
-            console.log(pc.dim(`    ${error.message}`));
+            ctx.logger.log(pc.red(`  ${file.displayPath}.encrypted - FAILED to decrypt`));
+            ctx.logger.log(pc.dim(`    ${error.message}`));
             allVerified = false;
         }
     }
     if (!allVerified) {
-        console.log(pc.yellow('\nEncryption completed but verification failed.'));
-        console.log(pc.yellow('Plaintext files have NOT been deleted. Please check your setup.'));
-        process.exit(1);
+        ctx.logger.log(pc.yellow('\nEncryption completed but verification failed.'));
+        ctx.logger.log(pc.yellow('Plaintext files have NOT been deleted. Please check your setup.'));
+        ctx.process.exit(1);
     }
-    console.log(pc.blue('\nCleaning up plaintext files...'));
+    ctx.logger.log(pc.blue('\nCleaning up plaintext files...'));
     for (const file of encryptedFiles) {
         try {
-            unlinkSync(file.sourcePath);
-            console.log(pc.green(`  Deleted ${file.displayPath}`));
+            ctx.fs.unlinkSync(file.sourcePath);
+            ctx.logger.log(pc.green(`  Deleted ${file.displayPath}`));
         }
         catch (error) {
-            console.log(pc.yellow(`  Could not delete ${file.displayPath}: ${error.message}`));
+            ctx.logger.log(pc.yellow(`  Could not delete ${file.displayPath}: ${error.message}`));
         }
     }
-    console.log(pc.green(pc.bold(`\n✓ Encrypted ${encryptedFiles.length} file(s) and removed plaintext`)));
-    console.log(pc.dim('\nNext steps:'));
-    console.log(pc.dim('  1. Commit the .encrypted files to git'));
-    console.log(pc.dim('  2. Use "npx hush run -- <command>" to run with secrets'));
-    console.log(pc.dim('  3. Use "npx hush inspect" to see what variables are set'));
+    ctx.logger.log(pc.green(pc.bold(`\n✓ Encrypted ${encryptedFiles.length} file(s) and removed plaintext`)));
+    ctx.logger.log(pc.dim('\nNext steps:'));
+    ctx.logger.log(pc.dim('  1. Commit the .encrypted files to git'));
+    ctx.logger.log(pc.dim('  2. Use "npx hush run -- <command>" to run with secrets'));
+    ctx.logger.log(pc.dim('  3. Use "npx hush inspect" to see what variables are set'));
 }

package/dist/commands/expansions.d.ts

@@ -1,7 +1,7 @@
-import type { Environment } from '../types.js';
+import type { Environment, HushContext } from '../types.js';
 export interface ExpansionsOptions {
     root: string;
     env: Environment;
 }
-export declare function expansionsCommand(options: ExpansionsOptions): Promise<void>;
+export declare function expansionsCommand(ctx: HushContext, options: ExpansionsOptions): Promise<void>;
 //# sourceMappingURL=expansions.d.ts.map

package/dist/commands/expansions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expansions.d.ts","sourceRoot":"","sources":["../../src/commands/expansions.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,WAAW,CAAC;CAClB;AA+DD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDjF"}
+{"version":3,"file":"expansions.d.ts","sourceRoot":"","sources":["../../src/commands/expansions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAU,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,WAAW,CAAC;CAClB;AAqED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDnG"}

package/dist/commands/expansions.js

@@ -1,32 +1,34 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { join, relative } from 'node:path';
 import pc from 'picocolors';
-import { findProjectRoot } from '../config/loader.js';
 import { parseEnvContent } from '../core/parse.js';
-const TEMPLATE_FILES = ['.env', '.env.development', '.env.production', '.env.local'];
-function findTemplateDirectories(projectRoot, maxDepth = 4) {
+const TEMPLATE_FILES = ['.hush', '.hush.development', '.hush.production', '.hush.local'];
+function findTemplateDirectories(ctx, projectRoot, maxDepth = 4) {
     const templateDirs = [];
     function walk(dir, depth) {
         if (depth > maxDepth)
             return;
-        const hasTemplate = TEMPLATE_FILES.some(f => existsSync(join(dir, f)));
+        const hasTemplate = TEMPLATE_FILES.some(f => ctx.fs.existsSync(join(dir, f)));
         if (hasTemplate && dir !== projectRoot) {
             templateDirs.push(dir);
         }
         try {
-            const entries = readdirSync(dir, { withFileTypes: true });
+            const entries = ctx.fs.readdirSync(dir);
             for (const entry of entries) {
-                if (!entry.isDirectory())
+                const entryName = typeof entry === 'string' ? entry : entry.name;
+                if (entryName.startsWith('.') || entryName === 'node_modules')
                     continue;
-                if (entry.name.startsWith('.'))
+                if (entryName === 'dist' || entryName === 'build')
                     continue;
-                if (entry.name === 'node_modules')
+                const entryPath = join(dir, entryName);
+                try {
+                    const stat = ctx.fs.statSync(entryPath);
+                    if (stat.isDirectory()) {
+                        walk(entryPath, depth + 1);
+                    }
+                }
+                catch {
                     continue;
-                if (entry.name === 'dist')
-                    continue;
-                if (entry.name === 'build')
-                    continue;
-                walk(join(dir, entry.name), depth + 1);
+                }
             }
         }
         catch {
@@ -36,19 +38,19 @@ function findTemplateDirectories(projectRoot, maxDepth = 4) {
     walk(projectRoot, 0);
     return templateDirs;
 }
-function loadTemplateVars(dir, env) {
+function loadTemplateVars(ctx, dir, env) {
     const varSources = [];
-    const basePath = join(dir, '.env');
-    if (existsSync(basePath)) {
-        varSources.push(parseEnvContent(readFileSync(basePath, 'utf-8')));
+    const basePath = join(dir, '.hush');
+    if (ctx.fs.existsSync(basePath)) {
+        varSources.push(parseEnvContent(ctx.fs.readFileSync(basePath, 'utf-8')));
     }
-    const envPath = join(dir, env === 'development' ? '.env.development' : '.env.production');
-    if (existsSync(envPath)) {
-        varSources.push(parseEnvContent(readFileSync(envPath, 'utf-8')));
+    const envPath = join(dir, env === 'development' ? '.hush.development' : '.hush.production');
+    if (ctx.fs.existsSync(envPath)) {
+        varSources.push(parseEnvContent(ctx.fs.readFileSync(envPath, 'utf-8')));
     }
-    const localPath = join(dir, '.env.local');
-    if (existsSync(localPath)) {
-        varSources.push(parseEnvContent(readFileSync(localPath, 'utf-8')));
+    const localPath = join(dir, '.hush.local');
+    if (ctx.fs.existsSync(localPath)) {
+        varSources.push(parseEnvContent(ctx.fs.readFileSync(localPath, 'utf-8')));
     }
     const merged = {};
     for (const vars of varSources) {
@@ -58,46 +60,46 @@ function loadTemplateVars(dir, env) {
     }
     return Object.entries(merged).map(([key, value]) => ({ key, value }));
 }
-export async function expansionsCommand(options) {
+export async function expansionsCommand(ctx, options) {
     const { root, env } = options;
-    const projectInfo = findProjectRoot(root);
+    const projectInfo = ctx.config.findProjectRoot(root);
     if (!projectInfo) {
-        console.error(pc.red('No hush.yaml found in current directory or any parent directory.'));
-        console.error(pc.dim('Run: npx hush init'));
-        process.exit(1);
+        ctx.logger.error(pc.red('No hush.yaml found in current directory or any parent directory.'));
+        ctx.logger.error(pc.dim('Run: npx hush init'));
+        ctx.process.exit(1);
     }
     const { projectRoot } = projectInfo;
-    const templateDirs = findTemplateDirectories(projectRoot);
+    const templateDirs = findTemplateDirectories(ctx, projectRoot);
     if (templateDirs.length === 0) {
-        console.log(pc.yellow('No subdirectory templates found.'));
-        console.log(pc.dim('Templates are .env files in subdirectories that reference root secrets.'));
-        console.log(pc.dim('Create apps/myapp/.env with content like: MY_VAR=${ROOT_SECRET}'));
+        ctx.logger.log(pc.yellow('No subdirectory templates found.'));
+        ctx.logger.log(pc.dim('Templates are .hush files in subdirectories that reference root secrets.'));
+        ctx.logger.log(pc.dim('Create apps/myapp/.hush with content like: MY_VAR=${ROOT_SECRET}'));
         return;
     }
-    console.log('');
-    console.log(pc.bold(`Expansion Graph (from ${projectRoot})`));
-    console.log(pc.dim(`Environment: ${env}`));
-    console.log('');
+    ctx.logger.log('');
+    ctx.logger.log(pc.bold(`Expansion Graph (from ${projectRoot})`));
+    ctx.logger.log(pc.dim(`Environment: ${env}`));
+    ctx.logger.log('');
     for (const dir of templateDirs) {
         const relPath = relative(projectRoot, dir);
-        const vars = loadTemplateVars(dir, env);
+        const vars = loadTemplateVars(ctx, dir, env);
         const expansions = vars.filter(v => v.value.includes('${'));
         const literals = vars.filter(v => !v.value.includes('${'));
-        console.log(pc.cyan(`${relPath}/`));
+        ctx.logger.log(pc.cyan(`${relPath}/`));
         if (expansions.length > 0) {
             for (const { key, value } of expansions) {
                 const isEnvRef = value.includes('${env:');
                 const symbol = isEnvRef ? pc.blue('←') : pc.green('←');
-                console.log(`  ${key.padEnd(30)} ${symbol} ${pc.dim(value)}`);
+                ctx.logger.log(`  ${key.padEnd(30)} ${symbol} ${pc.dim(value)}`);
             }
         }
         if (literals.length > 0) {
             for (const { key } of literals) {
-                console.log(`  ${key.padEnd(30)} ${pc.dim('= (literal)')}`);
+                ctx.logger.log(`  ${key.padEnd(30)} ${pc.dim('= (literal)')}`);
             }
         }
-        console.log('');
+        ctx.logger.log('');
     }
-    console.log(pc.dim(`Found ${templateDirs.length} subdirectory templates.`));
-    console.log('');
+    ctx.logger.log(pc.dim(`Found ${templateDirs.length} subdirectory templates.`));
+    ctx.logger.log('');
 }

package/dist/commands/has.d.ts

@@ -1,9 +1,9 @@
-import type { Environment } from '../types.js';
+import type { Environment, HushContext } from '../types.js';
 export interface HasOptions {
     root: string;
     env: Environment;
     key: string;
     quiet: boolean;
 }
-export declare function hasCommand(options: HasOptions): Promise<void>;
+export declare function hasCommand(ctx: HushContext, options: HasOptions): Promise<void>;
 //# sourceMappingURL=has.d.ts.map

package/dist/commands/has.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has.d.ts","sourceRoot":"","sources":["../../src/commands/has.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAU,WAAW,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,WAAW,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CnE"}
+{"version":3,"file":"has.d.ts","sourceRoot":"","sources":["../../src/commands/has.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAU,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,WAAW,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CrF"}

package/dist/commands/has.js

@@ -1,30 +1,27 @@
-import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import pc from 'picocolors';
-import { loadConfig } from '../config/loader.js';
 import { interpolateVars } from '../core/interpolate.js';
 import { mergeVars } from '../core/merge.js';
 import { parseEnvContent } from '../core/parse.js';
-import { decrypt as sopsDecrypt } from '../core/sops.js';
-export async function hasCommand(options) {
+export async function hasCommand(ctx, options) {
     const { root, env, key, quiet } = options;
-    const config = loadConfig(root);
+    const config = ctx.config.loadConfig(root);
     const sharedEncrypted = join(root, config.sources.shared + '.encrypted');
     const envEncrypted = join(root, config.sources[env] + '.encrypted');
     const varSources = [];
-    if (existsSync(sharedEncrypted)) {
-        const content = sopsDecrypt(sharedEncrypted);
+    if (ctx.fs.existsSync(sharedEncrypted)) {
+        const content = ctx.sops.decrypt(sharedEncrypted);
         varSources.push(parseEnvContent(content));
     }
-    if (existsSync(envEncrypted)) {
-        const content = sopsDecrypt(envEncrypted);
+    if (ctx.fs.existsSync(envEncrypted)) {
+        const content = ctx.sops.decrypt(envEncrypted);
         varSources.push(parseEnvContent(content));
     }
     if (varSources.length === 0) {
         if (!quiet) {
-            console.error(pc.red('No encrypted files found'));
+            ctx.logger.error(pc.red('No encrypted files found'));
         }
-        process.exit(2);
+        ctx.process.exit(2);
     }
     const merged = mergeVars(...varSources);
     const interpolated = interpolateVars(merged);
@@ -32,14 +29,14 @@ export async function hasCommand(options) {
     const exists = found !== undefined && found.value.length > 0;
     if (!quiet) {
         if (exists) {
-            console.log(pc.green(`${key} is set (${found.value.length} chars)`));
+            ctx.logger.log(pc.green(`${key} is set (${found.value.length} chars)`));
         }
         else if (found) {
-            console.log(pc.yellow(`${key} exists but is empty`));
+            ctx.logger.log(pc.yellow(`${key} exists but is empty`));
         }
         else {
-            console.log(pc.red(`${key} not found`));
+            ctx.logger.log(pc.red(`${key} not found`));
         }
     }
-    process.exit(exists ? 0 : 1);
+    ctx.process.exit(exists ? 0 : 1);
 }

package/dist/commands/init.d.ts

@@ -1,3 +1,3 @@
-import type { InitOptions } from '../types.js';
-export declare function initCommand(options: InitOptions): Promise<void>;
+import type { HushContext, InitOptions } from '../types.js';
+export declare function initCommand(ctx: HushContext, options: InitOptions): Promise<void>;
 //# sourceMappingURL=init.d.ts.map

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,WAAW,EAAU,MAAM,aAAa,CAAC;AAyKnE,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFrE"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,WAAW,EAAE,WAAW,EAAU,MAAM,aAAa,CAAC;AAsKhF,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFvF"}