@git.zone/cli 2.13.8 → 2.13.11

package/ts/mod_format/index.ts

@@ -5,9 +5,8 @@ import { FormatPlanner } from './classes.formatplanner.js';
 import { BaseFormatter } from './classes.baseformatter.js';
 import { logger, setVerboseMode } from '../gitzone.logging.js';
 
-// Import wrapper classes for formatters
 import { CleanupFormatter } from './formatters/cleanup.formatter.js';
-import { NpmextraFormatter } from './formatters/npmextra.formatter.js';
+import { SmartconfigFormatter } from './formatters/smartconfig.formatter.js';
 import { LicenseFormatter } from './formatters/license.formatter.js';
 import { PackageJsonFormatter } from './formatters/packagejson.formatter.js';
 import { TemplatesFormatter } from './formatters/templates.formatter.js';
@@ -17,82 +16,66 @@ import { PrettierFormatter } from './formatters/prettier.formatter.js';
 import { ReadmeFormatter } from './formatters/readme.formatter.js';
 import { CopyFormatter } from './formatters/copy.formatter.js';
 
+// Shared formatter class map used by both run() and runFormatter()
+const formatterMap: Record<string, new (ctx: FormatContext, proj: Project) => BaseFormatter> = {
+  cleanup: CleanupFormatter,
+  smartconfig: SmartconfigFormatter,
+  license: LicenseFormatter,
+  packagejson: PackageJsonFormatter,
+  templates: TemplatesFormatter,
+  gitignore: GitignoreFormatter,
+  tsconfig: TsconfigFormatter,
+  prettier: PrettierFormatter,
+  readme: ReadmeFormatter,
+  copy: CopyFormatter,
+};
+
+// Formatters that don't require projectType to be set
+const formattersNotRequiringProjectType = ['smartconfig', 'prettier', 'cleanup', 'packagejson'];
+
 export let run = async (
   options: {
-    write?: boolean;      // Explicitly write changes (default: false, dry-mode)
-    dryRun?: boolean;     // Deprecated, kept for compatibility
+    write?: boolean;
+    dryRun?: boolean; // Deprecated, kept for compatibility
     yes?: boolean;
     planOnly?: boolean;
     savePlan?: string;
     fromPlan?: string;
     detailed?: boolean;
     interactive?: boolean;
-    parallel?: boolean;
     verbose?: boolean;
-    diff?: boolean;       // Show file diffs
+    diff?: boolean;
   } = {},
 ): Promise<any> => {
-  // Set verbose mode if requested
   if (options.verbose) {
     setVerboseMode(true);
   }
 
-  // Determine if we should write changes
-  // Default is dry-mode (no writing) unless --write/-w is specified
   const shouldWrite = options.write ?? (options.dryRun === false);
 
   const project = await Project.fromCwd({ requireProjectType: false });
   const context = new FormatContext();
-  // Cache system removed - no longer needed
   const planner = new FormatPlanner();
 
-  // Get configuration from npmextra
-  const npmextraConfig = new plugins.npmextra.Npmextra();
-  const formatConfig = npmextraConfig.dataFor<any>('@git.zone/cli.format', {
+  const smartconfigInstance = new plugins.smartconfig.Smartconfig();
+  const formatConfig = smartconfigInstance.dataFor<any>('@git.zone/cli.format', {
     interactive: true,
     showDiffs: false,
     autoApprove: false,
-    planTimeout: 30000,
-    rollback: {
-      enabled: true,
-      autoRollbackOnError: true,
-      backupRetentionDays: 7,
-      maxBackupSize: '100MB',
-      excludePatterns: ['node_modules/**', '.git/**'],
-    },
     modules: {
       skip: [],
       only: [],
-      order: [],
-    },
-    parallel: true,
-    cache: {
-      enabled: true,
-      clean: true, // Clean invalid entries from cache
     },
   });
 
-  // Cache cleaning removed - no longer using cache system
-
-  // Override config with command options
   const interactive = options.interactive ?? formatConfig.interactive;
   const autoApprove = options.yes ?? formatConfig.autoApprove;
-  const parallel = options.parallel ?? formatConfig.parallel;
 
   try {
-    // Initialize formatters
-    const formatters = [
-      new CleanupFormatter(context, project),
-      new NpmextraFormatter(context, project),
-      new LicenseFormatter(context, project),
-      new PackageJsonFormatter(context, project),
-      new TemplatesFormatter(context, project),
-      new GitignoreFormatter(context, project),
-      new TsconfigFormatter(context, project),
-      new PrettierFormatter(context, project),
-      new ReadmeFormatter(context, project),
-      new CopyFormatter(context, project),
-    ];
+    // Initialize formatters in execution order
+    const formatters = Object.entries(formatterMap).map(
+      ([, FormatterClass]) => new FormatterClass(context, project),
+    );
 
     // Filter formatters based on configuration
     const activeFormatters = formatters.filter((formatter) => {
@@ -128,13 +111,13 @@ export let run = async (
       logger.log('info', `Plan saved to ${options.savePlan}`);
     }
 
-    // Exit if plan-only mode
     if (options.planOnly) {
       return;
     }
 
-    // Show diffs if requested (works in both dry-run and write modes)
-    if (options.diff) {
+    // Show diffs if explicitly requested or before interactive write confirmation
+    const showDiffs = options.diff || (shouldWrite && interactive && !autoApprove);
+    if (showDiffs) {
       logger.log('info', 'Showing file diffs:');
       console.log('');
 
@@ -171,22 +154,16 @@ export let run = async (
     }
 
     // Execute phase
-    logger.log(
-      'info',
-      `Executing format operations${parallel ? ' in parallel' : ' sequentially'}...`,
-    );
-    await planner.executePlan(plan, activeFormatters, context, parallel);
+    logger.log('info', 'Executing format operations...');
+    await planner.executePlan(plan, activeFormatters, context);
 
-    // Finish statistics tracking
     context.getFormatStats().finish();
 
-    // Display statistics
-    const showStats = npmextraConfig.dataFor('gitzone.format.showStats', true);
+    const showStats = smartconfigInstance.dataFor('gitzone.format.showStats', true);
     if (showStats) {
       context.getFormatStats().displayStats();
     }
 
-    // Save stats if requested
     if (options.detailed) {
       const statsPath = `.nogit/format-stats-${Date.now()}.json`;
       await context.getFormatStats().saveReport(statsPath);
@@ -195,36 +172,13 @@ export let run = async (
     logger.log('success', 'Format operations completed successfully!');
   } catch (error) {
     logger.log('error', `Format operation failed: ${error.message}`);
-
-    // Rollback system has been removed for stability
-
     throw error;
   }
 };
 
-// Export CLI command handlers
-export const handleRollback = async (operationId?: string): Promise<void> => {
-  logger.log('info', 'Rollback system has been disabled for stability');
-};
-
-export const handleListBackups = async (): Promise<void> => {
-  logger.log('info', 'Backup system has been disabled for stability');
-};
-
-export const handleCleanBackups = async (): Promise<void> => {
-  logger.log(
-    'info',
-    'Backup cleaning has been disabled - backup system removed',
-  );
-};
-
-// Import the ICheckResult type for external use
 import type { ICheckResult } from './interfaces.format.js';
 export type { ICheckResult };
 
-// Formatters that don't require projectType to be set
-const formattersNotRequiringProjectType = ['npmextra', 'prettier', 'cleanup', 'packagejson'];
-
 /**
  * Run a single formatter by name (for use by other modules)
  */
@@ -232,29 +186,14 @@ export const runFormatter = async (
   formatterName: string,
   options: {
     silent?: boolean;
-    checkOnly?: boolean;    // Only check for diffs, don't apply
-    showDiff?: boolean;     // Show the diff output
+    checkOnly?: boolean;
+    showDiff?: boolean;
   } = {}
 ): Promise<ICheckResult | void> => {
-  // Determine if this formatter requires projectType
   const requireProjectType = !formattersNotRequiringProjectType.includes(formatterName);
   const project = await Project.fromCwd({ requireProjectType });
   const context = new FormatContext();
 
-  // Map formatter names to classes
-  const formatterMap: Record<string, new (ctx: FormatContext, proj: Project) => BaseFormatter> = {
-    cleanup: CleanupFormatter,
-    npmextra: NpmextraFormatter,
-    license: LicenseFormatter,
-    packagejson: PackageJsonFormatter,
-    templates: TemplatesFormatter,
-    gitignore: GitignoreFormatter,
-    tsconfig: TsconfigFormatter,
-    prettier: PrettierFormatter,
-    readme: ReadmeFormatter,
-    copy: CopyFormatter,
-  };
-
   const FormatterClass = formatterMap[formatterName];
   if (!FormatterClass) {
     throw new Error(`Unknown formatter: ${formatterName}`);
@@ -262,7 +201,6 @@ export const runFormatter = async (
 
   const formatter = new FormatterClass(context, project);
 
-  // Check-only mode: just check for diffs and optionally display them
   if (options.checkOnly) {
     const result = await formatter.check();
     if (result.hasDiff && options.showDiff) {
@@ -271,7 +209,6 @@ export const runFormatter = async (
     return result;
   }
 
-  // Normal mode: analyze and apply changes
   const changes = await formatter.analyze();
 
   for (const change of changes) {

package/ts/mod_format/interfaces.format.ts

@@ -1,31 +1,15 @@
-export type IFormatOperation = {
-  id: string;
-  timestamp: number;
-  files: Array<{
-    path: string;
-    originalContent: string;
-    checksum: string;
-    permissions: string;
-  }>;
-  status: 'pending' | 'in-progress' | 'completed' | 'failed' | 'rolled-back';
-  error?: Error;
-};
-
 export type IFormatPlan = {
   summary: {
     totalFiles: number;
     filesAdded: number;
     filesModified: number;
     filesRemoved: number;
-    estimatedTime: number;
   };
   changes: Array<{
     type: 'create' | 'modify' | 'delete';
     path: string;
     module: string;
     description: string;
-    diff?: string;
-    size?: number;
   }>;
   warnings: Array<{
     level: 'info' | 'warning' | 'error';
@@ -40,9 +24,6 @@ export type IPlannedChange = {
   module: string;
   description: string;
   content?: string; // New content for create/modify operations
-  originalContent?: string; // Original content for comparison
-  diff?: string;
-  size?: number;
 };
 
 export interface ICheckResult {
@@ -54,3 +35,19 @@ export interface ICheckResult {
     after?: string;
   }>;
 }
+
+export function getModuleIcon(module: string): string {
+  const icons: Record<string, string> = {
+    packagejson: '📦',
+    license: '📝',
+    tsconfig: '🔧',
+    cleanup: '🚮',
+    gitignore: '🔒',
+    prettier: '✨',
+    readme: '📖',
+    templates: '📄',
+    smartconfig: '⚙️',
+    copy: '📋',
+  };
+  return icons[module] || '📁';
+}

package/ts/mod_format/mod.plugins.ts

@@ -1,31 +1,21 @@
 export * from '../plugins.js';
 
-import * as crypto from 'crypto';
 import * as path from 'path';
-import * as lik from '@push.rocks/lik';
 import * as smartfile from '@push.rocks/smartfile';
-import * as smartgulp from '@push.rocks/smartgulp';
 import * as smartinteract from '@push.rocks/smartinteract';
 import * as smartlegal from '@push.rocks/smartlegal';
 import * as smartobject from '@push.rocks/smartobject';
 import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartstream from '@push.rocks/smartstream';
-import * as through2 from 'through2';
-import * as npmextra from '@push.rocks/npmextra';
+import * as smartconfig from '@push.rocks/smartconfig';
 import * as smartdiff from '@push.rocks/smartdiff';
 
 export {
-  crypto,
   path,
-  lik,
   smartfile,
-  smartgulp,
   smartinteract,
   smartlegal,
   smartobject,
   smartnpm,
-  smartstream,
-  through2,
-  npmextra,
+  smartconfig,
   smartdiff,
 };

package/ts/mod_services/classes.globalregistry.ts

@@ -26,11 +26,11 @@ export interface IGlobalRegistryData {
 
 export class GlobalRegistry {
   private static instance: GlobalRegistry | null = null;
-  private kvStore: plugins.npmextra.KeyValueStore<IGlobalRegistryData>;
+  private kvStore: plugins.smartconfig.KeyValueStore<IGlobalRegistryData>;
   private docker: DockerContainer;
 
   private constructor() {
-    this.kvStore = new plugins.npmextra.KeyValueStore({
+    this.kvStore = new plugins.smartconfig.KeyValueStore({
       typeArg: 'userHomeDir',
       identityArg: 'gitzone-services',
     });

package/ts/mod_services/classes.servicemanager.ts

@@ -31,7 +31,7 @@ export class ServiceManager {
     await this.config.loadOrCreate();
     logger.log('info', `📋 Project: ${this.config.getConfig().PROJECT_NAME}`);
 
-    // Load service selection from npmextra.json
+    // Load service selection from .smartconfig.json
     await this.loadServiceConfiguration();
 
     // Validate and update ports if needed
@@ -39,11 +39,11 @@ export class ServiceManager {
   }
 
   /**
-   * Load service configuration from npmextra.json
+   * Load service configuration from .smartconfig.json
    */
   private async loadServiceConfiguration(): Promise<void> {
-    const npmextraConfig = new plugins.npmextra.Npmextra(process.cwd());
-    const gitzoneConfig = npmextraConfig.dataFor<any>('@git.zone/cli', {});
+    const smartconfigInstance = new plugins.smartconfig.Smartconfig(process.cwd());
+    const gitzoneConfig = smartconfigInstance.dataFor<any>('@git.zone/cli', {});
 
     // Check if services array exists
     if (!gitzoneConfig.services || !Array.isArray(gitzoneConfig.services) || gitzoneConfig.services.length === 0) {
@@ -63,7 +63,7 @@ export class ServiceManager {
 
       this.enabledServices = response.value || ['mongodb', 'minio', 'elasticsearch'];
 
-      // Save to npmextra.json
+      // Save to .smartconfig.json
       await this.saveServiceConfiguration(this.enabledServices);
     } else {
       this.enabledServices = gitzoneConfig.services;
@@ -72,31 +72,31 @@ export class ServiceManager {
   }
 
   /**
-   * Save service configuration to npmextra.json
+   * Save service configuration to .smartconfig.json
    */
   private async saveServiceConfiguration(services: string[]): Promise<void> {
-    const npmextraPath = plugins.path.join(process.cwd(), 'npmextra.json');
-    let npmextraData: any = {};
+    const smartconfigPath = plugins.path.join(process.cwd(), '.smartconfig.json');
+    let smartconfigData: any = {};
 
-    // Read existing npmextra.json if it exists
-    if (await plugins.smartfs.file(npmextraPath).exists()) {
-      const content = await plugins.smartfs.file(npmextraPath).encoding('utf8').read();
-      npmextraData = JSON.parse(content as string);
+    // Read existing .smartconfig.json if it exists
+    if (await plugins.smartfs.file(smartconfigPath).exists()) {
+      const content = await plugins.smartfs.file(smartconfigPath).encoding('utf8').read();
+      smartconfigData = JSON.parse(content as string);
     }
 
     // Update @git.zone/cli.services
-    if (!npmextraData['@git.zone/cli']) {
-      npmextraData['@git.zone/cli'] = {};
+    if (!smartconfigData['@git.zone/cli']) {
+      smartconfigData['@git.zone/cli'] = {};
     }
-    npmextraData['@git.zone/cli'].services = services;
+    smartconfigData['@git.zone/cli'].services = services;
 
-    // Write back to npmextra.json
+    // Write back to .smartconfig.json
     await plugins.smartfs
-      .file(npmextraPath)
+      .file(smartconfigPath)
       .encoding('utf8')
-      .write(JSON.stringify(npmextraData, null, 2));
+      .write(JSON.stringify(smartconfigData, null, 2));
 
-    logger.log('ok', `✅ Saved service configuration to npmextra.json`);
+    logger.log('ok', `✅ Saved service configuration to .smartconfig.json`);
     logger.log('info', `🔧 Enabled services: ${services.join(', ')}`);
   }
 
@@ -904,7 +904,7 @@ export class ServiceManager {
 
     this.enabledServices = response.value || ['mongodb', 'minio', 'elasticsearch'];
 
-    // Save to npmextra.json
+    // Save to .smartconfig.json
     await this.saveServiceConfiguration(this.enabledServices);
 
     logger.log('ok', '✅ Service configuration updated');

package/ts/plugins.ts

@@ -1,6 +1,6 @@
 import * as smartlog from '@push.rocks/smartlog';
 import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
-import * as npmextra from '@push.rocks/npmextra';
+import * as smartconfig from '@push.rocks/smartconfig';
 import * as path from 'path';
 import * as projectinfo from '@push.rocks/projectinfo';
 import * as smartcli from '@push.rocks/smartcli';
@@ -20,7 +20,7 @@ export const smartfs = new SmartFs(new SmartFsProviderNode());
 export {
   smartlog,
   smartlogDestinationLocal,
-  npmextra,
+  smartconfig,
   path,
   projectinfo,
   smartcli,

package/dist_ts/mod_format/classes.changecache.d.ts

@@ -1,26 +0,0 @@
-export interface IFileCache {
-    path: string;
-    checksum: string;
-    modified: number;
-    size: number;
-}
-export interface ICacheManifest {
-    version: string;
-    lastFormat: number;
-    files: IFileCache[];
-}
-export declare class ChangeCache {
-    private cacheDir;
-    private manifestPath;
-    private cacheVersion;
-    constructor();
-    initialize(): Promise<void>;
-    getManifest(): Promise<ICacheManifest>;
-    saveManifest(manifest: ICacheManifest): Promise<void>;
-    hasFileChanged(filePath: string): Promise<boolean>;
-    updateFileCache(filePath: string): Promise<void>;
-    getChangedFiles(filePaths: string[]): Promise<string[]>;
-    clean(): Promise<void>;
-    private calculateChecksum;
-    private isValidManifest;
-}