@tamyla/clodo-framework 4.0.6 → 4.0.8

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [4.0.8](https://github.com/tamylaa/clodo-framework/compare/v4.0.7...v4.0.8) (2025-12-09)
+
+
+### Bug Fixes
+
+* respect user-provided worker and database names in deployment ([04ffc38](https://github.com/tamylaa/clodo-framework/commit/04ffc382ab910d4d260ba5c3f2e421763587948a))
+
+## [4.0.7](https://github.com/tamylaa/clodo-framework/compare/v4.0.6...v4.0.7) (2025-12-09)
+
+
+### Bug Fixes
+
+* correct dynamic import paths in interactive-validation.js ([acbadae](https://github.com/tamylaa/clodo-framework/commit/acbadaefc10cf7efab9dd263f7a40f8db18fccb4))
+* correct import path in interactive-validation.js ([8355677](https://github.com/tamylaa/clodo-framework/commit/83556777a0faa1a85766c0bf4795428d8ba807e6))
+* correct remaining dynamic import paths in interactive-validation.js ([837f0a4](https://github.com/tamylaa/clodo-framework/commit/837f0a48489dbde6b644944950232ec0f424639f))
+* correct Windows PowerShell environment variable handling ([f3c5354](https://github.com/tamylaa/clodo-framework/commit/f3c535449f744a2448b4c1b7d98fc62853a8eaab))
+
 ## [4.0.6](https://github.com/tamylaa/clodo-framework/compare/v4.0.5...v4.0.6) (2025-12-09)
 
 

package/dist/lib/shared/cloudflare/ops.js

@@ -171,12 +171,18 @@ export async function listWorkers(options = {}) {
 
   // Fallback to CLI-based operation
   try {
-    const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-    const command = `${envVars} npx wrangler list`;
-    const {
-      stdout: list
-    } = await executeWithRateLimit(command, 'workers');
-    return list;
+    if (apiToken) {
+      const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler list"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler list`;
+      const {
+        stdout: list
+      } = await executeWithRateLimit(command, 'workers');
+      return list;
+    } else {
+      const {
+        stdout: list
+      } = await executeWithRateLimit('npx wrangler list', 'workers');
+      return list;
+    }
   } catch (error) {
     throw new Error(`Failed to list workers: ${error.message}`);
   }
@@ -244,40 +250,40 @@ export async function deploySecret(key, value, env = 'production', options = {})
   }
 
   // Fallback to CLI-based operation with API token if available
-  const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-  const command = process.platform === 'win32' ? `${envVars} powershell -Command "Write-Output '${value}' | npx wrangler secret put ${key} --env ${env}"` : `${envVars} echo "${value}" | npx wrangler secret put ${key} --env ${env}`;
-  try {
-    // Increase retries for secrets due to higher timeout likelihood
+  if (apiToken) {
+    const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; Write-Output '${value}' | npx wrangler secret put ${key} --env ${env}"` : `CLOUDFLARE_API_TOKEN=${apiToken} echo "${value}" | npx wrangler secret put ${key} --env ${env}`;
+    await executeWithRateLimit(command, 'workers', 5);
+  } else {
+    const command = process.platform === 'win32' ? `powershell -Command "Write-Output '${value}' | npx wrangler secret put ${key} --env ${env}"` : `echo "${value}" | npx wrangler secret put ${key} --env ${env}`;
     await executeWithRateLimit(command, 'workers', 5);
-  } catch (error) {
-    throw new Error(`Secret deployment failed: ${error.message}`);
   }
 }
 export async function deleteSecret(key, env = 'production', options = {}) {
   const {
     apiToken
   } = options;
-  const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-  const command = `${envVars} npx wrangler secret delete ${key} --env ${env}`;
-  try {
+  if (apiToken) {
+    const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler secret delete ${key} --env ${env}"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler secret delete ${key} --env ${env}`;
     await executeWithRateLimit(command, 'workers');
-  } catch (error) {
-    throw new Error(`Secret deletion failed: ${error.message}`);
+  } else {
+    await executeWithRateLimit(`npx wrangler secret delete ${key} --env ${env}`, 'workers');
   }
 }
 export async function listSecrets(env = 'production', options = {}) {
   const {
     apiToken
   } = options;
-  const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-  const command = `${envVars} npx wrangler secret list --env ${env}`;
-  try {
+  if (apiToken) {
+    const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler secret list --env ${env}"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler secret list --env ${env}`;
     const {
       stdout: list
     } = await executeWithRateLimit(command, 'workers');
     return list;
-  } catch (error) {
-    throw new Error(`Failed to list secrets: ${error.message}`);
+  } else {
+    const {
+      stdout: list
+    } = await executeWithRateLimit(`npx wrangler secret list --env ${env}`, 'workers');
+    return list;
   }
 }
 export async function listDatabases(options = {}) {
@@ -346,16 +352,26 @@ export async function createDatabase(name, options = {}) {
 
   // Fallback to CLI-based operation
   try {
-    const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-    const command = `${envVars} npx wrangler d1 create ${name}`;
-    const {
-      stdout: output
-    } = await executeWithRateLimit(command, 'd1');
-    const idMatch = output.match(/database_id = "([^"]+)"/);
-    if (!idMatch) {
-      throw new Error('Could not extract database ID from creation output');
+    if (apiToken) {
+      const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler d1 create ${name}"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler d1 create ${name}`;
+      const {
+        stdout: output
+      } = await executeWithRateLimit(command, 'd1');
+      const idMatch = output.match(/database_id = "([^"]+)"/);
+      if (!idMatch) {
+        throw new Error('Could not extract database ID from creation output');
+      }
+      return idMatch[1];
+    } else {
+      const {
+        stdout: output
+      } = await executeWithRateLimit(`npx wrangler d1 create ${name}`, 'd1');
+      const idMatch = output.match(/database_id = "([^"]+)"/);
+      if (!idMatch) {
+        throw new Error('Could not extract database ID from creation output');
+      }
+      return idMatch[1];
     }
-    return idMatch[1];
   } catch (error) {
     throw new Error(`Database creation failed: ${error.message}`);
   }
@@ -364,12 +380,13 @@ export async function deleteDatabase(name, options = {}) {
   const {
     apiToken
   } = options;
-  const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-  const command = `${envVars} npx wrangler d1 delete ${name} --skip-confirmation`;
-  try {
+  if (apiToken) {
+    // For Windows PowerShell, set environment variable within the command
+    const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler d1 delete ${name} --skip-confirmation"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler d1 delete ${name} --skip-confirmation`;
     await executeWithRateLimit(command, 'd1');
-  } catch (error) {
-    throw new Error(`Database deletion failed: ${error.message}`);
+  } else {
+    // No API token provided, use default wrangler auth
+    await executeWithRateLimit(`npx wrangler d1 delete ${name} --skip-confirmation`, 'd1');
   }
 }
 export async function runMigrations(databaseName, env = 'production', options = {}) {
@@ -380,9 +397,12 @@ export async function runMigrations(databaseName, env = 'production', options =
   try {
     await ensureMonitoringInitialized();
     const result = await errorRecovery.executeWithRecovery(async () => {
-      const envVars = apiToken ? `CLOUDFLARE_API_TOKEN=${apiToken}` : '';
-      const command = `${envVars} npx wrangler d1 migrations apply ${databaseName} --env ${env} --remote`;
-      await executeWithRateLimit(command, 'd1');
+      if (apiToken) {
+        const command = process.platform === 'win32' ? `powershell -Command "$env:CLOUDFLARE_API_TOKEN = '${apiToken}'; npx wrangler d1 migrations apply ${databaseName} --env ${env} --remote"` : `CLOUDFLARE_API_TOKEN=${apiToken} npx wrangler d1 migrations apply ${databaseName} --env ${env} --remote`;
+        await executeWithRateLimit(command, 'd1');
+      } else {
+        await executeWithRateLimit(`npx wrangler d1 migrations apply ${databaseName} --env ${env} --remote`, 'd1');
+      }
       return true;
     }, {
       operationId: `runMigrations_${databaseName}_${env}`

package/dist/lib/shared/deployment/workflows/interactive-deployment-coordinator.js

@@ -209,11 +209,19 @@ export class InteractiveDeploymentCoordinator {
   async executeDeployment() {
     console.log('🚀 Phase 6: Executing Deployment');
     console.log('─'.repeat(50));
+    const workerName = this.deploymentState.config.worker?.name;
+    const databaseName = this.deploymentState.resources.database?.name;
+    console.log(`   🔍 DEBUG: workerName from state: "${workerName}"`);
+    console.log(`   🔍 DEBUG: databaseName from state: "${databaseName}"`);
     const result = await Clodo.deploy({
       servicePath: this.deploymentState.config.servicePath,
       environment: this.deploymentState.config.environment,
       domain: this.deploymentState.config.credentials.zoneName,
       serviceName: this.options.serviceName,
+      workerName: workerName,
+      // Pass the collected worker name
+      databaseName: databaseName,
+      // Pass the collected database name
       dryRun: this.deploymentState.config.dryRun,
       credentials: this.deploymentState.config.credentials
     });

package/dist/lib/shared/deployment/workflows/interactive-validation.js

@@ -129,7 +129,7 @@ export class InteractiveValidationWorkflow {
     console.log('===========================');
     const {
       askChoice
-    } = await import('../utils/prompt-utils.js');
+    } = await import('../../utils/interactive-prompts.js');
     const choice = await askChoice('How would you like to handle the existing worker?', ['🔄 Overwrite/Update - Deploy new version (recommended)', '📝 Rename - Create with a different worker name', '🔍 Compare - Show differences before deciding', '💾 Backup & Update - Create backup before overwriting', '❌ Cancel - Stop deployment'], 0);
     switch (choice) {
       case 0:
@@ -168,7 +168,7 @@ export class InteractiveValidationWorkflow {
   async promptForNewWorkerName(currentName) {
     const {
       askUser
-    } = await import('../utils/prompt-utils.js');
+    } = await import('../../utils/interactive-prompts.js');
     let newName = await askUser(`Enter new worker name (current: ${currentName})`);
     newName = newName.trim();
     if (!newName) {

package/dist/orchestration/multi-domain-orchestrator.js

@@ -36,6 +36,8 @@ export class MultiDomainOrchestrator {
     this.parallelDeployments = options.parallelDeployments || 3;
     this.servicePath = options.servicePath || process.cwd();
     this.serviceName = options.serviceName || 'data-service'; // Service name for custom domain (e.g., 'data-service', 'auth-service')
+    this.workerName = options.workerName; // Specific worker name to use (optional)
+    this.databaseName = options.databaseName; // Specific database name to use (optional)
 
     // Wrangler config path - allows using customer-specific wrangler.toml files
     // If not specified, wrangler uses the default wrangler.toml in servicePath
@@ -299,7 +301,7 @@ export class MultiDomainOrchestrator {
     console.log(`   🗄️ Setting up database for ${domain}`);
     if (this.dryRun) {
       console.log(`   � DRY RUN: Would create database for ${domain}`);
-      const databaseName = `${domain.replace(/\./g, '-')}-${this.environment}-db`;
+      const databaseName = this.databaseName || `${domain.replace(/\./g, '-')}-${this.environment}-db`;
       return {
         databaseName,
         databaseId: 'dry-run-id',
@@ -308,7 +310,8 @@ export class MultiDomainOrchestrator {
     }
     try {
       // Create D1 database using Cloudflare ops
-      const databaseName = `${domain.replace(/\./g, '-')}-${this.environment}-db`;
+      // Use provided database name, or generate one based on domain/environment
+      const databaseName = this.databaseName || `${domain.replace(/\./g, '-')}-${this.environment}-db`;
 
       // Check if database already exists
       console.log(`     � Checking if database exists: ${databaseName}`);
@@ -540,11 +543,13 @@ export class MultiDomainOrchestrator {
       // 2. Root wrangler.toml is ephemeral (reflects current active deployment)
       if (this.cloudflareZoneName) {
         console.log(`   🔧 Preparing customer config for zone: ${this.cloudflareZoneName}`);
+        console.log(`   🔍 DEBUG: this.workerName is "${this.workerName}"`);
 
         // Generate or update customer config with current deployment parameters
         const customerConfigPath = await this.wranglerConfigManager.generateCustomerConfig(this.cloudflareZoneName, {
           accountId: this.cloudflareAccountId,
-          environment: this.environment
+          environment: this.environment,
+          workerName: this.workerName // Pass specific worker name if provided
         });
 
         // Copy customer config to root (ephemeral working copy for this deployment)
@@ -763,12 +768,14 @@ export class MultiDomainOrchestrator {
   }
 
   /**
-   * Simple API: Deploy a service with minimal configuration
-   * @param {Object} options - Simple deployment options
+   * Deploy a single service to a specific domain/environment
+   * @param {Object} options - Deployment options
    * @param {string} options.servicePath - Path to service directory
    * @param {string} options.environment - Target environment
    * @param {string} options.domain - Specific domain to deploy to (used as zone name and domain suffix)
    * @param {string} options.serviceName - Service name for URL generation (e.g., 'data-service', 'auth-service')
+   * @param {string} options.workerName - Specific worker name to use
+   * @param {string} options.databaseName - Specific database name to use
    * @param {boolean} options.dryRun - Simulate deployment
    * @param {Object} options.credentials - Cloudflare credentials
    * @returns {Promise<Object>} Deployment result
@@ -779,6 +786,8 @@ export class MultiDomainOrchestrator {
       environment = 'production',
       domain,
       serviceName,
+      workerName,
+      databaseName,
       dryRun = false,
       credentials = {}
     } = options;
@@ -790,6 +799,10 @@ export class MultiDomainOrchestrator {
       servicePath,
       serviceName,
       // Pass through serviceName if provided
+      workerName,
+      // Pass through workerName if provided
+      databaseName,
+      // Pass through databaseName if provided
       cloudflareToken: credentials.token,
       cloudflareAccountId: credentials.accountId,
       cloudflareZoneId: credentials.zoneId,

package/dist/simple-api.js

@@ -34,6 +34,9 @@ export class Clodo {
    * @param {string} options.servicePath - Path to service directory
    * @param {string} options.environment - Target environment
    * @param {string} options.domain - Specific domain to deploy to
+   * @param {string} options.serviceName - Service name for URL generation
+   * @param {string} options.workerName - Specific worker name to use
+   * @param {string} options.databaseName - Specific database name to use
    * @param {boolean} options.dryRun - Simulate deployment
    * @returns {Promise<Object>} Deployment result
    */

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

@@ -127,13 +127,16 @@ export class WranglerConfigManager {
    * @param {Object} params - Deployment parameters
    * @param {string} params.accountId - Cloudflare account ID
    * @param {string} params.environment - Deployment environment (production, staging, development)
+   * @param {string} params.workerName - Specific worker name to use (optional, overrides automatic naming)
    * @returns {Promise<string>} Path to generated/updated customer config
    */
   async generateCustomerConfig(zoneName, params = {}) {
     const {
       accountId,
-      environment = 'production'
+      environment = 'production',
+      workerName
     } = params;
+    console.log(`   🔍 DEBUG: generateCustomerConfig called with workerName: ${workerName}`);
     if (!zoneName) {
       throw new Error('Zone name is required to generate customer config');
     }
@@ -186,16 +189,25 @@ export class WranglerConfigManager {
       console.log(`   ✅ Set account_id to ${accountId} in customer config`);
     }
 
-    // Update worker name based on zone
+    // Update worker name based on zone or provided name
     // 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}`;
+      let newWorkerName;
+      console.log(`   🔍 DEBUG: config.name is "${config.name}", workerName param is "${workerName}"`);
+      if (workerName) {
+        // Use the provided worker name directly
+        newWorkerName = workerName;
+        console.log(`   ✅ Set worker name to ${newWorkerName} in customer config (provided)`);
+      } else {
+        // Apply automatic zone-based naming
+        const baseName = config.name.replace(/^[^-]+-/, ''); // Remove existing prefix
+        newWorkerName = `${customerPrefix}-${baseName}`;
+        console.log(`   ✅ Set worker name to ${newWorkerName} in customer config (auto-generated)`);
+      }
       config.name = newWorkerName;
-      console.log(`   ✅ Set worker name to ${newWorkerName} in customer config`);
     }
 
     // Update SERVICE_DOMAIN in environment variables (all environments)
@@ -227,9 +239,20 @@ export class WranglerConfigManager {
     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}`);
+          let newEnvWorkerName;
+          if (workerName) {
+            // Derive environment-specific name from provided worker name
+            const baseName = workerName.replace(/-service$/, ''); // Remove -service suffix if present
+            const envSuffix = envName === 'production' ? '' : `-${envName}`;
+            newEnvWorkerName = `${baseName}${envSuffix}`;
+            console.log(`   ✅ Set [env.${envName}] worker name to ${newEnvWorkerName} (derived from provided name)`);
+          } else {
+            // Apply automatic zone-based naming
+            const baseName = envConfig.name.replace(/^[^-]+-/, ''); // Remove existing prefix
+            newEnvWorkerName = `${customerPrefix}-${baseName}`;
+            console.log(`   ✅ Set [env.${envName}] worker name to ${newEnvWorkerName} (auto-generated)`);
+          }
+          envConfig.name = newEnvWorkerName;
         }
         if (envConfig.vars) {
           updateServiceDomain(envConfig.vars);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamyla/clodo-framework",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "Reusable framework for Clodo-style software architecture on Cloudflare Workers + D1",
   "type": "module",
   "sideEffects": [