masterrecord 0.3.8 → 0.3.10

package/Migrations/pathUtils.js

@@ -0,0 +1,76 @@
+/**
+ * Path utilities for MasterRecord migrations
+ * Handles path resolution to prevent duplicate db/migrations in paths
+ */
+
+const path = require('path');
+
+/**
+ * Resolve migrations directory, avoiding duplicate db/migrations paths
+ *
+ * If the context file is already inside a db/migrations folder structure,
+ * returns that directory. Otherwise, appends db/migrations to the context directory.
+ *
+ * This prevents the bug where:
+ * /components/qa/app/models/db/migrations/qaContext.js
+ * becomes:
+ * /components/qa/app/models/db/migrations/db/migrations/qacontext_contextSnapShot.json
+ *
+ * @param {string} contextFilePath - Absolute path to the context file
+ * @returns {string} Absolute path to the migrations directory
+ *
+ * @example
+ * // Context already in migrations folder
+ * resolveMigrationsDirectory('/app/models/db/migrations/Context.js')
+ * // Returns: /app/models/db/migrations
+ *
+ * @example
+ * // Context NOT in migrations folder
+ * resolveMigrationsDirectory('/app/models/Context.js')
+ * // Returns: /app/models/db/migrations
+ */
+function resolveMigrationsDirectory(contextFilePath) {
+    const contextDir = path.dirname(contextFilePath);
+    const contextDirNormalized = contextDir.split(path.sep).join('/');
+
+    // Check if context is already inside a db/migrations folder
+    const alreadyInMigrations = contextDirNormalized.includes('/db/migrations') ||
+                                contextDirNormalized.includes('\\db\\migrations');
+
+    if (alreadyInMigrations) {
+        // Context is already in db/migrations - find and use that directory
+        let currentDir = contextDir;
+        while (currentDir && currentDir !== path.dirname(currentDir)) {
+            const dirName = path.basename(currentDir);
+            const parentName = path.basename(path.dirname(currentDir));
+
+            if (dirName === 'migrations' && parentName === 'db') {
+                return currentDir;
+            }
+            currentDir = path.dirname(currentDir);
+        }
+
+        // Fallback if we couldn't find it (shouldn't happen)
+        console.warn(`[pathUtils] Warning: Context is in a path containing 'db/migrations' but couldn't locate exact directory. Using context directory: ${contextDir}`);
+        return contextDir;
+    } else {
+        // Context is NOT in db/migrations - return standard path
+        return path.join(contextDir, 'db', 'migrations');
+    }
+}
+
+/**
+ * Check if a path is already inside a db/migrations directory structure
+ *
+ * @param {string} filePath - Path to check
+ * @returns {boolean} True if path contains db/migrations
+ */
+function isInMigrationsDirectory(filePath) {
+    const normalized = filePath.split(path.sep).join('/');
+    return normalized.includes('/db/migrations') || normalized.includes('\\db\\migrations');
+}
+
+module.exports = {
+    resolveMigrationsDirectory,
+    isInMigrationsDirectory
+};

package/Migrations/pathUtils.test.js

@@ -0,0 +1,53 @@
+/**
+ * Tests for pathUtils.js - Path resolution for migrations
+ *
+ * Run with: node pathUtils.test.js
+ */
+
+const path = require('path');
+const { resolveMigrationsDirectory, isInMigrationsDirectory } = require('./pathUtils');
+
+function assert(condition, message) {
+    if (!condition) {
+        throw new Error(`❌ Test failed: ${message}`);
+    }
+    console.log(`✓ ${message}`);
+}
+
+console.log('\n🧪 Running pathUtils tests...\n');
+
+// Test 1: Context NOT in migrations folder
+const test1 = resolveMigrationsDirectory('/app/models/Context.js');
+const expected1 = path.join('/app/models', 'db', 'migrations');
+assert(test1 === expected1,
+    `Context NOT in migrations: Expected '${expected1}', got '${test1}'`);
+
+// Test 2: Context already IN migrations folder
+const test2 = resolveMigrationsDirectory('/app/models/db/migrations/Context.js');
+const expected2 = '/app/models/db/migrations';
+assert(test2 === expected2,
+    `Context IN migrations: Expected '${expected2}', got '${test2}'`);
+
+// Test 3: Context in nested migrations folder
+const test3 = resolveMigrationsDirectory('/components/qa/app/models/db/migrations/qaContext.js');
+const expected3 = '/components/qa/app/models/db/migrations';
+assert(test3 === expected3,
+    `Context in nested migrations: Expected '${expected3}', got '${test3}'`);
+
+// Test 4: isInMigrationsDirectory - true case
+const test4 = isInMigrationsDirectory('/app/models/db/migrations/Context.js');
+assert(test4 === true,
+    'isInMigrationsDirectory should return true for path with db/migrations');
+
+// Test 5: isInMigrationsDirectory - false case
+const test5 = isInMigrationsDirectory('/app/models/Context.js');
+assert(test5 === false,
+    'isInMigrationsDirectory should return false for path without db/migrations');
+
+// Test 6: Windows path with backslashes
+const test6Windows = '/app\\models\\db\\migrations\\Context.js'.replace(/\\/g, path.sep);
+const result6 = isInMigrationsDirectory(test6Windows);
+assert(result6 === true,
+    'isInMigrationsDirectory should handle Windows paths with backslashes');
+
+console.log('\n✅ All tests passed!\n');

package/QueryLanguage/queryMethods.js

@@ -465,6 +465,21 @@ class queryMethods{
             }
         }
 
+        // Add Active Record-style .save() method
+        newEntity.save = async function() {
+            if (!this.__context) {
+                throw new Error('Cannot save: entity is not attached to a context');
+            }
+
+            // Ensure entity is tracked
+            if (!this.__context.__trackedEntitiesMap.has(this.__ID)) {
+                this.__context.__track(this);
+            }
+
+            // Save all tracked changes in the context
+            return await this.__context.saveChanges();
+        };
+
         // Track the entity
         this.__context.__track(newEntity);
         return newEntity;