@git.zone/cli 2.13.10 → 2.13.12

package/ts/mod_config/index.ts

@@ -8,23 +8,23 @@ import { runFormatter, type ICheckResult } from '../mod_format/index.js';
 export { ReleaseConfig, CommitConfig };
 
 /**
- * Format npmextra.json with diff preview
+ * Format .smartconfig.json with diff preview
  * Shows diff first, asks for confirmation, then applies
  */
-async function formatNpmextraWithDiff(): Promise<void> {
+async function formatSmartconfigWithDiff(): Promise<void> {
   // Check for diffs first
-  const checkResult = await runFormatter('npmextra', {
+  const checkResult = await runFormatter('smartconfig', {
     checkOnly: true,
     showDiff: true,
   }) as ICheckResult | void;
 
   if (checkResult && checkResult.hasDiff) {
     const shouldApply = await plugins.smartinteract.SmartInteract.getCliConfirmation(
-      'Apply formatting changes to npmextra.json?',
+      'Apply formatting changes to .smartconfig.json?',
       true
     );
     if (shouldApply) {
-      await runFormatter('npmextra', { silent: true });
+      await runFormatter('smartconfig', { silent: true });
     }
   }
 }
@@ -187,7 +187,7 @@ async function handleAdd(url?: string): Promise<void> {
   if (added) {
     await config.save();
     plugins.logger.log('success', `Added registry: ${url}`);
-    await formatNpmextraWithDiff();
+    await formatSmartconfigWithDiff();
   } else {
     plugins.logger.log('warn', `Registry already exists: ${url}`);
   }
@@ -223,7 +223,7 @@ async function handleRemove(url?: string): Promise<void> {
   if (removed) {
     await config.save();
     plugins.logger.log('success', `Removed registry: ${url}`);
-    await formatNpmextraWithDiff();
+    await formatSmartconfigWithDiff();
   } else {
     plugins.logger.log('warn', `Registry not found: ${url}`);
   }
@@ -250,7 +250,7 @@ async function handleClear(): Promise<void> {
     config.clearRegistries();
     await config.save();
     plugins.logger.log('success', 'All registries cleared.');
-    await formatNpmextraWithDiff();
+    await formatSmartconfigWithDiff();
   } else {
     plugins.logger.log('info', 'Operation cancelled.');
   }
@@ -290,7 +290,7 @@ async function handleAccessLevel(level?: string): Promise<void> {
   config.setAccessLevel(level as 'public' | 'private');
   await config.save();
   plugins.logger.log('success', `Access level set to: ${level}`);
-  await formatNpmextraWithDiff();
+  await formatSmartconfigWithDiff();
 }
 
 /**
@@ -350,7 +350,7 @@ async function handleCommitInteractive(config: CommitConfig): Promise<void> {
   await config.save();
 
   plugins.logger.log('success', 'Commit configuration updated');
-  await formatNpmextraWithDiff();
+  await formatSmartconfigWithDiff();
 }
 
 /**
@@ -368,7 +368,7 @@ async function handleCommitSetting(config: CommitConfig, setting: string, value?
 
   await config.save();
   plugins.logger.log('success', `Set ${setting} to ${boolValue}`);
-  await formatNpmextraWithDiff();
+  await formatSmartconfigWithDiff();
 }
 
 /**

package/ts/mod_format/classes.baseformatter.ts

@@ -2,11 +2,12 @@ import * as plugins from './mod.plugins.js';
 import { FormatContext } from './classes.formatcontext.js';
 import type { IPlannedChange, ICheckResult } from './interfaces.format.js';
 import { Project } from '../classes.project.js';
+import { FormatStats } from './classes.formatstats.js';
 
 export abstract class BaseFormatter {
   protected context: FormatContext;
   protected project: Project;
-  protected stats: any; // Will be FormatStats from context
+  protected stats: FormatStats;
 
   constructor(context: FormatContext, project: Project) {
     this.context = context;
@@ -36,9 +37,6 @@ export abstract class BaseFormatter {
       }
 
       await this.postExecute();
-    } catch (error) {
-      // Don't rollback here - let the FormatPlanner handle it
-      throw error;
     } finally {
       this.stats.endModule(this.name, startTime);
     }
@@ -53,13 +51,10 @@ export abstract class BaseFormatter {
   }
 
   protected async modifyFile(filepath: string, content: string): Promise<void> {
-    // Validate filepath before writing
     if (!filepath || filepath.trim() === '') {
       throw new Error(`Invalid empty filepath in modifyFile`);
     }
 
-    // Ensure we have a proper path with directory component
-    // If the path has no directory component (e.g., "package.json"), prepend "./"
     let normalizedPath = filepath;
     if (!plugins.path.parse(filepath).dir) {
       normalizedPath = './' + filepath;
@@ -69,44 +64,46 @@ export abstract class BaseFormatter {
   }
 
   protected async createFile(filepath: string, content: string): Promise<void> {
-    await plugins.smartfs.file(filepath).encoding('utf8').write(content);
+    let normalizedPath = filepath;
+    if (!plugins.path.parse(filepath).dir) {
+      normalizedPath = './' + filepath;
+    }
+
+    // Ensure parent directory exists
+    const dir = plugins.path.dirname(normalizedPath);
+    if (dir && dir !== '.') {
+      await plugins.smartfs.directory(dir).recursive().create();
+    }
+
+    await plugins.smartfs.file(normalizedPath).encoding('utf8').write(content);
   }
 
   protected async deleteFile(filepath: string): Promise<void> {
     await plugins.smartfs.file(filepath).delete();
   }
 
-  protected async shouldProcessFile(filepath: string): Promise<boolean> {
-    return true;
-  }
-
   /**
    * Check for diffs without applying changes
-   * Returns information about what would change
    */
   async check(): Promise<ICheckResult> {
     const changes = await this.analyze();
     const diffs: ICheckResult['diffs'] = [];
 
     for (const change of changes) {
-      // Skip generic changes that don't have actual content
       if (change.path === '<various files>') {
         continue;
       }
 
       if (change.type === 'modify' || change.type === 'create') {
-        // Read current content if file exists
         let currentContent: string | undefined;
         try {
           currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read() as string;
         } catch {
-          // File doesn't exist yet
           currentContent = undefined;
         }
 
         const newContent = change.content;
 
-        // Check if there's an actual diff
         if (currentContent !== newContent && newContent !== undefined) {
           diffs.push({
             path: change.path,
@@ -116,7 +113,6 @@ export abstract class BaseFormatter {
           });
         }
       } else if (change.type === 'delete') {
-        // Check if file exists before marking for deletion
         try {
           const currentContent = await plugins.smartfs.file(change.path).encoding('utf8').read() as string;
           diffs.push({
@@ -137,9 +133,6 @@ export abstract class BaseFormatter {
     };
   }
 
-  /**
-   * Display a single diff using smartdiff
-   */
   displayDiff(diff: ICheckResult['diffs'][0]): void {
     console.log(`\n--- ${diff.path}`);
     if (diff.before && diff.after) {
@@ -150,7 +143,6 @@ export abstract class BaseFormatter {
       }));
     } else if (diff.after && !diff.before) {
       console.log('  (new file)');
-      // Show first few lines of new content
       const lines = diff.after.split('\n').slice(0, 10);
       lines.forEach(line => console.log(`  + ${line}`));
       if (diff.after.split('\n').length > 10) {
@@ -161,9 +153,6 @@ export abstract class BaseFormatter {
     }
   }
 
-  /**
-   * Display all diffs from a check result
-   */
   displayAllDiffs(result: ICheckResult): void {
     if (!result.hasDiff) {
       console.log('  No changes detected');

package/ts/mod_format/classes.formatplanner.ts

@@ -2,13 +2,12 @@ import * as plugins from './mod.plugins.js';
 import { FormatContext } from './classes.formatcontext.js';
 import { BaseFormatter } from './classes.baseformatter.js';
 import type { IFormatPlan, IPlannedChange } from './interfaces.format.js';
+import { getModuleIcon } from './interfaces.format.js';
 import { logger } from '../gitzone.logging.js';
-import { DependencyAnalyzer } from './classes.dependency-analyzer.js';
 import { DiffReporter } from './classes.diffreporter.js';
 
 export class FormatPlanner {
   private plannedChanges: Map<string, IPlannedChange[]> = new Map();
-  private dependencyAnalyzer = new DependencyAnalyzer();
   private diffReporter = new DiffReporter();
 
   async planFormat(modules: BaseFormatter[]): Promise<IFormatPlan> {
@@ -18,7 +17,6 @@ export class FormatPlanner {
         filesAdded: 0,
         filesModified: 0,
         filesRemoved: 0,
-        estimatedTime: 0,
       },
       changes: [],
       warnings: [],
@@ -32,7 +30,6 @@ export class FormatPlanner {
         for (const change of changes) {
           plan.changes.push(change);
 
-          // Update summary
           switch (change.type) {
             case 'create':
               plan.summary.filesAdded++;
@@ -58,7 +55,6 @@ export class FormatPlanner {
       plan.summary.filesAdded +
       plan.summary.filesModified +
       plan.summary.filesRemoved;
-    plan.summary.estimatedTime = plan.summary.totalFiles * 100; // 100ms per file estimate
 
     return plan;
   }
@@ -67,27 +63,20 @@ export class FormatPlanner {
     plan: IFormatPlan,
     modules: BaseFormatter[],
     context: FormatContext,
-    parallel: boolean = false,
   ): Promise<void> {
     const startTime = Date.now();
 
-    try {
-      // Always use sequential execution to avoid race conditions
-      for (const module of modules) {
-        const changes = this.plannedChanges.get(module.name) || [];
+    for (const module of modules) {
+      const changes = this.plannedChanges.get(module.name) || [];
 
-        if (changes.length > 0) {
-          logger.log('info', `Executing ${module.name} formatter...`);
-          await module.execute(changes);
-        }
+      if (changes.length > 0) {
+        logger.log('info', `Executing ${module.name} formatter...`);
+        await module.execute(changes);
       }
-
-      const endTime = Date.now();
-      const duration = endTime - startTime;
-      logger.log('info', `Format operations completed in ${duration}ms`);
-    } catch (error) {
-      throw error;
     }
+
+    const duration = Date.now() - startTime;
+    logger.log('info', `Format operations completed in ${duration}ms`);
   }
 
   async displayPlan(
@@ -103,7 +92,6 @@ export class FormatPlanner {
     console.log('');
     console.log('Changes by module:');
 
-    // Group changes by module
     const changesByModule = new Map<string, IPlannedChange[]>();
     for (const change of plan.changes) {
       const moduleChanges = changesByModule.get(change.module) || [];
@@ -113,14 +101,13 @@ export class FormatPlanner {
 
     for (const [module, changes] of changesByModule) {
       console.log(
-        `\n${this.getModuleIcon(module)} ${module} (${changes.length} ${changes.length === 1 ? 'file' : 'files'})`,
+        `\n${getModuleIcon(module)} ${module} (${changes.length} ${changes.length === 1 ? 'file' : 'files'})`,
       );
 
       for (const change of changes) {
         const icon = this.getChangeIcon(change.type);
         console.log(`  ${icon} ${change.path} - ${change.description}`);
 
-        // Show diff for modified files if detailed view is requested
         if (detailed && change.type === 'modify') {
           const diff = await this.diffReporter.generateDiffForChange(change);
           if (diff) {
@@ -141,22 +128,6 @@ export class FormatPlanner {
     console.log('\n' + '━'.repeat(50));
   }
 
-  private getModuleIcon(module: string): string {
-    const icons: Record<string, string> = {
-      packagejson: '📦',
-      license: '📝',
-      tsconfig: '🔧',
-      cleanup: '🚮',
-      gitignore: '🔒',
-      prettier: '✨',
-      readme: '📖',
-      templates: '📄',
-      npmextra: '⚙️',
-      copy: '📋',
-    };
-    return icons[module] || '📁';
-  }
-
   private getChangeIcon(type: 'create' | 'modify' | 'delete'): string {
     switch (type) {
       case 'create':

package/ts/mod_format/classes.formatstats.ts

@@ -1,5 +1,6 @@
 import * as plugins from './mod.plugins.js';
 import { logger } from '../gitzone.logging.js';
+import { getModuleIcon } from './interfaces.format.js';
 
 export interface IModuleStats {
   name: string;
@@ -23,8 +24,6 @@ export interface IFormatStats {
     totalModified: number;
     totalDeleted: number;
     totalErrors: number;
-    cacheHits: number;
-    cacheMisses: number;
   };
 }
 
@@ -43,8 +42,6 @@ export class FormatStats {
         totalModified: 0,
         totalDeleted: 0,
         totalErrors: 0,
-        cacheHits: 0,
-        cacheMisses: 0,
       },
     };
   }
@@ -107,14 +104,6 @@ export class FormatStats {
     }
   }
 
-  recordCacheHit(): void {
-    this.stats.overallStats.cacheHits++;
-  }
-
-  recordCacheMiss(): void {
-    this.stats.overallStats.cacheMisses++;
-  }
-
   finish(): void {
     this.stats.endTime = Date.now();
     this.stats.totalExecutionTime = this.stats.endTime - this.stats.startTime;
@@ -135,20 +124,6 @@ export class FormatStats {
     console.log(`    • Deleted: ${this.stats.overallStats.totalDeleted}`);
     console.log(`  Errors: ${this.stats.overallStats.totalErrors}`);
 
-    if (
-      this.stats.overallStats.cacheHits > 0 ||
-      this.stats.overallStats.cacheMisses > 0
-    ) {
-      const cacheHitRate =
-        (this.stats.overallStats.cacheHits /
-          (this.stats.overallStats.cacheHits +
-            this.stats.overallStats.cacheMisses)) *
-        100;
-      console.log(`  Cache Hit Rate: ${cacheHitRate.toFixed(1)}%`);
-      console.log(`    • Hits: ${this.stats.overallStats.cacheHits}`);
-      console.log(`    • Misses: ${this.stats.overallStats.cacheMisses}`);
-    }
-
     // Module stats
     console.log('\nModule Breakdown:');
     console.log('─'.repeat(50));
@@ -159,7 +134,7 @@ export class FormatStats {
 
     for (const moduleStats of sortedModules) {
       console.log(
-        `\n${this.getModuleIcon(moduleStats.name)} ${moduleStats.name}:`,
+        `\n${getModuleIcon(moduleStats.name)} ${moduleStats.name}:`,
       );
       console.log(
         `  Execution Time: ${this.formatDuration(moduleStats.executionTime)}`,
@@ -211,19 +186,4 @@ export class FormatStats {
     }
   }
 
-  private getModuleIcon(module: string): string {
-    const icons: Record<string, string> = {
-      packagejson: '📦',
-      license: '📝',
-      tsconfig: '🔧',
-      cleanup: '🚮',
-      gitignore: '🔒',
-      prettier: '✨',
-      readme: '📖',
-      templates: '📄',
-      npmextra: '⚙️',
-      copy: '📋',
-    };
-    return icons[module] || '📁';
-  }
 }

package/ts/mod_format/formatters/cleanup.formatter.ts

@@ -1,7 +1,6 @@
 import { BaseFormatter } from '../classes.baseformatter.js';
 import type { IPlannedChange } from '../interfaces.format.js';
 import * as plugins from '../mod.plugins.js';
-import * as cleanupFormatter from '../format.cleanup.js';
 
 export class CleanupFormatter extends BaseFormatter {
   get name(): string {

package/ts/mod_format/formatters/copy.formatter.ts

@@ -17,15 +17,15 @@ export class CopyFormatter extends BaseFormatter {
   async analyze(): Promise<IPlannedChange[]> {
     const changes: IPlannedChange[] = [];
 
-    // Get copy configuration from npmextra.json
-    const npmextraConfig = new plugins.npmextra.Smartconfig();
-    const copyConfig = npmextraConfig.dataFor<{ patterns: ICopyPattern[] }>(
+    // Get copy configuration from .smartconfig.json
+    const smartconfigInstance = new plugins.smartconfig.Smartconfig();
+    const copyConfig = smartconfigInstance.dataFor<{ patterns: ICopyPattern[] }>(
       'gitzone.format.copy',
       { patterns: [] },
     );
 
     if (!copyConfig.patterns || copyConfig.patterns.length === 0) {
-      logVerbose('No copy patterns configured in npmextra.json');
+      logVerbose('No copy patterns configured in .smartconfig.json');
       return changes;
     }
 
@@ -103,10 +103,6 @@ export class CopyFormatter extends BaseFormatter {
   async applyChange(change: IPlannedChange): Promise<void> {
     if (!change.content) return;
 
-    // Ensure destination directory exists
-    const destDir = plugins.path.dirname(change.path);
-    await plugins.smartfs.directory(destDir).recursive().create();
-
     if (change.type === 'create') {
       await this.createFile(change.path, change.content);
     } else {

package/ts/mod_format/formatters/gitignore.formatter.ts

@@ -1,42 +1,39 @@
 import { BaseFormatter } from '../classes.baseformatter.js';
 import type { IPlannedChange } from '../interfaces.format.js';
 import * as plugins from '../mod.plugins.js';
+import * as paths from '../../paths.js';
 import { logger } from '../../gitzone.logging.js';
 
-// Standard gitignore template content (without front-matter)
-const GITIGNORE_TEMPLATE = `.nogit/
-
-# artifacts
-coverage/
-public/
-
-# installs
-node_modules/
-
-# caches
-.yarn/
-.cache/
-.rpt2_cache
-
-# builds
-dist/
-dist_*/
-
-# AI
-.claude/
-.serena/
-
-#------# custom`;
-
 export class GitignoreFormatter extends BaseFormatter {
   get name(): string {
     return 'gitignore';
   }
 
+  /**
+   * Read the standard gitignore template from the asset file,
+   * stripping the YAML frontmatter.
+   */
+  private async getStandardTemplate(): Promise<string> {
+    const templatePath = plugins.path.join(paths.templatesDir, 'gitignore', '_gitignore');
+    const raw = (await plugins.smartfs
+      .file(templatePath)
+      .encoding('utf8')
+      .read()) as string;
+
+    // Strip YAML frontmatter (---\n...\n---)
+    const frontmatterEnd = raw.indexOf('---', 3);
+    if (frontmatterEnd !== -1) {
+      return raw.slice(frontmatterEnd + 3).trimStart();
+    }
+    return raw;
+  }
+
   async analyze(): Promise<IPlannedChange[]> {
     const changes: IPlannedChange[] = [];
     const gitignorePath = '.gitignore';
 
+    const standardTemplate = await this.getStandardTemplate();
+
     // Check if file exists and extract custom content
     let customContent = '';
     const exists = await plugins.smartfs.file(gitignorePath).exists();
@@ -59,11 +56,11 @@ export class GitignoreFormatter extends BaseFormatter {
     }
 
     // Compute new content
-    let newContent = GITIGNORE_TEMPLATE;
+    let newContent = standardTemplate;
     if (customContent) {
-      newContent = GITIGNORE_TEMPLATE + '\n' + customContent + '\n';
+      newContent = standardTemplate + '\n' + customContent + '\n';
     } else {
-      newContent = GITIGNORE_TEMPLATE + '\n';
+      newContent = standardTemplate + '\n';
     }
 
     // Read current content to compare
@@ -75,7 +72,6 @@ export class GitignoreFormatter extends BaseFormatter {
         .read()) as string;
     }
 
-    // Determine change type
     if (!exists) {
       changes.push({
         type: 'create',

package/ts/mod_format/formatters/packagejson.formatter.ts

@@ -100,9 +100,9 @@ export class PackageJsonFormatter extends BaseFormatter {
     // Parse and compute new content
     const packageJson = JSON.parse(currentContent);
 
-    // Get gitzone config from npmextra
-    const npmextraConfig = new plugins.npmextra.Smartconfig(paths.cwd);
-    const gitzoneData: any = npmextraConfig.dataFor('@git.zone/cli', {});
+    // Get gitzone config from smartconfig
+    const smartconfigInstance = new plugins.smartconfig.Smartconfig(paths.cwd);
+    const gitzoneData: any = smartconfigInstance.dataFor('@git.zone/cli', {});
 
     // Set metadata from gitzone config
     if (gitzoneData.module) {
@@ -156,7 +156,7 @@ export class PackageJsonFormatter extends BaseFormatter {
       'dist_ts_web/**/*',
       'assets/**/*',
       'cli.js',
-      'smartconfig.json',
+      '.smartconfig.json',
       'readme.md',
     ];
 

package/ts/mod_format/formatters/prettier.formatter.ts

@@ -21,7 +21,7 @@ export class PrettierFormatter extends BaseFormatter {
     const rootConfigFiles = [
       'package.json',
       'tsconfig.json',
-      'smartconfig.json',
+      '.smartconfig.json',
       '.prettierrc',
       '.prettierrc.json',
       '.prettierrc.js',
@@ -79,12 +79,9 @@ export class PrettierFormatter extends BaseFormatter {
     // Remove duplicates
     const uniqueFiles = [...new Set(allFiles)];
 
-    // Get all files that match the pattern
-    const files = uniqueFiles;
-
     // Ensure we only process actual files (not directories)
     const validFiles: string[] = [];
-    for (const file of files) {
+    for (const file of uniqueFiles) {
       try {
         const stats = await plugins.smartfs.file(file).stat();
         if (!stats.isDirectory) {
@@ -96,14 +93,7 @@ export class PrettierFormatter extends BaseFormatter {
       }
     }
 
-    // Check which files need formatting
     for (const file of validFiles) {
-      // Skip files that haven't changed
-      if (!(await this.shouldProcessFile(file))) {
-        logVerbose(`Skipping ${file} - no changes detected`);
-        continue;
-      }
-
       changes.push({
         type: 'modify',
         path: file,
@@ -232,7 +222,7 @@ export class PrettierFormatter extends BaseFormatter {
 
   private async getPrettierConfig(): Promise<any> {
     // Try to load prettier config from the project
-    const prettierConfig = new plugins.npmextra.Smartconfig();
+    const prettierConfig = new plugins.smartconfig.Smartconfig();
     return prettierConfig.dataFor('prettier', {
       // Default prettier config
       singleQuote: true,