@tamyla/clodo-framework 3.1.21 → 3.1.22

package/dist/utils/deployment/wrangler-config-manager.js

@@ -96,6 +96,192 @@ export class WranglerConfigManager {
     }
   }
 
+  /**
+   * Get customer config path based on zone name
+   * Maps zone names to customer config directories using conventions:
+   * - clodo.dev → config/customers/clodo/wrangler.toml
+   * - tamyla.com → config/customers/tamyla/wrangler.toml
+   * - wetechfounders.com → config/customers/wetechfounders/wrangler.toml
+   * 
+   * @param {string} zoneName - Cloudflare zone name (domain)
+   * @returns {string} Path to customer config (may not exist yet)
+   */
+  getCustomerConfigPath(zoneName) {
+    if (!zoneName) {
+      throw new Error('Zone name is required to get customer config path');
+    }
+
+    // Extract base name from domain (e.g., clodo.dev → clodo)
+    const baseName = zoneName.split('.')[0];
+
+    // Return customer directory path based on base name
+    return join(this.projectRoot, 'config', 'customers', baseName, 'wrangler.toml');
+  }
+
+  /**
+   * Generate or update customer-specific wrangler.toml
+   * Creates a persistent config for the customer based on current deployment parameters
+   * This serves as deployment history and source of truth for reruns
+   * 
+   * @param {string} zoneName - Cloudflare zone name (domain)
+   * @param {Object} params - Deployment parameters
+   * @param {string} params.accountId - Cloudflare account ID
+   * @param {string} params.environment - Deployment environment (production, staging, development)
+   * @returns {Promise<string>} Path to generated/updated customer config
+   */
+  async generateCustomerConfig(zoneName, params = {}) {
+    const {
+      accountId,
+      environment = 'production'
+    } = params;
+    if (!zoneName) {
+      throw new Error('Zone name is required to generate customer config');
+    }
+    const customerConfigPath = this.getCustomerConfigPath(zoneName);
+    const customerDir = dirname(customerConfigPath);
+    if (this.dryRun) {
+      console.log(`   🔍 DRY RUN: Would generate/update customer config at ${customerConfigPath}`);
+      return customerConfigPath;
+    }
+
+    // Ensure customer directory exists
+    await mkdir(customerDir, {
+      recursive: true
+    });
+
+    // Read existing config or start with current root config as template
+    let config;
+    try {
+      await access(customerConfigPath, constants.F_OK);
+      // Customer config exists - read and update it
+      const content = await readFile(customerConfigPath, 'utf-8');
+      config = parseToml(content);
+      if (this.verbose) {
+        console.log(`   📋 Updating existing customer config: ${customerConfigPath}`);
+      }
+    } catch (error) {
+      // Customer config doesn't exist - use root config as template
+      try {
+        config = await this.readConfig();
+        if (this.verbose) {
+          console.log(`   📋 Creating new customer config from root template: ${customerConfigPath}`);
+        }
+      } catch (readError) {
+        // No root config either - create minimal config
+        config = {
+          name: 'worker',
+          main: 'src/index.js',
+          compatibility_date: new Date().toISOString().split('T')[0],
+          env: {}
+        };
+        if (this.verbose) {
+          console.log(`   📋 Creating new minimal customer config: ${customerConfigPath}`);
+        }
+      }
+    }
+
+    // Update account_id if provided
+    if (accountId) {
+      config.account_id = accountId;
+      console.log(`   ✅ Set account_id to ${accountId} in customer config`);
+    }
+
+    // Update worker name based on zone
+    // Extract base service name and apply zone-based naming
+    const customerPrefix = zoneName.split('.')[0]; // clodo.dev → clodo
+
+    // Update root-level worker name
+    if (config.name) {
+      const baseName = config.name.replace(/^[^-]+-/, ''); // Remove existing prefix
+      const newWorkerName = `${customerPrefix}-${baseName}`;
+      config.name = newWorkerName;
+      console.log(`   ✅ Set worker name to ${newWorkerName} in customer config`);
+    }
+
+    // Update SERVICE_DOMAIN in environment variables (all environments)
+    const updateServiceDomain = varsObj => {
+      if (varsObj && 'SERVICE_DOMAIN' in varsObj) {
+        varsObj.SERVICE_DOMAIN = customerPrefix;
+        console.log(`   ✅ Set SERVICE_DOMAIN to ${customerPrefix}`);
+      }
+    };
+
+    // Update top-level vars if they exist
+    if (config.vars) {
+      updateServiceDomain(config.vars);
+    }
+
+    // Ensure environment section exists
+    if (environment !== 'production') {
+      if (!config.env) {
+        config.env = {};
+      }
+      if (!config.env[environment]) {
+        config.env[environment] = {
+          name: config.name || 'worker'
+        };
+      }
+    }
+
+    // Update worker name and SERVICE_DOMAIN in all environment sections
+    if (config.env) {
+      for (const [envName, envConfig] of Object.entries(config.env)) {
+        if (envConfig.name) {
+          const baseName = envConfig.name.replace(/^[^-]+-/, ''); // Remove existing prefix
+          envConfig.name = `${customerPrefix}-${baseName}`;
+          console.log(`   ✅ Set [env.${envName}] worker name to ${envConfig.name}`);
+        }
+        if (envConfig.vars) {
+          updateServiceDomain(envConfig.vars);
+        }
+      }
+    }
+
+    // Write customer config
+    const tomlContent = stringifyToml(config);
+    await writeFile(customerConfigPath, tomlContent, 'utf-8');
+    console.log(`   ✅ Customer config saved: ${customerConfigPath}`);
+    return customerConfigPath;
+  }
+
+  /**
+   * Copy customer-specific wrangler.toml to root (ephemeral working copy)
+   * This implements the architecture where:
+   * - config/customers/{customer}/wrangler.toml = source of truth (versioned)
+   * - wrangler.toml (root) = ephemeral working copy (reflects last deployment)
+   * 
+   * @param {string} customerConfigPath - Path to customer's wrangler.toml
+   * @returns {Promise<void>}
+   */
+  async copyCustomerConfig(customerConfigPath) {
+    if (!customerConfigPath) {
+      throw new Error('Customer config path is required');
+    }
+    if (this.dryRun) {
+      console.log(`   🔍 DRY RUN: Would copy ${customerConfigPath} → ${this.configPath}`);
+      return;
+    }
+    try {
+      // Read customer config
+      const customerContent = await readFile(customerConfigPath, 'utf-8');
+      if (this.verbose) {
+        console.log(`   📋 Copying customer config: ${customerConfigPath}`);
+      }
+
+      // Write to root wrangler.toml (ephemeral working copy)
+      await mkdir(dirname(this.configPath), {
+        recursive: true
+      });
+      await writeFile(this.configPath, customerContent, 'utf-8');
+      console.log(`   ✅ Copied customer config to root wrangler.toml`);
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        throw new Error(`Customer config not found: ${customerConfigPath}`);
+      }
+      throw new Error(`Failed to copy customer config: ${error.message}`);
+    }
+  }
+
   /**
    * Set account_id in wrangler.toml
    * @param {string} accountId - Cloudflare account ID
@@ -186,44 +372,31 @@ export class WranglerConfigManager {
       database_name: databaseName,
       database_id: databaseId
     };
-    if (environment === 'production') {
-      // Add to top-level d1_databases array
-      if (!config.d1_databases) {
-        config.d1_databases = [];
-      }
 
-      // Check if binding already exists
-      const existingIndex = config.d1_databases.findIndex(db => db.binding === binding || db.database_name === databaseName);
-      if (existingIndex >= 0) {
-        console.log(`   🔄 Updating existing database binding`);
-        config.d1_databases[existingIndex] = dbBinding;
-      } else {
-        console.log(`   ➕ Adding new database binding`);
-        config.d1_databases.push(dbBinding);
-      }
-    } else {
-      // Add to environment-specific section
-      if (!config.env) {
-        config.env = {};
-      }
-      if (!config.env[environment]) {
-        config.env[environment] = {
-          name: config.name || 'worker'
-        };
-      }
-      if (!config.env[environment].d1_databases) {
-        config.env[environment].d1_databases = [];
-      }
+    // Always add to environment-specific section for consistency
+    // This ensures database bindings are scoped to their environment
+    if (!config.env) {
+      config.env = {};
+    }
+    if (!config.env[environment]) {
+      // Create environment section with proper name
+      const envName = environment === 'production' ? `${config.name}-prod` : config.name || 'worker';
+      config.env[environment] = {
+        name: envName
+      };
+    }
+    if (!config.env[environment].d1_databases) {
+      config.env[environment].d1_databases = [];
+    }
 
-      // Check if binding already exists
-      const existingIndex = config.env[environment].d1_databases.findIndex(db => db.binding === binding || db.database_name === databaseName);
-      if (existingIndex >= 0) {
-        console.log(`   🔄 Updating existing database binding`);
-        config.env[environment].d1_databases[existingIndex] = dbBinding;
-      } else {
-        console.log(`   ➕ Adding new database binding`);
-        config.env[environment].d1_databases.push(dbBinding);
-      }
+    // Check if binding already exists
+    const existingIndex = config.env[environment].d1_databases.findIndex(db => db.binding === binding || db.database_name === databaseName);
+    if (existingIndex >= 0) {
+      console.log(`   🔄 Updating existing database binding`);
+      config.env[environment].d1_databases[existingIndex] = dbBinding;
+    } else {
+      console.log(`   ➕ Adding new database binding`);
+      config.env[environment].d1_databases.push(dbBinding);
     }
     await this.writeConfig(config);
     console.log(`   ✅ D1 database binding added successfully`);
@@ -239,18 +412,12 @@ export class WranglerConfigManager {
   async removeDatabaseBinding(environment, bindingOrName) {
     const config = await this.readConfig();
     let removed = false;
-    if (environment === 'production') {
-      if (config.d1_databases) {
-        const initialLength = config.d1_databases.length;
-        config.d1_databases = config.d1_databases.filter(db => db.binding !== bindingOrName && db.database_name !== bindingOrName);
-        removed = config.d1_databases.length < initialLength;
-      }
-    } else {
-      if (config.env?.[environment]?.d1_databases) {
-        const initialLength = config.env[environment].d1_databases.length;
-        config.env[environment].d1_databases = config.env[environment].d1_databases.filter(db => db.binding !== bindingOrName && db.database_name !== bindingOrName);
-        removed = config.env[environment].d1_databases.length < initialLength;
-      }
+
+    // Always remove from environment-specific section
+    if (config.env?.[environment]?.d1_databases) {
+      const initialLength = config.env[environment].d1_databases.length;
+      config.env[environment].d1_databases = config.env[environment].d1_databases.filter(db => db.binding !== bindingOrName && db.database_name !== bindingOrName);
+      removed = config.env[environment].d1_databases.length < initialLength;
     }
     if (removed) {
       await this.writeConfig(config);

package/dist/utils/framework-config.js

@@ -45,7 +45,7 @@ export class FrameworkConfig {
     }
 
     // Return null instead of throwing - will use default config
-    console.warn('⚠️  validation-config.json not found. Using default configuration values.');
+    // Note: This is expected behavior - services don't need their own config
     return null;
   }
 
@@ -54,8 +54,8 @@ export class FrameworkConfig {
    */
   loadConfig() {
     // If no config file found, return default configuration
+    // This is normal - services use framework defaults unless they need custom settings
     if (!this.configPath) {
-      console.log('📋 Using default framework configuration');
       return this.getDefaultConfig();
     }
     try {

package/dist/utils/interactive-prompts.js

@@ -98,64 +98,15 @@ export function showProgress(message, steps = ['⏳', '⚡', '✅']) {
 
 /**
  * Ask for sensitive input (like API tokens) with hidden input
- * CRITICAL: Properly restores stdin state for subsequent readline operations
+ * Uses inquirer for better paste support and robust input handling
  */
-export function askPassword(question) {
-  return new Promise(resolve => {
-    const prompt = `${question}: `;
-    process.stdout.write(prompt);
-
-    // Save original state
-    const wasRaw = process.stdin.isRaw;
-    const wasPaused = process.stdin.isPaused();
-
-    // Hide input for sensitive data
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(true);
-    }
-    process.stdin.resume();
-    let password = '';
-    const onData = char => {
-      const charCode = char[0];
-      if (charCode === 13 || charCode === 10) {
-        // Enter key (CR or LF)
-        // Restore original state BEFORE resolving
-        if (process.stdin.isTTY) {
-          process.stdin.setRawMode(wasRaw || false);
-        }
-
-        // Important: Resume stdin so readline can use it
-        if (!wasPaused) {
-          process.stdin.resume();
-        } else {
-          process.stdin.pause();
-        }
-        process.stdin.removeListener('data', onData);
-        process.stdout.write('\n');
-
-        // Small delay to let stdin stabilize before next readline operation
-        setTimeout(() => resolve(password), 50);
-      } else if (charCode === 127 || charCode === 8) {
-        // Backspace
-        if (password.length > 0) {
-          password = password.slice(0, -1);
-          process.stdout.write('\b \b');
-        }
-      } else if (charCode === 3) {
-        // Ctrl+C
-        // Restore state and exit gracefully
-        if (process.stdin.isTTY) {
-          process.stdin.setRawMode(wasRaw || false);
-        }
-        process.stdin.removeListener('data', onData);
-        process.stdout.write('\n');
-        process.exit(0);
-      } else if (charCode >= 32 && charCode <= 126) {
-        // Printable characters
-        password += char.toString();
-        process.stdout.write('*');
-      }
-    };
-    process.stdin.on('data', onData);
-  });
+export async function askPassword(question) {
+  const inquirer = (await import('inquirer')).default;
+  const answers = await inquirer.prompt([{
+    type: 'password',
+    name: 'password',
+    message: question,
+    mask: '*'
+  }]);
+  return answers.password;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamyla/clodo-framework",
-  "version": "3.1.21",
+  "version": "3.1.22",
   "description": "Reusable framework for Clodo-style software architecture on Cloudflare Workers + D1",
   "type": "module",
   "sideEffects": [
@@ -43,15 +43,22 @@
   },
   "bin": {
     "clodo-service": "./dist/bin/clodo-service.js",
-    "clodo-create-service": "./dist/bin/service-management/create-service.js",
-    "clodo-init-service": "./dist/bin/service-management/init-service.js",
     "clodo-security": "./dist/bin/security/security-cli.js"
   },
   "publishConfig": {
     "access": "public"
   },
   "files": [
-    "dist",
+    "dist/!(bin)",
+    "dist/bin/clodo-service.js",
+    "dist/bin/commands/deploy.js",
+    "dist/bin/commands/validate.js",
+    "dist/bin/commands/helpers/",
+    "dist/bin/shared/",
+    "dist/bin/security/",
+    "dist/bin/service-management/",
+    "dist/security/",
+    "dist/utils/",
     "types",
     "templates",
     "ui-structures",
@@ -64,11 +71,11 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "npm run prebuild && babel src/ --out-dir dist/ && babel bin/ --out-dir dist/bin/ --ignore 'bin/**/*.test.js' && node -e \"const fs=require('fs'); fs.cpSync('ui-structures', 'dist/ui-structures', {recursive: true});\" && npm run postbuild",
-    "build:ci": "npm run prebuild:ci && babel src/ --out-dir dist/ && babel bin/ --out-dir dist/bin/ --ignore 'bin/**/*.test.js' && node -e \"const fs=require('fs'); fs.cpSync('ui-structures', 'dist/ui-structures', {recursive: true});\" && npm run postbuild",
+    "build": "npm run prebuild && babel src/ --out-dir dist/ && babel bin/ --out-dir dist/bin/ --ignore 'bin/**/*.test.js' && node -e \"const fs=require('fs'); fs.cpSync('ui-structures', 'dist/ui-structures', {recursive: true}); fs.cpSync('config', 'dist/config', {recursive: true});\" && npm run postbuild",
+    "build:ci": "npm run prebuild:ci && babel src/ --out-dir dist/ && babel bin/ --out-dir dist/bin/ --ignore 'bin/**/*.test.js' && node -e \"const fs=require('fs'); fs.cpSync('ui-structures', 'dist/ui-structures', {recursive: true}); fs.cpSync('config', 'dist/config', {recursive: true});\" && npm run postbuild",
     "prebuild": "npm run clean && npm run type-check",
     "prebuild:ci": "npm run clean && npm run type-check",
-    "postbuild": "npm run check:bundle && npm run check:imports",
+    "postbuild": "npm run check:bundle && npm run check:imports && node scripts/utilities/fix-dist-imports.js",
     "clean": "rimraf dist",
     "clean:generated": "rimraf generated",
     "clean:all": "npm run clean && npm run clean:generated",
@@ -147,6 +154,7 @@
     "@iarna/toml": "^2.2.5",
     "chalk": "^5.3.0",
     "commander": "^11.0.0",
+    "inquirer": "^12.10.0",
     "uuid": "^13.0.0",
     "wrangler": ">=3.0.0"
   },
@@ -157,7 +165,7 @@
     "@babel/preset-env": "^7.23.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/node": "^20.19.19",
+    "@types/node": "^20.19.24",
     "babel-plugin-transform-import-meta": "^2.3.3",
     "cross-env": "^10.1.0",
     "eslint": "^8.54.0",