@tamyla/clodo-framework 3.1.4 → 3.1.8

package/dist/orchestration/modules/DomainResolver.js

@@ -63,12 +63,14 @@ export class DomainResolver {
       warnings: []
     };
     try {
-      // Validate required environment variables
-      const requiredEnvVars = ['CLOUDFLARE_API_TOKEN', 'CLOUDFLARE_ACCOUNT_ID'];
-      const missing = requiredEnvVars.filter(envVar => !process.env[envVar]);
-      if (missing.length > 0) {
-        validation.valid = false;
-        validation.issues.push(`Missing required environment variables: ${missing.join(', ')}`);
+      // Validate Cloudflare token
+      if (!process.env.CLOUDFLARE_API_TOKEN) {
+        validation.warnings.push('CLOUDFLARE_API_TOKEN not yet configured (will be set during deployment)');
+      }
+
+      // Validate Cloudflare account ID
+      if (!process.env.CLOUDFLARE_ACCOUNT_ID) {
+        validation.warnings.push('CLOUDFLARE_ACCOUNT_ID not yet configured (will be set during deployment)');
       }
 
       // Validate domain format

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

@@ -45,6 +45,14 @@ export class MultiDomainOrchestrator {
       process.env.CLOUDFLARE_API_TOKEN = this.cloudflareToken;
       console.log(`🔑 Configured wrangler to use API token authentication`);
     }
+    if (this.cloudflareAccountId) {
+      process.env.CLOUDFLARE_ACCOUNT_ID = this.cloudflareAccountId;
+      console.log(`🔑 Configured wrangler to use account ID: ${this.cloudflareAccountId}`);
+    }
+    if (this.cloudflareAccountId) {
+      process.env.CLOUDFLARE_ACCOUNT_ID = this.cloudflareAccountId;
+      console.log(`🔑 Configured wrangler to use account ID: ${this.cloudflareAccountId}`);
+    }
 
     // Initialize modular components
     this.domainResolver = new DomainResolver({
@@ -161,14 +169,18 @@ export class MultiDomainOrchestrator {
   /**
    * Deploy to single domain using modular deployment coordinator
    * @param {string} domain - Domain to deploy
+   * @param {Object} deploymentOptions - Deployment configuration options
    * @returns {Promise<Object>} Deployment result
    */
-  async deploySingleDomain(domain) {
+  async deploySingleDomain(domain, deploymentOptions = {}) {
     const domainState = this.portfolioState.domainStates.get(domain);
     if (!domainState) {
       throw new Error(`Domain ${domain} not found in portfolio`);
     }
 
+    // Store deployment options in domain state for handlers to access
+    domainState.deploymentOptions = deploymentOptions;
+
     // Create handlers that delegate to our legacy methods for backward compatibility
     const handlers = {
       validation: d => this.validateDomainPrerequisites(d),

package/dist/security/index.js

@@ -6,13 +6,13 @@
 import { ConfigurationValidator } from './ConfigurationValidator.js';
 // DeploymentManager removed - replaced by MultiDomainOrchestrator + WranglerConfigManager
 import { SecretGenerator } from './SecretGenerator.js';
-import { ErrorHandler } from '../utils/ErrorHandler.js';
+import { ErrorHandler } from '../../bin/shared/utils/index.js';
 // InteractiveDeploymentConfigurator removed - replaced by InputCollector
 
 export { ConfigurationValidator } from './ConfigurationValidator.js';
 // export { DeploymentManager } - DEPRECATED: Use MultiDomainOrchestrator instead
 export { SecretGenerator } from './SecretGenerator.js';
-export { ErrorHandler } from '../utils/ErrorHandler.js';
+export { ErrorHandler } from '../../bin/shared/utils/index.js';
 // export { InteractiveDeploymentConfigurator } - DEPRECATED: Use InputCollector instead
 
 // Re-export patterns and rules for advanced usage

package/dist/service-management/ConfirmationEngine.js

@@ -34,6 +34,7 @@
 import { createInterface } from 'readline';
 import chalk from 'chalk';
 import { validateServiceName, validateDomainName } from '../utils/validation.js';
+import { NameFormatters, UrlFormatters, ResourceFormatters } from '../../bin/shared/utils/Formatters.js';
 export class ConfirmationEngine {
   constructor(options = {}) {
     this.interactive = options.interactive !== false;
@@ -82,17 +83,17 @@ export class ConfirmationEngine {
       // 4. Author - Default framework author
       author: 'Clodo Framework',
       // 5-7. URLs - Derived from domain and service name
-      productionUrl: `https://${serviceName}.${domainName}`,
-      stagingUrl: `https://${serviceName}-staging.${domainName}`,
-      developmentUrl: `https://${serviceName}-dev.${domainName}`,
+      productionUrl: UrlFormatters.buildProductionUrl(serviceName, domainName),
+      stagingUrl: UrlFormatters.buildStagingUrl(serviceName, domainName),
+      developmentUrl: UrlFormatters.buildDevUrl(serviceName, domainName),
       // 8. Features - Based on service type
       features: this.generateFeaturesForType(serviceType),
       // 9. Database Name - Cloudflare D1 naming
-      databaseName: `${serviceName}-db`,
+      databaseName: ResourceFormatters.databaseName(serviceName),
       // 10. Worker Name - Cloudflare Worker naming
-      workerName: `${serviceName}-worker`,
+      workerName: ResourceFormatters.workerName(serviceName),
       // 11. Package Name - NPM package naming
-      packageName: `@clodo/${serviceName}`,
+      packageName: ResourceFormatters.packageName(serviceName),
       // 12. Git Repository URL - GitHub naming
       gitRepositoryUrl: `https://github.com/tamylaa/${serviceName}`,
       // 13. Documentation URL - Based on domain
@@ -319,7 +320,7 @@ export class ConfirmationEngine {
    * Generate display name from service name
    */
   generateDisplayName(serviceName) {
-    return serviceName.split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+    return NameFormatters.toDisplayName(serviceName);
   }
 
   /**

package/dist/service-management/ErrorTracker.js

@@ -8,6 +8,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
+import { logger } from '../../bin/shared/logging/Logger.js';
 export class ErrorTracker {
   constructor() {
     this.errors = [];
@@ -46,7 +47,9 @@ export class ErrorTracker {
 
     // Log to file asynchronously (don't block)
     this.logErrorToFile(errorEntry).catch(err => {
-      console.warn(chalk.yellow(`Failed to write error log: ${err.message}`));
+      logger.warn('Failed to write error log', {
+        error: err.message
+      });
     });
     return errorEntry;
   }
@@ -155,7 +158,9 @@ export class ErrorTracker {
       await fs.appendFile(this.errorLogPath, logEntry);
     } catch (error) {
       // If we can't write to the log file, at least show a warning
-      console.warn(chalk.yellow(`Could not write to error log: ${error.message}`));
+      logger.warn('Could not write to error log', {
+        error: error.message
+      });
     }
   }
 

package/dist/service-management/InputCollector.js

@@ -15,6 +15,7 @@ import { createInterface } from 'readline';
 import chalk from 'chalk';
 import { validateServiceName, validateDomainName } from '../utils/validation.js';
 import { uiStructuresLoader } from '../utils/ui-structures-loader.js';
+import { NameFormatters, UrlFormatters, ResourceFormatters } from '../../bin/shared/utils/Formatters.js';
 
 // Assessment capabilities moved to @tamyla/clodo-orchestration (professional edition)
 
@@ -122,12 +123,12 @@ export class InputCollector {
     console.log(chalk.white('The following will be automatically generated from your inputs:\n'));
     const autoTemplate = uiStructuresLoader.getAutomatedGenerationTemplate();
     if (autoTemplate) {
-      console.log(chalk.gray(`📊 ${autoTemplate.collectionStrategy.inputCount} configurations will be generated automatically`));
+      console.log(chalk.gray(`📊 ${autoTemplate.template.inputCount} configurations will be generated automatically`));
       console.log(chalk.gray(`⏱️ Estimated time: ${autoTemplate.template.estimatedTime}`));
 
       // Show some examples of what will be automated
       result.automatedGenerations = {
-        count: autoTemplate.collectionStrategy.inputCount,
+        count: autoTemplate.template.inputCount,
         estimatedTime: autoTemplate.template.estimatedTime,
         examples: ['Database connection strings', 'Environment variables', 'API endpoints', 'Security configurations', 'Deployment scripts']
       };
@@ -148,12 +149,15 @@ export class InputCollector {
    * Generate smart defaults based on core inputs
    */
   generateSmartDefault(inputId, coreInputs) {
-    const serviceName = coreInputs.serviceName?.value || '';
-    const environment = coreInputs.environment?.value || 'development';
-    const domainName = coreInputs.domainName?.value || '';
+    const serviceName = coreInputs['service-name']?.value || coreInputs.serviceName?.value || '';
+    const environment = coreInputs['environment']?.value || coreInputs.environment?.value || 'development';
+    const domainName = coreInputs['domain-name']?.value || coreInputs.domainName?.value || '';
+    const serviceType = coreInputs['service-type']?.value || coreInputs.serviceType?.value || '';
+    const customerName = coreInputs['customer-name']?.value || coreInputs.customerName?.value || '';
+    const cloudflareToken = coreInputs['cloudflare-api-token']?.value || coreInputs.cloudflareApiToken?.value || '';
     switch (inputId) {
       case 'display-name':
-        return serviceName ? serviceName.replace(/-/g, ' ').replace(/\b\w/g, l => l.toUpperCase()) : '';
+        return serviceName ? NameFormatters.toDisplayName(serviceName) : '';
       case 'description':
         return `A service built with CLODO Framework`;
       case 'version':
@@ -161,19 +165,21 @@ export class InputCollector {
       case 'author':
         return 'CLODO Framework';
       case 'production-url':
-        return domainName ? `https://api.${domainName}` : '';
+        return domainName && serviceName ? UrlFormatters.buildProductionUrl(serviceName, domainName) : '';
       case 'staging-url':
-        return domainName && serviceName ? `https://${serviceName}-staging.${domainName}` : '';
+        return domainName && serviceName ? UrlFormatters.buildStagingUrl(serviceName, domainName) : '';
       case 'development-url':
-        return domainName && serviceName ? `https://${serviceName}-dev.${domainName}` : '';
+        return domainName && serviceName ? UrlFormatters.buildDevUrl(serviceName, domainName) : '';
       case 'service-directory':
         return serviceName ? `./services/${serviceName}` : '';
       case 'database-name':
-        return serviceName ? `${serviceName}-db` : '';
+        return serviceName ? ResourceFormatters.databaseName(serviceName) : '';
       case 'worker-name':
-        return serviceName ? `${serviceName}-worker` : '';
+        return serviceName ? ResourceFormatters.workerName(serviceName) : '';
       case 'log-level':
         return environment === 'production' ? 'warn' : environment === 'staging' ? 'info' : 'debug';
+      case 'cors-policy':
+        return domainName ? `https://${domainName}` : '*';
       case 'env-prefix':
         return environment === 'production' ? 'PROD_' : environment === 'staging' ? 'STAGING_' : 'DEV_';
       default:
@@ -195,7 +201,7 @@ export class InputCollector {
    * Format field names for display
    */
   formatFieldName(inputId) {
-    return inputId.replace(/-/g, ' ').replace(/\b\w/g, l => l.toUpperCase());
+    return NameFormatters.toDisplayName(inputId);
   }
 
   /**
@@ -589,16 +595,25 @@ export class InputCollector {
   }
 
   /**
-   * Collect inputs and return flat core inputs object
-   * Used by CLI for deployment
+   * Collect inputs and return full three-tier result
+   * Used by CLI for comprehensive service operations
    */
   async collect() {
     const result = await this.collectInputsWithTransparency();
-    // Flatten the core inputs from {id: {value, ...}} to {id: value}
+
+    // For CLI compatibility, also provide flat coreInputs
     const flatCoreInputs = {};
     for (const [key, inputObj] of Object.entries(result.coreInputs)) {
       flatCoreInputs[key] = inputObj.value;
     }
-    return flatCoreInputs;
+
+    // Merge smart confirmations into flat object
+    for (const [key, value] of Object.entries(result.smartConfirmations)) {
+      flatCoreInputs[key] = value;
+    }
+    return {
+      ...result,
+      flatInputs: flatCoreInputs
+    };
   }
 }

package/dist/service-management/ServiceCreator.js

@@ -3,13 +3,17 @@
  * Programmatic API for creating services from templates
  */
 
-import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync, readdirSync, statSync } from 'fs';
+import { readdirSync, statSync, cpSync, rmSync } from 'fs';
 import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { FrameworkConfig } from '../utils/framework-config.js';
+import { FileManager } from '../../bin/shared/utils/file-manager.js';
 const SERVICE_TYPES = ['data-service', 'auth-service', 'content-service', 'api-gateway', 'generic'];
 export class ServiceCreator {
   constructor(options = {}) {
+    this.fileManager = new FileManager({
+      enableCache: true
+    });
     const templatesDir = (() => {
       try {
         return join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'templates');
@@ -80,9 +84,9 @@ export class ServiceCreator {
 
       // Check if template exists, fall back to generic if not
       let actualTemplateDir = templateDir;
-      if (!existsSync(templateDir)) {
+      if (!this.fileManager.exists(templateDir)) {
         const genericTemplate = join(this.templatesDir, 'generic');
-        if (existsSync(genericTemplate)) {
+        if (this.fileManager.exists(genericTemplate)) {
           console.log(`⚠️  Template for '${config.type}' not found, using 'generic' template as fallback`);
           actualTemplateDir = genericTemplate;
         } else {
@@ -91,10 +95,21 @@ export class ServiceCreator {
       }
 
       // Check if service directory already exists
-      if (existsSync(serviceDir) && !config.force) {
+      if (this.fileManager.exists(serviceDir) && !config.force) {
         throw new Error(`Service directory already exists: ${serviceDir}. Use force option to overwrite.`);
       }
 
+      // Create service directory and copy template
+      this.fileManager.ensureDir(dirname(serviceDir));
+
+      // If service directory exists (force mode), remove it first
+      if (this.fileManager.exists(serviceDir) && config.force) {
+        rmSync(serviceDir, {
+          recursive: true,
+          force: true
+        });
+      }
+
       // Copy template to service directory
       cpSync(actualTemplateDir, serviceDir, {
         recursive: true
@@ -147,7 +162,7 @@ export class ServiceCreator {
     const files = this.getAllFiles(dir);
     for (const file of files) {
       try {
-        let content = readFileSync(file, 'utf8');
+        let content = this.fileManager.readFile(file, 'utf8');
         let modified = false;
         for (const [placeholder, value] of Object.entries(variables)) {
           if (content.includes(placeholder)) {
@@ -156,7 +171,7 @@ export class ServiceCreator {
           }
         }
         if (modified) {
-          writeFileSync(file, content, 'utf8');
+          this.fileManager.writeFile(file, content, 'utf8');
         }
       } catch (error) {
         // Skip binary files or files that can't be read
@@ -218,7 +233,7 @@ export class ServiceCreator {
    */
   getFrameworkVersion() {
     try {
-      const packageJson = JSON.parse(readFileSync(join(__dirname, '..', '..', 'package.json'), 'utf8'));
+      const packageJson = JSON.parse(this.fileManager.readFile(join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'package.json'), 'utf8'));
       return packageJson.version;
     } catch {
       return '1.0.0';

package/dist/service-management/ServiceInitializer.js

@@ -3,9 +3,10 @@
  * Programmatic API for initializing services with configurations
  */
 
-import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, readdirSync } from 'fs';
+import { readdirSync } from 'fs';
 import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
+import { FileManager } from '../../bin/shared/utils/file-manager.js';
 
 // Get framework root - handle both ES module and CommonJS environments
 const getFrameworkRoot = () => {
@@ -24,6 +25,9 @@ const TEMPLATES_DIR = join(FRAMEWORK_ROOT, 'templates');
 const SERVICE_TYPES = ['generic', 'data-service', 'auth-service', 'content-service', 'api-gateway'];
 export class ServiceInitializer {
   constructor(options = {}) {
+    this.fileManager = new FileManager({
+      enableCache: true
+    });
     this.frameworkRoot = options.frameworkRoot || FRAMEWORK_ROOT;
     this.templatesDir = options.templatesDir || TEMPLATES_DIR;
     this.serviceTypes = options.serviceTypes || SERVICE_TYPES;
@@ -403,26 +407,16 @@ ${domainInfo.domains.map(d => `- ${d.domain}`).join('\n')}
     const serviceDir = join(servicesDir, serviceName);
 
     // Create directories
-    mkdirSync(servicesDir, {
-      recursive: true
-    });
-    mkdirSync(serviceDir, {
-      recursive: true
-    });
-    mkdirSync(join(serviceDir, 'src', 'config'), {
-      recursive: true
-    });
-    mkdirSync(join(serviceDir, 'src', 'worker'), {
-      recursive: true
-    });
+    this.fileManager.ensureDir(servicesDir);
+    this.fileManager.ensureDir(serviceDir);
+    this.fileManager.ensureDir(join(serviceDir, 'src', 'config'));
+    this.fileManager.ensureDir(join(serviceDir, 'src', 'worker'));
 
     // Write configuration files
     for (const [filePath, content] of Object.entries(configs)) {
       const fullPath = join(serviceDir, filePath);
-      mkdirSync(dirname(fullPath), {
-        recursive: true
-      });
-      writeFileSync(fullPath, content, 'utf8');
+      this.fileManager.ensureDir(dirname(fullPath));
+      this.fileManager.writeFile(fullPath, content, 'utf8');
     }
 
     // Create basic worker file
@@ -440,7 +434,7 @@ export default {
   }
 };
 `;
-    writeFileSync(join(serviceDir, 'src', 'worker', 'index.js'), workerContent, 'utf8');
+    this.fileManager.writeFile(join(serviceDir, 'src', 'worker', 'index.js'), workerContent, 'utf8');
   }
 
   /**

package/dist/shared/cloudflare/domain-discovery.js

@@ -9,6 +9,7 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { NameFormatters, UrlFormatters, ResourceFormatters, EnvironmentFormatters } from '../utils/Formatters.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -185,7 +186,7 @@ export class DomainDiscovery {
     const config = {
       // Basic domain information
       name: cleanDomainName,
-      displayName: this.capitalizeFirst(cleanDomainName),
+      displayName: NameFormatters.toDisplayName(cleanDomainName),
       fullDomain: domainName,
       // Cloudflare infrastructure
       accountId: account.id,
@@ -204,19 +205,19 @@ export class DomainDiscovery {
       // Service URLs
       services: {
         frontend: {
-          production: `https://${domainName}`,
-          staging: `https://staging.${domainName}`,
-          development: `https://dev.${domainName}`
+          production: UrlFormatters.buildProductionUrl('www', domainName),
+          staging: UrlFormatters.buildStagingUrl('www', domainName),
+          development: UrlFormatters.buildDevUrl('www', domainName)
         },
         api: {
-          production: `https://api.${domainName}`,
-          staging: `https://api-staging.${domainName}`,
-          development: `https://api-dev.${domainName}`
+          production: UrlFormatters.buildProductionUrl('api', domainName),
+          staging: UrlFormatters.buildStagingUrl('api', domainName),
+          development: UrlFormatters.buildDevUrl('api', domainName)
         },
         auth: {
-          production: `https://auth.${domainName}`,
-          staging: `https://auth-staging.${domainName}`,
-          development: `https://auth-dev.${domainName}`
+          production: UrlFormatters.buildProductionUrl('auth', domainName),
+          staging: UrlFormatters.buildStagingUrl('auth', domainName),
+          development: UrlFormatters.buildDevUrl('auth', domainName)
         }
       },
       // CORS configuration

package/dist/shared/cloudflare/ops.js

@@ -8,7 +8,7 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { executeWithRateLimit } from '../utils/rate-limiter.js';
-import { ErrorRecoveryManager } from '../utils/error-recovery.js';
+import { ErrorRecoveryManager } from '../utils/index.js';
 import { SecureTokenManager } from '../security/secure-token-manager.js';
 import { ProductionMonitor } from '../monitoring/production-monitor.js';
 import { DatabaseConnectionManager } from '../database/connection-manager.js';