i18ntk 2.0.4 → 2.2.0

package/{scripts → utils}/locale-optimizer.js

@@ -7,17 +7,18 @@
  * during package initialization. Integrates with i18ntk init process.
  * 
  * Usage:
- *   node scripts/locale-optimizer.js --interactive
- *   node scripts/locale-optimizer.js --list
- *   node scripts/locale-optimizer.js --keep en,es,de
- *   node scripts/locale-optimizer.js --restore
+ *   node utils/locale-optimizer.js --interactive
+ *   node utils/locale-optimizer.js --list
+ *   node utils/locale-optimizer.js --keep en,es,de
+ *   node utils/locale-optimizer.js --restore
  */
 
-const fs = require('fs');
-const path = require('path');
-const cliHelper = require('../utils/cli-helper');
-const JsonOutput = require('../utils/json-output');
-const { getGlobalReadline } = require('../utils/cli');
+const fs = require('fs');
+const path = require('path');
+const SecurityUtils = require('./security');
+const cliHelper = require('./cli-helper');
+const JsonOutput = require('./json-output');
+const { getGlobalReadline } = require('./cli');
 
 class LocaleOptimizer {
   constructor() {
@@ -77,19 +78,19 @@ class LocaleOptimizer {
       return;
     }
     
-    console.log('\n📊 UI Locale Package Analysis');
-    console.log('═'.repeat(40));
+    console.log('\n📊 UI Locale Package Analysis');
+    console.log('═'.repeat(40));
     
     const available = this.getAvailableLocales();
     let totalSize = 0;
     
     if (available.length === 0) {
-      console.log('   ❌ No locale files found');
+      console.log('   ❌ No locale files found');
       return;
     }
     
     console.log('   Language   Size    Status');
-    console.log('   ─────────────────────────');
+    console.log('   ─────────────────────────');
     
     available.forEach(locale => {
       const filePath = path.join(this.uiLocalesDir, `${locale}.json`);
@@ -105,11 +106,11 @@ class LocaleOptimizer {
     
     const missing = this.allLocales.filter(l => !available.includes(l));
     if (missing.length > 0) {
-      console.log(`\n   ⚠️  Missing: ${missing.join(', ').toUpperCase()}`);
+      console.log(`\n   ⚠️  Missing: ${missing.join(', ').toUpperCase()}`);
     }
     
-    console.log(`\n📦 Total package size: ${(totalSize / 1024).toFixed(1)}KB`);
-    console.log(`💡 Potential savings: ${(totalSize/1024 - this.getLocaleSize('en')).toFixed(1)}KB (English only)`);
+    console.log(`\n📦 Total package size: ${(totalSize / 1024).toFixed(1)}KB`);
+    console.log(`💡 Potential savings: ${(totalSize/1024 - this.getLocaleSize('en')).toFixed(1)}KB (English only)`);
     console.log(`   Run --interactive to optimize now`);
   }
 
@@ -135,7 +136,7 @@ class LocaleOptimizer {
   keepLocales(localesToKeep) {
     const keepList = Array.isArray(localesToKeep) ? localesToKeep : localesToKeep.split(',').map(l => l.trim().toLowerCase());
     
-    console.log('🎯 Optimizing package size...');
+    console.log('🎯 Optimizing package size...');
     console.log(`   Keeping: ${keepList.join(', ').toUpperCase()}`);
     
     // Create backup directory
@@ -162,22 +163,22 @@ class LocaleOptimizer {
         removedCount++;
         removedLocales.push(locale);
         
-        console.log(`   ✅ Removed ${locale.toUpperCase()} (backed up)`);
+        console.log(`   ✅ Removed ${locale.toUpperCase()} (backed up)`);
       }
     });
     
     if (removedCount > 0) {
-      console.log(`\n⚠️  WARNING: Removing locales may break UI functionality`);
-      console.log(`   If issues occur, restore with: node scripts/locale-optimizer.js --restore`);
+      console.log(`\n⚠️  WARNING: Removing locales may break UI functionality`);
+      console.log(`   If issues occur, restore with: node utils/locale-optimizer.js --restore`);
       console.log(`   Or reinstall the package: npm install -g i18ntk`);
       
       // Create warning file
       const warningPath = path.join(this.backupDir, 'REMOVED_LOCALES.txt');
-      SecurityUtils.safeWriteFileSync(warningPath, `Removed locales: ${removedLocales.join(',')}\nRestore with: node scripts/locale-optimizer.js --restore`);
+      SecurityUtils.safeWriteFileSync(warningPath, `Removed locales: ${removedLocales.join(',')}\nRestore with: node utils/locale-optimizer.js --restore`);
     }
     
     const savedKB = (savedSpace / 1024).toFixed(1);
-    console.log(`\n🎉 Optimization complete!`);
+    console.log(`\n🎉 Optimization complete!`);
     console.log(`   Removed: ${removedCount} locales`);
     console.log(`   Saved: ${savedKB}KB`);
     console.log(`   Backup location: ${this.backupDir}`);
@@ -187,17 +188,17 @@ class LocaleOptimizer {
    * Restore locales from backup
    */
   restoreLocales() {
-    console.log('🔄 Restoring locales from backup...');
+    console.log('🔄 Restoring locales from backup...');
     
     if (!SecurityUtils.safeExistsSync(this.backupDir)) {
-      console.log('   ❌ No backup directory found');
+      console.log('   ❌ No backup directory found');
       return;
     }
     
     const backupFiles = fs.readdirSync(this.backupDir).filter(f => f.endsWith('.json'));
     
     if (backupFiles.length === 0) {
-      console.log('   ❌ No backup files found');
+      console.log('   ❌ No backup files found');
       return;
     }
     
@@ -209,10 +210,10 @@ class LocaleOptimizer {
       
       fs.copyFileSync(backupPath, restorePath);
       restoredCount++;
-      console.log(`   ✅ Restored ${file.replace('.json', '').toUpperCase()}`);
+      console.log(`   ✅ Restored ${file.replace('.json', '').toUpperCase()}`);
     });
     
-    console.log(`\n🎉 Restoration complete!`);
+    console.log(`\n🎉 Restoration complete!`);
     console.log(`   Restored: ${restoredCount} locales`);
   }
 
@@ -220,13 +221,13 @@ class LocaleOptimizer {
    * Dry run mode - show optimization scenarios without making changes
    */
   dryRun() {
-    console.log('🔍 LOCALE OPTIMIZER - DRY RUN MODE');
-    console.log('═'.repeat(50));
+    console.log('🔍 LOCALE OPTIMIZER - DRY RUN MODE');
+    console.log('═'.repeat(50));
     
     const available = this.getAvailableLocales();
     const totalSize = this.getTotalSize();
     
-    console.log(`📊 Current state:`);
+    console.log(`📊 Current state:`);
     console.log(`   Total locales: ${available.length}`);
     console.log(`   Total package size: ${totalSize.toFixed(1)}KB`);
     console.log(`   Individual locale sizes:`);
@@ -237,7 +238,7 @@ class LocaleOptimizer {
       console.log(`   - ${locale.toUpperCase()}: ${size.toFixed(1)}KB (${status})`);
     });
 
-    console.log('\n🎯 Optimization scenarios:');
+    console.log('\n🎯 Optimization scenarios:');
     
     // Scenario 1: English only
     const enSize = this.getLocaleSize('en');
@@ -259,42 +260,42 @@ class LocaleOptimizer {
     console.log(`   - Size: ${enEsFrSize.toFixed(1)}KB`);
     console.log(`   - Savings: ${(totalSize - enEsFrSize).toFixed(1)}KB (${(((totalSize - enEsFrSize) / totalSize) * 100).toFixed(1)}%)`);
 
-    console.log('\n💡 To run actual optimization:');
-    console.log('   node scripts/locale-optimizer.js --interactive');
-    console.log('\n✅ Dry run complete - no files were modified');
+    console.log('\n💡 To run actual optimization:');
+    console.log('   node utils/locale-optimizer.js --interactive');
+    console.log('\n✅ Dry run complete - no files were modified');
   }
 
   /**
    * Interactive locale selection with enhanced UI
    */
   async interactiveSelect() {
-    console.log('\n🌍 i18ntk Locale Optimizer');
-    console.log('═'.repeat(50));
+    console.log('\n🌍 i18ntk Locale Optimizer');
+    console.log('═'.repeat(50));
     console.log('Select which UI locales to keep (English is always kept)');
     console.log('This will reduce package size by removing unused language files\n');
     
     const available = this.getAvailableLocales();
     const selections = new Set(['en']); // Always keep English
     
-    console.log('📊 Available locales and sizes:');
+    console.log('📊 Available locales and sizes:');
     available.forEach(locale => {
       const size = this.getLocaleSize(locale);
-      const status = locale === 'en' ? '✅ (Required)' : '○';
+      const status = locale === 'en' ? '✅ (Required)' : '○';
       console.log(`   ${status} ${locale.toUpperCase()}: ${size}KB`);
     });
     
-    console.log('\n💡 Type locale codes separated by commas (e.g., en,es,de)');
+    console.log('\n💡 Type locale codes separated by commas (e.g., en,es,de)');
     console.log('   Press Enter to keep all, or type "cancel" to abort\n');
     
     const answer = await cliHelper.prompt('Select locales to keep: ');
     
     if (answer.toLowerCase() === 'cancel') {
-      console.log('❌ Operation cancelled');
+      console.log('❌ Operation cancelled');
       return false;
     }
     
     if (answer.trim() === '') {
-      console.log('✅ Keeping all locales');
+      console.log('✅ Keeping all locales');
       return true;
     }
     
@@ -302,7 +303,7 @@ class LocaleOptimizer {
     const valid = selected.filter(l => available.includes(l));
     
     if (valid.length === 0) {
-      console.log('⚠️  No valid locales selected, keeping all');
+      console.log('⚠️  No valid locales selected, keeping all');
       return true;
     }
     
@@ -310,16 +311,16 @@ class LocaleOptimizer {
     valid.push('en');
     const unique = [...new Set(valid)];
     
-    console.log(`\n🎯 Selected: ${unique.join(', ').toUpperCase()}`);
+    console.log(`\n🎯 Selected: ${unique.join(', ').toUpperCase()}`);
     this.showImpact(unique);
     
     const confirm = await cliHelper.prompt('\nProceed? (y/N): ');
     if (confirm.toLowerCase() === 'y' || confirm.toLowerCase() === 'yes') {
       this.keepLocales(unique.join(','));
-      console.log('\n🎉 Package optimized successfully!');
-      console.log('💡 Use --restore to bring back removed locales');
+      console.log('\n🎉 Package optimized successfully!');
+      console.log('💡 Use --restore to bring back removed locales');
     } else {
-      console.log('❌ Operation cancelled');
+      console.log('❌ Operation cancelled');
     }
     return true;
   }
@@ -336,7 +337,7 @@ class LocaleOptimizer {
     const saved = allSize - selectedSize;
     const percentage = ((saved / allSize) * 100).toFixed(1);
     
-    console.log(`\n📈 Impact Analysis:`);
+    console.log(`\n📈 Impact Analysis:`);
     console.log(`   Current: ${allSize.toFixed(1)}KB`);
     console.log(`   New:     ${selectedSize.toFixed(1)}KB`);
     console.log(`   Saved:   ${saved.toFixed(1)}KB (${percentage}%)`);
@@ -536,8 +537,8 @@ async function main() {
   
   // Handle --init
   if (args.includes('--init')) {
-    console.log('\n📦 Package Size Optimization');
-    console.log('═'.repeat(30));
+    console.log('\n📦 Package Size Optimization');
+    console.log('═'.repeat(30));
     optimizer.listLocales();
     
     const answer = await cliHelper.prompt('\nOptimize package size now? (Y/n): ');
@@ -552,20 +553,20 @@ async function main() {
   }
   
   if (!options.interactive && !options.list && !options.keep && !options.restore && !options.dryRun && !args.includes('--init')) {
-    console.log('🌍 i18ntk Locale Optimizer v2.0');
-    console.log('═'.repeat(35));
+    console.log('🌍 i18ntk Locale Optimizer v2.0');
+    console.log('═'.repeat(35));
     console.log('Interactive package size optimization for UI locales');
     console.log('');
     console.log('Usage:');
-    console.log('  node scripts/locale-optimizer.js --interactive  🎯 Interactive selection');
-    console.log('  node scripts/locale-optimizer.js --list        📊 List all locales');
-    console.log('  node scripts/locale-optimizer.js --keep en,es,de  ⚡ Quick keep');
-    console.log('  node scripts/locale-optimizer.js --restore     🔄 Restore all locales');
-    console.log('  node scripts/locale-optimizer.js --init       🚀 Called during init');
-    console.log('  node scripts/locale-optimizer.js --dry-run    🔍 Simulation mode');
+    console.log('  node utils/locale-optimizer.js --interactive  🎯 Interactive selection');
+    console.log('  node utils/locale-optimizer.js --list        📊 List all locales');
+    console.log('  node utils/locale-optimizer.js --keep en,es,de  âš¡ Quick keep');
+    console.log('  node utils/locale-optimizer.js --restore     🔄 Restore all locales');
+    console.log('  node utils/locale-optimizer.js --init       🚀 Called during init');
+    console.log('  node utils/locale-optimizer.js --dry-run    🔍 Simulation mode');
     console.log('');
-    console.log('💡 Example: Keep only English and Spanish');
-    console.log('   node scripts/locale-optimizer.js --keep en,es');
+    console.log('💡 Example: Keep only English and Spanish');
+    console.log('   node utils/locale-optimizer.js --keep en,es');
     return;
   }
   
@@ -581,4 +582,4 @@ if (require.main === module) {
   main();
 }
 
-module.exports = LocaleOptimizer;
+module.exports = LocaleOptimizer;

package/utils/security-check-improved.js

@@ -125,14 +125,12 @@ class SecurityChecker {
       }
     }
 
-    // Check for dangerous patterns (excluding the overly broad require pattern)
-    const dangerousPatterns = [
-      /fs\.readFileSync\s*\(/g,
-      /fs\.writeFileSync\s*\(/g,
-      /fs\.existsSync\s*\(/g,
-      /eval\s*\(/g,
-      /Function\s*\(/g
-    ];
+    // Check for dangerous code execution patterns in SecurityUtils itself.
+    // Direct fs usage is expected here because this module provides vetted wrappers.
+    const dangerousPatterns = [
+      /eval\s*\(/g,
+      /Function\s*\(/g
+    ];
 
     for (const pattern of dangerousPatterns) {
       const matches = content.match(pattern);
@@ -251,11 +249,16 @@ class SecurityChecker {
     // No action needed for legitimate package requires
   }
 
-  async checkFilePermissions() {
-    this.log('Checking file permissions...');
-
-    const criticalFiles = [
-      'utils/security.js',
+  async checkFilePermissions() {
+    this.log('Checking file permissions...');
+
+    // POSIX permission checks are noisy/non-actionable on Windows.
+    if (process.platform === 'win32') {
+      return;
+    }
+
+    const criticalFiles = [
+      'utils/security.js',
       'tests/security.test.js',
       'package.json'
     ];

package/utils/security.js

@@ -531,10 +531,12 @@ class SecurityUtils {
       'theme', 'ui', 'setup', 'reports', 'display', 'interface',
       // Security and settings
       'security', 'settings', 'preferences', 'config', 'configuration',
-      // Additional common properties
-      'autoSave', 'autoBackup', 'validateOnSave', 'showWarnings', 'verbose',
-      'timeout', 'retries', 'batchSize', 'maxConcurrency', 'cacheEnabled'
-    ]);
+      // Additional common properties
+      'autoSave', 'autoBackup', 'validateOnSave', 'showWarnings', 'verbose',
+      'timeout', 'retries', 'batchSize', 'maxConcurrency', 'cacheEnabled',
+      // Date and reporting options used by existing settings
+      'dateFormat', 'timeFormat', 'timezone', 'reportLanguage', 'dateTime'
+    ]);
 
     // Remove unknown properties
     Object.keys(sanitized).forEach(key => {

package/main/i18ntk-go.js

@@ -1,283 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * i18ntk-go.js - Go Language I18n Management Command
- * 
- * Supports:
- * - Standard Go i18n patterns
- * - go-i18n library
- * - Custom Go i18n implementations
- * - Resource file (.json, .toml) management
- */
-
-const fs = require('fs');
-const path = require('path');
-const SecurityUtils = require(path.join(__dirname, '../utils/security'));
-const { getConfig, saveConfig } = require(path.join(__dirname, '../utils/config-helper'));
-const I18nHelper = require(path.join(__dirname, '../utils/i18n-helper'));
-const SetupEnforcer = require(path.join(__dirname, '../utils/setup-enforcer'));
-const { program } = require('../utils/mini-commander');
-
-(async () => {
-  try {
-    await SetupEnforcer.checkSetupCompleteAsync();
-  } catch (error) {
-    console.error('Setup check failed:', error.message);
-    process.exit(1);
-  }
-})();
-
-class GoI18nManager {
-  constructor() {
-    this.supportedPatterns = [
-      'T("key")',
-      'Localize("key")',
-      'i18n.T("key")',
-      'tr("key")',
-      'message.Printer.Printf',
-      'i18n.MustLocalize'
-    ];
-    
-    this.fileExtensions = ['.go', '.mod', '.sum'];
-    this.resourceFormats = ['.json', '.toml', '.yaml', '.yml'];
-  }
-
-  async detectFramework(sourceDir) {
-    const goModPath = path.join(sourceDir, 'go.mod');
-    if (SecurityUtils.safeExistsSync(goModPath)) {
-      const content = SecurityUtils.safeReadFileSync(goModPath, sourceDir, 'utf8') || '';
-      
-      if (content.includes('go-i18n')) return 'go-i18n-v2';
-      if (/x\/text\b/.test(content)) return 'golang-text';
-      
-      return 'standard-go';
-    }
-    
-    // Check for Go files
-    const goFiles = this.findFiles(sourceDir, '.go');
-    if (goFiles.length > 0) {
-      return 'standard-go';
-    }
-    
-    return 'generic';
-  }
-
-  async extractTranslations(sourceDir, options = {}) {
-    const framework = await this.detectFramework(sourceDir);
-    const translations = new Set();
-    
-    const goFiles = this.findFiles(sourceDir, '.go');
-    
-    for (const file of goFiles) {
-      const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8') || '';
-      
-      // Extract Go i18n patterns
-      const patterns = [
-        /T\("([^"]+)"\)/g,
-        /Localize\("([^"]+)"\)/g,
-        /i18n\.T\("([^"]+)"\)/g,
-        /tr\("([^"]+)"\)/g,
-        /message\.Printer\.Printf\("([^"]+)"/g,
-        /i18n\.MustLocalize\(&i18n\.LocalizeConfig\{MessageID:\s*"([^"]+)"/g
-      ];
-      
-      for (const pattern of patterns) {
-        let match;
-        while ((match = pattern.exec(content)) !== null) {
-          translations.add(match[1]);
-        }
-      }
-    }
-    
-    return {
-      framework,
-      translations: Array.from(translations),
-      files: goFiles.length,
-      patterns: this.supportedPatterns
-    };
-  }
-
-  async createLocaleStructure(outputDir, languages = ['en']) {
-    const localesDir = path.join(outputDir, 'locales');
-    
-    for (const lang of languages) {
-      const langDir = path.join(localesDir, lang);
-      fs.mkdirSync(langDir, { recursive: true });
-      
-      // Create Go i18n format files
-      SecurityUtils.safeWriteFileSync(path.join(langDir, 'active.en.toml'), `# Go i18n translations for ${lang}
-[hello]
-other = "Hello, World!"
-
-[items]
-one = "{{.Count}} item"
-other = "{{.Count}} items"
-`);
-      
-      SecurityUtils.safeWriteFileSync(path.join(langDir, 'active.en.json'), JSON.stringify({
-        hello: "Hello, World!",
-        items: {
-          one: "{{.Count}} item",
-          other: "{{.Count}} items"
-        }
-      }, null, 2));
-    }
-    
-    return localesDir;
-  }
-
-  findFiles(dir, extension) {
-    const files = [];
-    
-    function traverse(currentDir) {
-      const items = fs.readdirSync(currentDir);
-      
-      for (const item of items) {
-        const fullPath = path.join(currentDir, item);
-        const stat = fs.statSync(fullPath);
-        
-        if (stat.isDirectory() && !item.startsWith('.') && item !== 'node_modules') {
-          traverse(fullPath);
-        } else if (stat.isFile() && path.extname(item) === extension) {
-          files.push(fullPath);
-        }
-      }
-    }
-    
-    traverse(dir);
-    return files;
-  }
-
-  async generateReport(results, outputDir) {
-    const report = {
-      timestamp: new Date().toISOString(),
-      framework: results.framework,
-      totalTranslations: results.translations.length,
-      translations: results.translations,
-      filesProcessed: results.files,
-      patterns: results.patterns,
-      recommendations: this.getRecommendations(results)
-    };
-    
-    const reportPath = path.join(outputDir, 'i18ntk-go-report.json');
-    SecurityUtils.safeWriteFileSync(reportPath, JSON.stringify(report, null, 2));
-    
-    return reportPath;
-  }
-
-  getRecommendations(results) {
-    const recommendations = [];
-    
-    if (results.translations.length === 0) {
-      recommendations.push('No translations found. Check your Go i18n patterns');
-    }
-    
-    if (results.files === 0) {
-      recommendations.push('No Go files found in source directory');
-    }
-    
-    if (results.framework === 'generic') {
-      recommendations.push('Consider using go-i18n library for better i18n support');
-    }
-    
-    return recommendations;
-  }
-}
-
-// CLI Implementation
-program
-  .name('i18ntk-go')
-  .description('Go language i18n management tool')
-  .version('1.10.1');
-
-program
-  .command('init')
-  .description('Initialize Go i18n structure')
-  .option('-s, --source-dir <dir>', 'Source directory', './')
-  .option('-o, --output-dir <dir>', 'Output directory', './i18ntk-reports')
-  .option('-l, --languages <langs>', 'Languages (comma-separated)', 'en')
-  .action(async (options) => {
-    try {
-      const manager = new GoI18nManager();
-      const languages = options.languages.split(',');
-      
-      const localesDir = await manager.createLocaleStructure(options.outputDir, languages);
-      
-      console.log(`✅ Go i18n structure initialized in: ${localesDir}`);
-      console.log(`📊 Languages: ${languages.join(', ')}`);
-      
-    } catch (error) {
-      console.error('❌ Error initializing Go i18n:', error.message);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('analyze')
-  .description('Analyze Go i18n usage')
-  .option('-s, --source-dir <dir>', 'Source directory', './')
-  .option('-o, --output-dir <dir>', 'Output directory', './i18ntk-reports')
-  .option('--dry-run', 'Preview without making changes')
-  .action(async (options) => {
-    try {
-      SecurityUtils.validatePath(options.sourceDir);
-      
-      const manager = new GoI18nManager();
-      const results = await manager.extractTranslations(options.sourceDir);
-      
-      console.log(`🔍 Framework detected: ${results.framework}`);
-      console.log(`📊 Files processed: ${results.files}`);
-      console.log(`📝 Translations found: ${results.translations.length}`);
-      
-      if (!options.dryRun) {
-        const reportPath = await manager.generateReport(results, options.outputDir);
-        console.log(`📄 Report saved: ${reportPath}`);
-      }
-      
-    } catch (error) {
-      console.error('❌ Error analyzing Go i18n:', error.message);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('extract')
-  .description('Extract Go translations')
-  .option('-s, --source-dir <dir>', 'Source directory', './')
-  .option('-o, --output-dir <dir>', 'Output directory', './locales')
-  .option('-l, --languages <langs>', 'Languages (comma-separated)', 'en')
-  .action(async (options) => {
-    try {
-      SecurityUtils.validatePath(options.sourceDir);
-      
-      const manager = new GoI18nManager();
-      const results = await manager.extractTranslations(options.sourceDir);
-      
-      await manager.createLocaleStructure(options.outputDir, options.languages.split(','));
-      
-      console.log(`✅ Extracted ${results.translations.length} translations`);
-      console.log(`📁 Locale structure created in: ${options.outputDir}`);
-      
-    } catch (error) {
-      console.error('❌ Error extracting Go translations:', error.message);
-      process.exit(1);
-    }
-  });
-
-// Handle uncaught errors
-process.on('uncaughtException', (error) => {
-  console.error('❌ Uncaught exception:', error.message);
-  process.exit(1);
-});
-
-process.on('unhandledRejection', (reason) => {
-  console.error('❌ Unhandled rejection:', reason);
-  process.exit(1);
-});
-
-// Export for programmatic use
-module.exports = { GoI18nManager };
-
-if (require.main === module) {
-  program.parse();
-}