@memberjunction/metadata-sync 2.56.0 → 2.58.0

package/dist/lib/transaction-manager.js

@@ -26,15 +26,10 @@ class TransactionManager {
         if (!provider) {
             throw new Error('No data provider available');
         }
-        // Check if provider supports transactions
-        if (typeof provider.beginTransaction !== 'function') {
-            // Provider doesn't support transactions, operate without them
-            return;
-        }
+        // Check if provider supports transactions (PascalCase method names)
         try {
-            await provider.beginTransaction(options?.isolationLevel);
+            await provider.BeginTransaction();
             this.inTransaction = true;
-            this.sqlLogger?.logTransaction('BEGIN');
         }
         catch (error) {
             throw new Error(`Failed to begin transaction: ${error instanceof Error ? error.message : String(error)}`);
@@ -51,15 +46,9 @@ class TransactionManager {
         if (!provider) {
             throw new Error('No data provider available');
         }
-        // Check if provider supports transactions
-        if (typeof provider.commitTransaction !== 'function') {
-            this.inTransaction = false;
-            return;
-        }
         try {
-            await provider.commitTransaction();
+            await provider.CommitTransaction();
             this.inTransaction = false;
-            this.sqlLogger?.logTransaction('COMMIT');
         }
         catch (error) {
             throw new Error(`Failed to commit transaction: ${error instanceof Error ? error.message : String(error)}`);
@@ -76,15 +65,9 @@ class TransactionManager {
         if (!provider) {
             throw new Error('No data provider available');
         }
-        // Check if provider supports transactions
-        if (typeof provider.rollbackTransaction !== 'function') {
-            this.inTransaction = false;
-            return;
-        }
         try {
-            await provider.rollbackTransaction();
+            await provider.RollbackTransaction();
             this.inTransaction = false;
-            this.sqlLogger?.logTransaction('ROLLBACK');
         }
         catch (error) {
             // Log but don't throw - we're already in an error state

package/dist/lib/transaction-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../../src/lib/transaction-manager.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @fileoverview Transaction Manager for atomic database operations\n * @module transaction-manager\n * \n * This module provides transaction support for push operations to ensure\n * all related entities are saved atomically with rollback capability.\n */\n\nimport { getDataProvider } from './provider-utils';\nimport { SQLLogger } from './sql-logger';\n\nexport interface TransactionOptions {\n  isolationLevel?: 'READ_UNCOMMITTED' | 'READ_COMMITTED' | 'REPEATABLE_READ' | 'SERIALIZABLE';\n}\n\nexport class TransactionManager {\n  private inTransaction = false;\n  private sqlLogger?: SQLLogger;\n  \n  constructor(sqlLogger?: SQLLogger) {\n    this.sqlLogger = sqlLogger;\n  }\n  \n  /**\n   * Begin a new transaction\n   */\n  async beginTransaction(options?: TransactionOptions): Promise<void> {\n    if (this.inTransaction) {\n      throw new Error('Transaction already in progress');\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    // Check if provider supports transactions\n    if (typeof (provider as any).beginTransaction !== 'function') {\n      // Provider doesn't support transactions, operate without them\n      return;\n    }\n    \n    try {\n      await (provider as any).beginTransaction(options?.isolationLevel);\n      this.inTransaction = true;\n      this.sqlLogger?.logTransaction('BEGIN');\n    } catch (error) {\n      throw new Error(`Failed to begin transaction: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n  \n  /**\n   * Commit the current transaction\n   */\n  async commitTransaction(): Promise<void> {\n    if (!this.inTransaction) {\n      return; // No transaction to commit\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    // Check if provider supports transactions\n    if (typeof (provider as any).commitTransaction !== 'function') {\n      this.inTransaction = false;\n      return;\n    }\n    \n    try {\n      await (provider as any).commitTransaction();\n      this.inTransaction = false;\n      this.sqlLogger?.logTransaction('COMMIT');\n    } catch (error) {\n      throw new Error(`Failed to commit transaction: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n  \n  /**\n   * Rollback the current transaction\n   */\n  async rollbackTransaction(): Promise<void> {\n    if (!this.inTransaction) {\n      return; // No transaction to rollback\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    // Check if provider supports transactions\n    if (typeof (provider as any).rollbackTransaction !== 'function') {\n      this.inTransaction = false;\n      return;\n    }\n    \n    try {\n      await (provider as any).rollbackTransaction();\n      this.inTransaction = false;\n      this.sqlLogger?.logTransaction('ROLLBACK');\n    } catch (error) {\n      // Log but don't throw - we're already in an error state\n      console.error('Failed to rollback transaction:', error);\n    }\n  }\n  \n  /**\n   * Execute a function within a transaction\n   */\n  async executeInTransaction<T>(\n    fn: () => Promise<T>,\n    options?: TransactionOptions\n  ): Promise<T> {\n    await this.beginTransaction(options);\n    \n    try {\n      const result = await fn();\n      await this.commitTransaction();\n      return result;\n    } catch (error) {\n      await this.rollbackTransaction();\n      throw error;\n    }\n  }\n  \n  /**\n   * Check if currently in a transaction\n   */\n  get isInTransaction(): boolean {\n    return this.inTransaction;\n  }\n}"]}
+{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../../src/lib/transaction-manager.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @fileoverview Transaction Manager for atomic database operations\n * @module transaction-manager\n * \n * This module provides transaction support for push operations to ensure\n * all related entities are saved atomically with rollback capability.\n */\n\nimport { getDataProvider } from './provider-utils';\nimport { SQLLogger } from './sql-logger';\n\nexport interface TransactionOptions {\n}\n\nexport class TransactionManager {\n  private inTransaction = false;\n  private sqlLogger?: SQLLogger;\n  \n  constructor(sqlLogger?: SQLLogger) {\n    this.sqlLogger = sqlLogger;\n  }\n  \n  /**\n   * Begin a new transaction\n   */\n  async beginTransaction(options?: TransactionOptions): Promise<void> {\n    if (this.inTransaction) {\n      throw new Error('Transaction already in progress');\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    // Check if provider supports transactions (PascalCase method names)\n    try {\n      await provider.BeginTransaction();\n      this.inTransaction = true;\n    } catch (error) {\n      throw new Error(`Failed to begin transaction: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n  \n  /**\n   * Commit the current transaction\n   */\n  async commitTransaction(): Promise<void> {\n    if (!this.inTransaction) {\n      return; // No transaction to commit\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    try {\n      await provider.CommitTransaction();\n      this.inTransaction = false;\n    } catch (error) {\n      throw new Error(`Failed to commit transaction: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n  \n  /**\n   * Rollback the current transaction\n   */\n  async rollbackTransaction(): Promise<void> {\n    if (!this.inTransaction) {\n      return; // No transaction to rollback\n    }\n    \n    const provider = getDataProvider();\n    if (!provider) {\n      throw new Error('No data provider available');\n    }\n    \n    try {\n      await provider.RollbackTransaction();\n      this.inTransaction = false;\n    } catch (error) {\n      // Log but don't throw - we're already in an error state\n      console.error('Failed to rollback transaction:', error);\n    }\n  }\n  \n  /**\n   * Execute a function within a transaction\n   */\n  async executeInTransaction<T>(\n    fn: () => Promise<T>,\n    options?: TransactionOptions\n  ): Promise<T> {\n    await this.beginTransaction(options);\n    \n    try {\n      const result = await fn();\n      await this.commitTransaction();\n      return result;\n    } catch (error) {\n      await this.rollbackTransaction();\n      throw error;\n    }\n  }\n  \n  /**\n   * Check if currently in a transaction\n   */\n  get isInTransaction(): boolean {\n    return this.inTransaction;\n  }\n}"]}

package/dist/services/FileResetService.js

@@ -23,6 +23,7 @@ class FileResetService {
         const files = await (0, fast_glob_1.default)(pattern, {
             cwd: config_manager_1.configManager.getOriginalCwd(),
             absolute: true,
+            dot: true,
             ignore: ['.mj-sync.json', '.mj-folder.json'],
         });
         if (files.length === 0) {

package/dist/services/FileResetService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileResetService.js","sourceRoot":"","sources":["../../src/services/FileResetService.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs-extra';\nimport path from 'path';\nimport fastGlob from 'fast-glob';\nimport { loadSyncConfig } from '../config';\nimport { configManager } from '../lib/config-manager';\n\nexport interface FileResetOptions {\n  sections?: 'both' | 'primaryKey' | 'sync';\n  dryRun?: boolean;\n  noBackup?: boolean;\n  verbose?: boolean;\n}\n\nexport interface FileResetCallbacks {\n  onProgress?: (message: string) => void;\n  onLog?: (message: string) => void;\n  onWarn?: (message: string) => void;\n  onConfirm?: (message: string) => Promise<boolean>;\n}\n\nexport interface FileResetResult {\n  processedFiles: number;\n  modifiedFiles: number;\n  totalPrimaryKeys: number;\n  totalSyncs: number;\n  filesWithPrimaryKey: number;\n  filesWithSync: number;\n  backupsCreated: number;\n}\n\nexport interface FileStats {\n  primaryKeyCount: number;\n  syncCount: number;\n}\n\nexport class FileResetService {\n  \n  async resetFiles(options: FileResetOptions = {}, callbacks?: FileResetCallbacks): Promise<FileResetResult> {\n    const sections = options.sections || 'both';\n    \n    // Load sync config\n    const syncConfig = await loadSyncConfig(configManager.getOriginalCwd());\n    if (!syncConfig) {\n      throw new Error('No .mj-sync.json found in current directory');\n    }\n    \n    // Find all metadata JSON files\n    callbacks?.onProgress?.('Finding metadata files');\n    const pattern = syncConfig.filePattern || '.*.json';\n    const files = await fastGlob(pattern, {\n      cwd: configManager.getOriginalCwd(),\n      absolute: true,\n      ignore: ['.mj-sync.json', '.mj-folder.json'],\n    });\n    \n    if (files.length === 0) {\n      callbacks?.onLog?.('No metadata files found');\n      return {\n        processedFiles: 0,\n        modifiedFiles: 0,\n        totalPrimaryKeys: 0,\n        totalSyncs: 0,\n        filesWithPrimaryKey: 0,\n        filesWithSync: 0,\n        backupsCreated: 0\n      };\n    }\n    \n    callbacks?.onLog?.(`Found ${files.length} metadata file${files.length === 1 ? '' : 's'}`);\n    \n    // Count what will be removed\n    let filesWithPrimaryKey = 0;\n    let filesWithSync = 0;\n    let totalPrimaryKeys = 0;\n    let totalSyncs = 0;\n    \n    for (const file of files) {\n      const content = await fs.readJson(file);\n      const stats = this.countSections(content);\n      if (stats.primaryKeyCount > 0) {\n        filesWithPrimaryKey++;\n        totalPrimaryKeys += stats.primaryKeyCount;\n      }\n      if (stats.syncCount > 0) {\n        filesWithSync++;\n        totalSyncs += stats.syncCount;\n      }\n    }\n    \n    // Report what will be removed\n    if (sections === 'both' || sections === 'primaryKey') {\n      callbacks?.onLog?.(`Will remove ${totalPrimaryKeys} primaryKey section${totalPrimaryKeys === 1 ? '' : 's'} from ${filesWithPrimaryKey} file${filesWithPrimaryKey === 1 ? '' : 's'}`);\n    }\n    if (sections === 'both' || sections === 'sync') {\n      callbacks?.onLog?.(`Will remove ${totalSyncs} sync section${totalSyncs === 1 ? '' : 's'} from ${filesWithSync} file${filesWithSync === 1 ? '' : 's'}`);\n    }\n    \n    if (options.dryRun) {\n      callbacks?.onLog?.('Dry run mode - no files will be modified');\n      \n      if (options.verbose) {\n        for (const file of files) {\n          const content = await fs.readJson(file);\n          const stats = this.countSections(content);\n          if (stats.primaryKeyCount > 0 || stats.syncCount > 0) {\n            callbacks?.onLog?.(`${path.relative(configManager.getOriginalCwd(), file)}:`);\n            if (stats.primaryKeyCount > 0) {\n              callbacks?.onLog?.(`  - ${stats.primaryKeyCount} primaryKey section${stats.primaryKeyCount === 1 ? '' : 's'}`);\n            }\n            if (stats.syncCount > 0) {\n              callbacks?.onLog?.(`  - ${stats.syncCount} sync section${stats.syncCount === 1 ? '' : 's'}`);\n            }\n          }\n        }\n      }\n      \n      return {\n        processedFiles: files.length,\n        modifiedFiles: 0,\n        totalPrimaryKeys,\n        totalSyncs,\n        filesWithPrimaryKey,\n        filesWithSync,\n        backupsCreated: 0\n      };\n    }\n    \n    // Process files\n    callbacks?.onProgress?.('Processing files');\n    let processedFiles = 0;\n    let modifiedFiles = 0;\n    let backupsCreated = 0;\n    \n    for (const file of files) {\n      processedFiles++;\n      const content = await fs.readJson(file);\n      const originalContent = JSON.stringify(content);\n      \n      // Remove sections\n      const cleanedContent = this.removeSections(content, sections);\n      \n      // Only write if content changed\n      if (JSON.stringify(cleanedContent) !== originalContent) {\n        // Create backup if requested\n        if (!options.noBackup) {\n          const backupPath = `${file}.backup`;\n          await fs.writeJson(backupPath, content, { spaces: 2 });\n          backupsCreated++;\n        }\n        \n        // Write cleaned content\n        await fs.writeJson(file, cleanedContent, { spaces: 2 });\n        modifiedFiles++;\n        \n        if (options.verbose) {\n          callbacks?.onLog?.(`✓ ${path.relative(configManager.getOriginalCwd(), file)}`);\n        }\n      }\n    }\n    \n    return {\n      processedFiles,\n      modifiedFiles,\n      totalPrimaryKeys,\n      totalSyncs,\n      filesWithPrimaryKey,\n      filesWithSync,\n      backupsCreated\n    };\n  }\n  \n  private countSections(data: any): FileStats {\n    let primaryKeyCount = 0;\n    let syncCount = 0;\n    \n    if (Array.isArray(data)) {\n      for (const item of data) {\n        const stats = this.countSections(item);\n        primaryKeyCount += stats.primaryKeyCount;\n        syncCount += stats.syncCount;\n      }\n    } else if (data && typeof data === 'object') {\n      if ('primaryKey' in data) primaryKeyCount++;\n      if ('sync' in data) syncCount++;\n      \n      // Check related entities\n      if (data.relatedEntities) {\n        for (const entityData of Object.values(data.relatedEntities)) {\n          const stats = this.countSections(entityData);\n          primaryKeyCount += stats.primaryKeyCount;\n          syncCount += stats.syncCount;\n        }\n      }\n    }\n    \n    return { primaryKeyCount, syncCount };\n  }\n  \n  private removeSections(data: any, sections: string): any {\n    if (Array.isArray(data)) {\n      return data.map(item => this.removeSections(item, sections));\n    } else if (data && typeof data === 'object') {\n      const cleaned = { ...data };\n      \n      // Remove specified sections\n      if (sections === 'both' || sections === 'primaryKey') {\n        delete cleaned.primaryKey;\n      }\n      if (sections === 'both' || sections === 'sync') {\n        delete cleaned.sync;\n      }\n      \n      // Process related entities\n      if (cleaned.relatedEntities) {\n        const cleanedRelated: any = {};\n        for (const [entityName, entityData] of Object.entries(cleaned.relatedEntities)) {\n          cleanedRelated[entityName] = this.removeSections(entityData, sections);\n        }\n        cleaned.relatedEntities = cleanedRelated;\n      }\n      \n      return cleaned;\n    }\n    \n    return data;\n  }\n}"]}
+{"version":3,"file":"FileResetService.js","sourceRoot":"","sources":["../../src/services/FileResetService.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs-extra';\nimport path from 'path';\nimport fastGlob from 'fast-glob';\nimport { loadSyncConfig } from '../config';\nimport { configManager } from '../lib/config-manager';\n\nexport interface FileResetOptions {\n  sections?: 'both' | 'primaryKey' | 'sync';\n  dryRun?: boolean;\n  noBackup?: boolean;\n  verbose?: boolean;\n}\n\nexport interface FileResetCallbacks {\n  onProgress?: (message: string) => void;\n  onLog?: (message: string) => void;\n  onWarn?: (message: string) => void;\n  onConfirm?: (message: string) => Promise<boolean>;\n}\n\nexport interface FileResetResult {\n  processedFiles: number;\n  modifiedFiles: number;\n  totalPrimaryKeys: number;\n  totalSyncs: number;\n  filesWithPrimaryKey: number;\n  filesWithSync: number;\n  backupsCreated: number;\n}\n\nexport interface FileStats {\n  primaryKeyCount: number;\n  syncCount: number;\n}\n\nexport class FileResetService {\n  \n  async resetFiles(options: FileResetOptions = {}, callbacks?: FileResetCallbacks): Promise<FileResetResult> {\n    const sections = options.sections || 'both';\n    \n    // Load sync config\n    const syncConfig = await loadSyncConfig(configManager.getOriginalCwd());\n    if (!syncConfig) {\n      throw new Error('No .mj-sync.json found in current directory');\n    }\n    \n    // Find all metadata JSON files\n    callbacks?.onProgress?.('Finding metadata files');\n    const pattern = syncConfig.filePattern || '.*.json';\n    const files = await fastGlob(pattern, {\n      cwd: configManager.getOriginalCwd(),\n      absolute: true,\n      dot: true,\n      ignore: ['.mj-sync.json', '.mj-folder.json'],\n    });\n    \n    if (files.length === 0) {\n      callbacks?.onLog?.('No metadata files found');\n      return {\n        processedFiles: 0,\n        modifiedFiles: 0,\n        totalPrimaryKeys: 0,\n        totalSyncs: 0,\n        filesWithPrimaryKey: 0,\n        filesWithSync: 0,\n        backupsCreated: 0\n      };\n    }\n    \n    callbacks?.onLog?.(`Found ${files.length} metadata file${files.length === 1 ? '' : 's'}`);\n    \n    // Count what will be removed\n    let filesWithPrimaryKey = 0;\n    let filesWithSync = 0;\n    let totalPrimaryKeys = 0;\n    let totalSyncs = 0;\n    \n    for (const file of files) {\n      const content = await fs.readJson(file);\n      const stats = this.countSections(content);\n      if (stats.primaryKeyCount > 0) {\n        filesWithPrimaryKey++;\n        totalPrimaryKeys += stats.primaryKeyCount;\n      }\n      if (stats.syncCount > 0) {\n        filesWithSync++;\n        totalSyncs += stats.syncCount;\n      }\n    }\n    \n    // Report what will be removed\n    if (sections === 'both' || sections === 'primaryKey') {\n      callbacks?.onLog?.(`Will remove ${totalPrimaryKeys} primaryKey section${totalPrimaryKeys === 1 ? '' : 's'} from ${filesWithPrimaryKey} file${filesWithPrimaryKey === 1 ? '' : 's'}`);\n    }\n    if (sections === 'both' || sections === 'sync') {\n      callbacks?.onLog?.(`Will remove ${totalSyncs} sync section${totalSyncs === 1 ? '' : 's'} from ${filesWithSync} file${filesWithSync === 1 ? '' : 's'}`);\n    }\n    \n    if (options.dryRun) {\n      callbacks?.onLog?.('Dry run mode - no files will be modified');\n      \n      if (options.verbose) {\n        for (const file of files) {\n          const content = await fs.readJson(file);\n          const stats = this.countSections(content);\n          if (stats.primaryKeyCount > 0 || stats.syncCount > 0) {\n            callbacks?.onLog?.(`${path.relative(configManager.getOriginalCwd(), file)}:`);\n            if (stats.primaryKeyCount > 0) {\n              callbacks?.onLog?.(`  - ${stats.primaryKeyCount} primaryKey section${stats.primaryKeyCount === 1 ? '' : 's'}`);\n            }\n            if (stats.syncCount > 0) {\n              callbacks?.onLog?.(`  - ${stats.syncCount} sync section${stats.syncCount === 1 ? '' : 's'}`);\n            }\n          }\n        }\n      }\n      \n      return {\n        processedFiles: files.length,\n        modifiedFiles: 0,\n        totalPrimaryKeys,\n        totalSyncs,\n        filesWithPrimaryKey,\n        filesWithSync,\n        backupsCreated: 0\n      };\n    }\n    \n    // Process files\n    callbacks?.onProgress?.('Processing files');\n    let processedFiles = 0;\n    let modifiedFiles = 0;\n    let backupsCreated = 0;\n    \n    for (const file of files) {\n      processedFiles++;\n      const content = await fs.readJson(file);\n      const originalContent = JSON.stringify(content);\n      \n      // Remove sections\n      const cleanedContent = this.removeSections(content, sections);\n      \n      // Only write if content changed\n      if (JSON.stringify(cleanedContent) !== originalContent) {\n        // Create backup if requested\n        if (!options.noBackup) {\n          const backupPath = `${file}.backup`;\n          await fs.writeJson(backupPath, content, { spaces: 2 });\n          backupsCreated++;\n        }\n        \n        // Write cleaned content\n        await fs.writeJson(file, cleanedContent, { spaces: 2 });\n        modifiedFiles++;\n        \n        if (options.verbose) {\n          callbacks?.onLog?.(`✓ ${path.relative(configManager.getOriginalCwd(), file)}`);\n        }\n      }\n    }\n    \n    return {\n      processedFiles,\n      modifiedFiles,\n      totalPrimaryKeys,\n      totalSyncs,\n      filesWithPrimaryKey,\n      filesWithSync,\n      backupsCreated\n    };\n  }\n  \n  private countSections(data: any): FileStats {\n    let primaryKeyCount = 0;\n    let syncCount = 0;\n    \n    if (Array.isArray(data)) {\n      for (const item of data) {\n        const stats = this.countSections(item);\n        primaryKeyCount += stats.primaryKeyCount;\n        syncCount += stats.syncCount;\n      }\n    } else if (data && typeof data === 'object') {\n      if ('primaryKey' in data) primaryKeyCount++;\n      if ('sync' in data) syncCount++;\n      \n      // Check related entities\n      if (data.relatedEntities) {\n        for (const entityData of Object.values(data.relatedEntities)) {\n          const stats = this.countSections(entityData);\n          primaryKeyCount += stats.primaryKeyCount;\n          syncCount += stats.syncCount;\n        }\n      }\n    }\n    \n    return { primaryKeyCount, syncCount };\n  }\n  \n  private removeSections(data: any, sections: string): any {\n    if (Array.isArray(data)) {\n      return data.map(item => this.removeSections(item, sections));\n    } else if (data && typeof data === 'object') {\n      const cleaned = { ...data };\n      \n      // Remove specified sections\n      if (sections === 'both' || sections === 'primaryKey') {\n        delete cleaned.primaryKey;\n      }\n      if (sections === 'both' || sections === 'sync') {\n        delete cleaned.sync;\n      }\n      \n      // Process related entities\n      if (cleaned.relatedEntities) {\n        const cleanedRelated: any = {};\n        for (const [entityName, entityData] of Object.entries(cleaned.relatedEntities)) {\n          cleanedRelated[entityName] = this.removeSections(entityData, sections);\n        }\n        cleaned.relatedEntities = cleanedRelated;\n      }\n      \n      return cleaned;\n    }\n    \n    return data;\n  }\n}"]}

package/dist/services/PushService.d.ts

@@ -41,5 +41,7 @@ export declare class PushService {
     private processRelatedEntities;
     private isValidRecordData;
     private getRecordKey;
+    private formatFieldValue;
     private findEntityDirectories;
+    private findEntityDirectoriesRecursive;
 }

package/dist/services/PushService.js

@@ -28,19 +28,62 @@ class PushService {
         this.processedRecords.clear();
         const fileBackupManager = new file_backup_manager_1.FileBackupManager();
         // Load sync config for SQL logging settings and autoCreateMissingRecords flag
-        this.syncConfig = await (0, config_1.loadSyncConfig)(config_manager_1.configManager.getOriginalCwd());
+        // If dir option is specified, load from that directory, otherwise use original CWD
+        const configDir = options.dir ? path_1.default.resolve(config_manager_1.configManager.getOriginalCwd(), options.dir) : config_manager_1.configManager.getOriginalCwd();
+        this.syncConfig = await (0, config_1.loadSyncConfig)(configDir);
+        if (options.verbose) {
+            callbacks?.onLog?.(`Original working directory: ${config_manager_1.configManager.getOriginalCwd()}`);
+            callbacks?.onLog?.(`Config directory (with dir option): ${configDir}`);
+            callbacks?.onLog?.(`Config file path: ${path_1.default.join(configDir, '.mj-sync.json')}`);
+            callbacks?.onLog?.(`Full sync config loaded: ${JSON.stringify(this.syncConfig, null, 2)}`);
+            callbacks?.onLog?.(`SQL logging config: ${JSON.stringify(this.syncConfig?.sqlLogging)}`);
+        }
         const sqlLogger = new sql_logger_1.SQLLogger(this.syncConfig);
         const transactionManager = new transaction_manager_1.TransactionManager(sqlLogger);
+        if (options.verbose) {
+            callbacks?.onLog?.(`SQLLogger enabled status: ${sqlLogger.enabled}`);
+        }
+        // Setup SQL logging session with the provider if enabled
+        let sqlLoggingSession = null;
         try {
-            // Initialize SQL logger if enabled
+            // Initialize SQL logger if enabled and not dry-run
             if (sqlLogger.enabled && !options.dryRun) {
-                await sqlLogger.initialize();
+                const provider = core_1.Metadata.Provider;
                 if (options.verbose) {
-                    callbacks?.onLog?.('📝 SQL logging enabled');
+                    callbacks?.onLog?.(`SQL logging enabled: ${sqlLogger.enabled}`);
+                    callbacks?.onLog?.(`Provider type: ${provider?.constructor?.name || 'Unknown'}`);
+                    callbacks?.onLog?.(`Has CreateSqlLogger: ${typeof provider?.CreateSqlLogger === 'function'}`);
+                }
+                if (provider && typeof provider.CreateSqlLogger === 'function') {
+                    // Generate filename with timestamp
+                    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+                    const filename = this.syncConfig.sqlLogging?.formatAsMigration
+                        ? `MetadataSync_Push_${timestamp}.sql`
+                        : `push_${timestamp}.sql`;
+                    // Use .sql-log-push directory in the config directory (where sync was initiated)
+                    const outputDir = path_1.default.join(configDir, this.syncConfig?.sqlLogging?.outputDirectory || './sql-log-push');
+                    const filepath = path_1.default.join(outputDir, filename);
+                    // Ensure the directory exists
+                    await fs_extra_1.default.ensureDir(path_1.default.dirname(filepath));
+                    // Create the SQL logging session
+                    sqlLoggingSession = await provider.CreateSqlLogger(filepath, {
+                        formatAsMigration: this.syncConfig.sqlLogging?.formatAsMigration || false,
+                        description: 'MetadataSync push operation',
+                        statementTypes: "mutations",
+                        prettyPrint: true,
+                    });
+                    if (options.verbose) {
+                        callbacks?.onLog?.(`📝 SQL logging enabled: ${filepath}`);
+                    }
+                }
+                else {
+                    if (options.verbose) {
+                        callbacks?.onWarn?.('SQL logging requested but provider does not support it');
+                    }
                 }
             }
             // Find entity directories to process
-            const entityDirs = this.findEntityDirectories(config_manager_1.configManager.getOriginalCwd(), options.dir);
+            const entityDirs = this.findEntityDirectories(configDir);
             if (entityDirs.length === 0) {
                 throw new Error('No entity directories found');
             }
@@ -119,11 +162,12 @@ class PushService {
                     callbacks?.onLog?.('✅ File backups committed');
                 }
             }
-            // Write SQL log if enabled
+            // Close SQL logging session if it was created
             let sqlLogPath;
-            if (sqlLogger.enabled && !options.dryRun) {
-                sqlLogPath = await sqlLogger.writeLog();
-                if (sqlLogPath && options.verbose) {
+            if (sqlLoggingSession) {
+                sqlLogPath = sqlLoggingSession.filePath;
+                await sqlLoggingSession.dispose();
+                if (options.verbose) {
                     callbacks?.onLog?.(`📝 SQL log written to: ${sqlLogPath}`);
                 }
             }
@@ -147,6 +191,15 @@ class PushService {
                     callbacks?.onWarn?.(`Failed to rollback file backups: ${rollbackError}`);
                 }
             }
+            // Close SQL logging session on error
+            if (sqlLoggingSession) {
+                try {
+                    await sqlLoggingSession.dispose();
+                }
+                catch (disposeError) {
+                    callbacks?.onWarn?.(`Failed to close SQL logging session: ${disposeError}`);
+                }
+            }
             throw error;
         }
     }
@@ -161,6 +214,7 @@ class PushService {
             cwd: entityDir,
             absolute: true,
             onlyFiles: true,
+            dot: true,
             ignore: ['**/node_modules/**', '**/.mj-*.json']
         });
         if (options.verbose) {
@@ -169,37 +223,59 @@ class PushService {
         // Process each file
         for (const filePath of files) {
             try {
+                // Backup the file before any modifications (unless dry-run)
+                if (!options.dryRun) {
+                    await fileBackupManager.backupFile(filePath);
+                }
                 const fileData = await fs_extra_1.default.readJson(filePath);
                 const records = Array.isArray(fileData) ? fileData : [fileData];
+                const isArray = Array.isArray(fileData);
                 for (let i = 0; i < records.length; i++) {
                     const recordData = records[i];
                     if (!this.isValidRecordData(recordData)) {
-                        callbacks?.onWarn?.(`Invalid record format in ${filePath}${Array.isArray(fileData) ? ` at index ${i}` : ''}`);
+                        callbacks?.onWarn?.(`Invalid record format in ${filePath}${isArray ? ` at index ${i}` : ''}`);
                         errors++;
                         continue;
                     }
                     try {
-                        const result = await this.processRecord(recordData, entityConfig, entityDir, options, callbacks);
+                        // For arrays, work with a deep copy to avoid modifying the original
+                        const recordToProcess = isArray ? JSON.parse(JSON.stringify(recordData)) : recordData;
+                        const result = await this.processRecord(recordToProcess, entityConfig, entityDir, options, callbacks, filePath, isArray ? i : undefined);
                         if (result === 'created')
                             created++;
                         else if (result === 'updated')
                             updated++;
                         else if (result === 'unchanged')
                             unchanged++;
+                        // For arrays, update the original record's primaryKey and sync only
+                        if (isArray) {
+                            // Update primaryKey if it exists (for new records)
+                            if (recordToProcess.primaryKey) {
+                                records[i].primaryKey = recordToProcess.primaryKey;
+                            }
+                            // Update sync metadata only if it was updated (dirty records only)
+                            if (recordToProcess.sync) {
+                                records[i].sync = recordToProcess.sync;
+                            }
+                        }
                         // Track processed record
                         const recordKey = this.getRecordKey(recordData, entityConfig.entity);
                         this.processedRecords.set(recordKey, {
                             filePath,
-                            arrayIndex: Array.isArray(fileData) ? i : undefined,
+                            arrayIndex: isArray ? i : undefined,
                             lineNumber: i + 1 // Simple line number approximation
                         });
                     }
                     catch (recordError) {
-                        const errorMsg = `Error processing record in ${filePath}${Array.isArray(fileData) ? ` at index ${i}` : ''}: ${recordError}`;
+                        const errorMsg = `Error processing record in ${filePath}${isArray ? ` at index ${i}` : ''}: ${recordError}`;
                         callbacks?.onError?.(errorMsg);
                         errors++;
                     }
                 }
+                // Write back the entire file if it's an array (after processing all records)
+                if (isArray && !options.dryRun) {
+                    await fs_extra_1.default.writeJson(filePath, records, { spaces: 2 });
+                }
             }
             catch (fileError) {
                 const errorMsg = `Error reading file ${filePath}: ${fileError}`;
@@ -209,12 +285,8 @@ class PushService {
         }
         return { created, updated, unchanged, errors };
     }
-    async processRecord(recordData, entityConfig, entityDir, options, callbacks) {
+    async processRecord(recordData, entityConfig, entityDir, options, callbacks, filePath, arrayIndex) {
         const metadata = new core_1.Metadata();
-        const entityInfo = metadata.EntityByName(entityConfig.entity);
-        if (!entityInfo) {
-            throw new Error(`Entity ${entityConfig.entity} not found in metadata`);
-        }
         // Get or create entity instance
         let entity = await metadata.GetEntityObject(entityConfig.entity, this.contextUser);
         if (!entity) {
@@ -222,12 +294,13 @@ class PushService {
         }
         // Apply defaults from configuration
         const defaults = { ...entityConfig.defaults };
-        // Build full record data
+        // Build full record data - keep original values for file writing
+        const originalFields = { ...recordData.fields };
         const fullData = {
             ...defaults,
             ...recordData.fields
         };
-        // Process field values
+        // Process field values for database operations
         const processedData = {};
         for (const [fieldName, fieldValue] of Object.entries(fullData)) {
             const processedValue = await this.syncEngine.processFieldValue(fieldValue, entityDir, null, // parentRecord
@@ -238,29 +311,26 @@ class PushService {
         // Check if record exists
         const primaryKey = recordData.primaryKey;
         let exists = false;
-        let existingEntity = null;
+        let isNew = false;
         if (primaryKey && Object.keys(primaryKey).length > 0) {
             // Try to load existing record
             const compositeKey = new core_1.CompositeKey();
             compositeKey.LoadFromSimpleObject(primaryKey);
-            existingEntity = await metadata.GetEntityObject(entityConfig.entity, this.contextUser);
-            if (existingEntity) {
-                exists = await existingEntity.InnerLoad(compositeKey);
-                // Check autoCreateMissingRecords flag if record not found
-                if (!exists) {
-                    const autoCreate = this.syncConfig?.push?.autoCreateMissingRecords ?? false;
-                    const pkDisplay = Object.entries(primaryKey)
-                        .map(([key, value]) => `${key}=${value}`)
-                        .join(', ');
-                    if (!autoCreate) {
-                        const warning = `Record not found: ${entityConfig.entity} with primaryKey {${pkDisplay}}. To auto-create missing records, set push.autoCreateMissingRecords=true in .mj-sync.json`;
-                        this.warnings.push(warning);
-                        callbacks?.onWarn?.(warning);
-                        return 'error';
-                    }
-                    else if (options.verbose) {
-                        callbacks?.onLog?.(`Auto-creating missing ${entityConfig.entity} record with primaryKey {${pkDisplay}}`);
-                    }
+            exists = await entity.InnerLoad(compositeKey);
+            // Check autoCreateMissingRecords flag if record not found
+            if (!exists) {
+                const autoCreate = this.syncConfig?.push?.autoCreateMissingRecords ?? false;
+                const pkDisplay = Object.entries(primaryKey)
+                    .map(([key, value]) => `${key}=${value}`)
+                    .join(', ');
+                if (!autoCreate) {
+                    const warning = `Record not found: ${entityConfig.entity} with primaryKey {${pkDisplay}}. To auto-create missing records, set push.autoCreateMissingRecords=true in .mj-sync.json`;
+                    this.warnings.push(warning);
+                    callbacks?.onWarn?.(warning);
+                    return 'error';
+                }
+                else if (options.verbose) {
+                    callbacks?.onLog?.(`Auto-creating missing ${entityConfig.entity} record with primaryKey {${pkDisplay}}`);
                 }
             }
         }
@@ -274,11 +344,11 @@ class PushService {
                 return 'created';
             }
         }
-        // Use existing entity if found, otherwise create new one
         if (!exists) {
-            entity = existingEntity || entity;
-            entity.NewRecord();
-            // Set primary key values for new records if provided
+            entity.NewRecord(); // make sure our record starts out fresh
+            isNew = true;
+            // UUID generation now happens automatically in BaseEntity.NewRecord()
+            // Set primary key values for new records if provided, this is important for the auto-create logic
             if (primaryKey) {
                 for (const [pkField, pkValue] of Object.entries(primaryKey)) {
                     entity.Set(pkField, pkValue);
@@ -294,18 +364,87 @@ class PushService {
             // Store related entities to process after parent save
             entity.__pendingRelatedEntities = recordData.relatedEntities;
         }
-        // Save the record
-        // TODO: Hook into BaseEntity SQL execution for SQL logging
-        // Currently SQL logging requires deeper integration with MJ core
+        // Check if the record is actually dirty before considering it changed
+        let isDirty = entity.Dirty;
+        // Also check if file content has changed (for @file references)
+        if (!isDirty && !isNew && recordData.sync) {
+            const currentChecksum = await this.syncEngine.calculateChecksumWithFileContent(originalFields, entityDir);
+            if (currentChecksum !== recordData.sync.checksum) {
+                isDirty = true;
+                if (options.verbose) {
+                    callbacks?.onLog?.(`📄 File content changed for ${entityConfig.entity} record (checksum mismatch)`);
+                }
+            }
+        }
+        // If updating an existing record that's dirty, show what changed
+        if (!isNew && isDirty) {
+            const changes = entity.GetChangesSinceLastSave();
+            const changeKeys = Object.keys(changes);
+            if (changeKeys.length > 0) {
+                // Get primary key info for display
+                const entityInfo = this.syncEngine.getEntityInfo(entityConfig.entity);
+                const primaryKeyDisplay = [];
+                if (entityInfo) {
+                    for (const pk of entityInfo.PrimaryKeys) {
+                        primaryKeyDisplay.push(`${pk.Name}: ${entity.Get(pk.Name)}`);
+                    }
+                }
+                callbacks?.onLog?.(`📝 Updating ${entityConfig.entity} record:`);
+                if (primaryKeyDisplay.length > 0) {
+                    callbacks?.onLog?.(`   Primary Key: ${primaryKeyDisplay.join(', ')}`);
+                }
+                callbacks?.onLog?.(`   Changes:`);
+                for (const fieldName of changeKeys) {
+                    const field = entity.GetFieldByName(fieldName);
+                    const oldValue = field ? field.OldValue : undefined;
+                    const newValue = changes[fieldName];
+                    callbacks?.onLog?.(`     ${fieldName}: ${this.formatFieldValue(oldValue)} → ${this.formatFieldValue(newValue)}`);
+                }
+            }
+        }
+        // Save the record (always call Save, but track if it was actually dirty)
         const saveResult = await entity.Save();
         if (!saveResult) {
             throw new Error(`Failed to save ${entityConfig.entity} record: ${entity.LatestResult?.Message || 'Unknown error'}`);
         }
+        // Update primaryKey for new records
+        if (isNew) {
+            const entityInfo = this.syncEngine.getEntityInfo(entityConfig.entity);
+            if (entityInfo) {
+                const newPrimaryKey = {};
+                for (const pk of entityInfo.PrimaryKeys) {
+                    newPrimaryKey[pk.Name] = entity.Get(pk.Name);
+                }
+                recordData.primaryKey = newPrimaryKey;
+            }
+        }
+        // Only update sync metadata if the record was actually dirty (changed)
+        if (isNew || isDirty) {
+            recordData.sync = {
+                lastModified: new Date().toISOString(),
+                checksum: await this.syncEngine.calculateChecksumWithFileContent(originalFields, entityDir)
+            };
+        }
+        // Restore original field values to preserve @ references
+        recordData.fields = originalFields;
+        // Write back to file only if it's a single record (not part of an array)
+        if (filePath && arrayIndex === undefined && !options.dryRun) {
+            await fs_extra_1.default.writeJson(filePath, recordData, { spaces: 2 });
+        }
         // Process related entities after parent save
         if (recordData.relatedEntities) {
             await this.processRelatedEntities(entity, recordData.relatedEntities, entityDir, options, callbacks);
         }
-        return exists ? 'updated' : 'created';
+        // Return the actual status based on whether the record was dirty
+        if (isNew) {
+            return 'created';
+        }
+        else if (isDirty) {
+            return 'updated';
+        }
+        else {
+            return 'unchanged';
+        }
     }
     async processRelatedEntities(parentEntity, relatedEntities, entityDir, options, callbacks) {
         // TODO: Complete implementation for processing related entities
@@ -316,7 +455,7 @@ class PushService {
         // 4. Support nested related entities recursively
         for (const [key, records] of Object.entries(relatedEntities)) {
             for (const relatedRecord of records) {
-                // Process @parent references
+                // Process @parent references but DON'T modify the original fields
                 const processedFields = {};
                 for (const [fieldName, fieldValue] of Object.entries(relatedRecord.fields)) {
                     if (typeof fieldValue === 'string' && fieldValue.startsWith('@parent:')) {
@@ -327,8 +466,9 @@ class PushService {
                         processedFields[fieldName] = await this.syncEngine.processFieldValue(fieldValue, entityDir, parentEntity, null);
                     }
                 }
-                // Save related entity (simplified - full implementation needed)
-                relatedRecord.fields = processedFields;
+                // TODO: Actually save the related entity with processedFields
+                // For now, we're just processing the values but not saving
+                // This needs to be implemented to actually create/update the related entities
             }
         }
     }
@@ -350,44 +490,69 @@ class PushService {
         const fieldKeys = Object.keys(recordData.fields).sort().join(',');
         return `${entityName}|fields:${fieldKeys}`;
     }
+    formatFieldValue(value, maxLength = 50) {
+        let strValue = JSON.stringify(value);
+        strValue = strValue.trim();
+        if (strValue.length > maxLength) {
+            return strValue.substring(0, maxLength) + '...';
+        }
+        return strValue;
+    }
     findEntityDirectories(baseDir, specificDir) {
         const dirs = [];
         if (specificDir) {
             // Process specific directory
             const fullPath = path_1.default.resolve(baseDir, specificDir);
             if (fs_extra_1.default.existsSync(fullPath) && fs_extra_1.default.statSync(fullPath).isDirectory()) {
-                dirs.push(fullPath);
+                // Check if this directory has an entity configuration
+                const configPath = path_1.default.join(fullPath, '.mj-sync.json');
+                if (fs_extra_1.default.existsSync(configPath)) {
+                    try {
+                        const config = fs_extra_1.default.readJsonSync(configPath);
+                        if (config.entity) {
+                            // It's an entity directory, add it
+                            dirs.push(fullPath);
+                        }
+                        else {
+                            // It's a container directory, search its subdirectories
+                            this.findEntityDirectoriesRecursive(fullPath, dirs);
+                        }
+                    }
+                    catch {
+                        // Invalid config, skip
+                    }
+                }
             }
         }
         else {
             // Find all entity directories
-            const searchDirs = (dir) => {
-                const entries = fs_extra_1.default.readdirSync(dir, { withFileTypes: true });
-                for (const entry of entries) {
-                    if (entry.isDirectory() && !entry.name.startsWith('.') && entry.name !== 'node_modules') {
-                        const fullPath = path_1.default.join(dir, entry.name);
-                        const configPath = path_1.default.join(fullPath, '.mj-sync.json');
-                        if (fs_extra_1.default.existsSync(configPath)) {
-                            try {
-                                const config = fs_extra_1.default.readJsonSync(configPath);
-                                if (config.entity) {
-                                    dirs.push(fullPath);
-                                }
-                            }
-                            catch {
-                                // Skip invalid config files
-                            }
-                        }
-                        else {
-                            // Recurse into subdirectories
-                            searchDirs(fullPath);
+            this.findEntityDirectoriesRecursive(baseDir, dirs);
+        }
+        return dirs;
+    }
+    findEntityDirectoriesRecursive(dir, dirs) {
+        const entries = fs_extra_1.default.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isDirectory() && !entry.name.startsWith('.') && entry.name !== 'node_modules') {
+                const fullPath = path_1.default.join(dir, entry.name);
+                const configPath = path_1.default.join(fullPath, '.mj-sync.json');
+                if (fs_extra_1.default.existsSync(configPath)) {
+                    try {
+                        const config = fs_extra_1.default.readJsonSync(configPath);
+                        if (config.entity) {
+                            dirs.push(fullPath);
                         }
                     }
+                    catch {
+                        // Skip invalid config files
+                    }
                 }
-            };
-            searchDirs(baseDir);
+                else {
+                    // Recurse into subdirectories
+                    this.findEntityDirectoriesRecursive(fullPath, dirs);
+                }
+            }
         }
-        return dirs;
     }
 }
 exports.PushService = PushService;