mysqlsyncr 1.0.70 → 1.0.74

package/dist/index.cjs

@@ -3259,49 +3259,53 @@ var findDifferences = function findDifferences(expected, current) {
       _step2;
     try {
       var _loop = function _loop() {
-        var field = _step2.value;
-        var currentField = current.tables[_tableName].columns.find(function (f) {
-          return f.Field === field.Field;
-        });
-        if (!currentField) {
-          console.error('Current field not found for', field.Field, 'in table', _tableName);
-          differences.push({
-            type: 'missing_field',
-            tableName: _tableName,
-            field: field
-          });
-          return 1; // continue
-        }
-        if (field.Type !== currentField.Type) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Type",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
-          });
-        }
-        if (field.Null !== currentField.Null) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Null",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
-          });
-        }
-        if (field.Default !== currentField.Default) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Default",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
+          var field = _step2.value;
+          var currentField = current.tables[_tableName].columns.find(function (f) {
+            return f.Field === field.Field;
           });
-        }
-      };
+          if (!currentField) {
+            console.error('Current field not found for', field.Field, 'in table', _tableName);
+            differences.push({
+              type: 'missing_field',
+              tableName: _tableName,
+              field: field
+            });
+            return 0; // continue
+          }
+          if (field.Null !== currentField.Null) {
+            differences.push({
+              type: 'mismatched_field',
+              info: "Null",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+          if (field.Default !== currentField.Default) {
+            differences.push({
+              type: 'mismatched_field',
+              info: "Default",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+          if (field.Type !== currentField.Type) {
+            if (field.Type == 'int' && currentField.Type == 'int(11)') return 0; // continue
+            // int(11) is the default for int and used on older versions of mysql
+            differences.push({
+              type: 'mismatched_field',
+              info: "Type",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+        },
+        _ret;
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        if (_loop()) continue;
+        _ret = _loop();
+        if (_ret === 0) continue;
       }
 
       // verify indexes
@@ -3457,7 +3461,7 @@ var findDifferences = function findDifferences(expected, current) {
 
   // Compare stored procedures
   if (!expected.procedures) {
-    console.log('No procedures found in expected for database', current.database);
+    console.log('No procedures found in expected');
   } else {
     var _loop6 = function _loop6() {
       var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
@@ -4252,6 +4256,22 @@ var setConfig = function setConfig(config, argv) {
   }
   return config;
 };
+
+// Create a function to get the package root directory that works in both ESM and CJS
+var getPackageRoot = function getPackageRoot() {
+  if (typeof __dirname$2 !== 'undefined') {
+    // CommonJS
+    return path.join(__dirname$2, '..');
+  } else {
+    // ESM
+    var _filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+    var _dirname = path.dirname(_filename);
+    return path.join(_dirname, '..');
+  }
+};
+
+// Use the function to get the root path
+var packageRoot = getPackageRoot();
 var startApiServer = function startApiServer(port, argv) {
   var app = express();
   app.use(cors({
@@ -4265,8 +4285,8 @@ var startApiServer = function startApiServer(port, argv) {
     limit: '50mb',
     extended: true
   }));
-  console.log("Serving UI from ".concat(path.join(__dirname$2, '../ui/dist/spa')));
-  app.use(express["static"](path.join(__dirname$2, '../ui/dist/spa')));
+  console.log("Serving UI from ".concat(path.join(packageRoot, 'ui/dist/spa')));
+  app.use(express["static"](path.join(packageRoot, 'ui/dist/spa')));
   app.post('/api/getDatabasesFromExistingDumps', /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
       var config, databases;
@@ -4493,7 +4513,7 @@ var startApiServer = function startApiServer(port, argv) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             _context8.prev = 0;
-            _req$body$currentPath = req.body.currentPath, currentPath = _req$body$currentPath === undefined ? __dirname$2 : _req$body$currentPath;
+            _req$body$currentPath = req.body.currentPath, currentPath = _req$body$currentPath === undefined ? packageRoot : _req$body$currentPath;
             console.log('Browsing folder:', currentPath);
             resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/) ? path.resolve(currentPath) : path.resolve(currentPath);
             console.log('Resolved path:', resolvedPath);
@@ -4557,7 +4577,7 @@ var startApiServer = function startApiServer(port, argv) {
             _context9.prev = 0;
             folderPath = req.body.folderPath;
             console.log('Creating folder:', folderPath);
-            resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/) ? path.resolve(folderPath) : path.resolve(__dirname$2, folderPath);
+            resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/) ? path.resolve(folderPath) : path.resolve(packageRoot, folderPath);
             _context9.next = 6;
             return fs$1.mkdir(resolvedPath, {
               recursive: true

package/dist/index.js

@@ -3256,49 +3256,53 @@ var findDifferences = function findDifferences(expected, current) {
       _step2;
     try {
       var _loop = function _loop() {
-        var field = _step2.value;
-        var currentField = current.tables[_tableName].columns.find(function (f) {
-          return f.Field === field.Field;
-        });
-        if (!currentField) {
-          console.error('Current field not found for', field.Field, 'in table', _tableName);
-          differences.push({
-            type: 'missing_field',
-            tableName: _tableName,
-            field: field
-          });
-          return 1; // continue
-        }
-        if (field.Type !== currentField.Type) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Type",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
-          });
-        }
-        if (field.Null !== currentField.Null) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Null",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
-          });
-        }
-        if (field.Default !== currentField.Default) {
-          differences.push({
-            type: 'mismatched_field',
-            info: "Default",
-            tableName: _tableName,
-            field: field,
-            currentField: currentField
+          var field = _step2.value;
+          var currentField = current.tables[_tableName].columns.find(function (f) {
+            return f.Field === field.Field;
           });
-        }
-      };
+          if (!currentField) {
+            console.error('Current field not found for', field.Field, 'in table', _tableName);
+            differences.push({
+              type: 'missing_field',
+              tableName: _tableName,
+              field: field
+            });
+            return 0; // continue
+          }
+          if (field.Null !== currentField.Null) {
+            differences.push({
+              type: 'mismatched_field',
+              info: "Null",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+          if (field.Default !== currentField.Default) {
+            differences.push({
+              type: 'mismatched_field',
+              info: "Default",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+          if (field.Type !== currentField.Type) {
+            if (field.Type == 'int' && currentField.Type == 'int(11)') return 0; // continue
+            // int(11) is the default for int and used on older versions of mysql
+            differences.push({
+              type: 'mismatched_field',
+              info: "Type",
+              tableName: _tableName,
+              field: field,
+              currentField: currentField
+            });
+          }
+        },
+        _ret;
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        if (_loop()) continue;
+        _ret = _loop();
+        if (_ret === 0) continue;
       }
 
       // verify indexes
@@ -3454,7 +3458,7 @@ var findDifferences = function findDifferences(expected, current) {
 
   // Compare stored procedures
   if (!expected.procedures) {
-    console.log('No procedures found in expected for database', current.database);
+    console.log('No procedures found in expected');
   } else {
     var _loop6 = function _loop6() {
       var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
@@ -4249,6 +4253,22 @@ var setConfig = function setConfig(config, argv) {
   }
   return config;
 };
+
+// Create a function to get the package root directory that works in both ESM and CJS
+var getPackageRoot = function getPackageRoot() {
+  if (typeof __dirname$2 !== 'undefined') {
+    // CommonJS
+    return join(__dirname$2, '..');
+  } else {
+    // ESM
+    var _filename = fileURLToPath(import.meta.url);
+    var _dirname = dirname(_filename);
+    return join(_dirname, '..');
+  }
+};
+
+// Use the function to get the root path
+var packageRoot = getPackageRoot();
 var startApiServer = function startApiServer(port, argv) {
   var app = express();
   app.use(cors({
@@ -4262,8 +4282,8 @@ var startApiServer = function startApiServer(port, argv) {
     limit: '50mb',
     extended: true
   }));
-  console.log("Serving UI from ".concat(join(__dirname$2, '../ui/dist/spa')));
-  app.use(express["static"](join(__dirname$2, '../ui/dist/spa')));
+  console.log("Serving UI from ".concat(join(packageRoot, 'ui/dist/spa')));
+  app.use(express["static"](join(packageRoot, 'ui/dist/spa')));
   app.post('/api/getDatabasesFromExistingDumps', /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
       var config, databases;
@@ -4490,7 +4510,7 @@ var startApiServer = function startApiServer(port, argv) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             _context8.prev = 0;
-            _req$body$currentPath = req.body.currentPath, currentPath = _req$body$currentPath === undefined ? __dirname$2 : _req$body$currentPath;
+            _req$body$currentPath = req.body.currentPath, currentPath = _req$body$currentPath === undefined ? packageRoot : _req$body$currentPath;
             console.log('Browsing folder:', currentPath);
             resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/) ? resolve(currentPath) : resolve(currentPath);
             console.log('Resolved path:', resolvedPath);
@@ -4554,7 +4574,7 @@ var startApiServer = function startApiServer(port, argv) {
             _context9.prev = 0;
             folderPath = req.body.folderPath;
             console.log('Creating folder:', folderPath);
-            resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/) ? resolve(folderPath) : resolve(__dirname$2, folderPath);
+            resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/) ? resolve(folderPath) : resolve(packageRoot, folderPath);
             _context9.next = 6;
             return mkdir(resolvedPath, {
               recursive: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.70",
+  "version": "1.0.74",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/differences.js

@@ -63,15 +63,16 @@ export const findDifferences = (expected, current) => {
                 differences.push({ type: 'missing_field', tableName, field });
                 continue;
             }
-            if (field.Type !== currentField.Type) {
-                differences.push({ type: 'mismatched_field', info: "Type", tableName, field, currentField });
-            }
             if (field.Null !== currentField.Null) {
                 differences.push({ type: 'mismatched_field', info: "Null", tableName, field, currentField });
             }
             if (field.Default !== currentField.Default) {
                 differences.push({ type: 'mismatched_field', info: "Default", tableName, field, currentField });
             }
+            if (field.Type !== currentField.Type) {
+                if(field.Type == 'int' && currentField.Type == 'int(11)') continue; // int(11) is the default for int and used on older versions of mysql
+                differences.push({ type: 'mismatched_field', info: "Type", tableName, field, currentField });
+            }
         }
 
         // verify indexes
@@ -135,7 +136,7 @@ export const findDifferences = (expected, current) => {
 
     // Compare stored procedures
     if (!expected.procedures) {
-        console.log('No procedures found in expected for database', current.database);
+        console.log('No procedures found in expected');
     } else {
         for (const [position, contents] of Object.entries(expected.procedures)) {
             let procName = contents.Name;

package/src/socketServer.js

@@ -33,6 +33,22 @@ const setConfig = (config, argv) => {
     return config;
 }
 
+// Create a function to get the package root directory that works in both ESM and CJS
+const getPackageRoot = () => {
+    if (typeof __dirname !== 'undefined') {
+        // CommonJS
+        return join(__dirname, '..');
+    } else {
+        // ESM
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = dirname(__filename);
+        return join(__dirname, '..');
+    }
+};
+
+// Use the function to get the root path
+const packageRoot = getPackageRoot();
+
 export const startApiServer = (port, argv) => {
     const app = express();
     app.use(cors({ origin: '*' }));
@@ -40,8 +56,8 @@ export const startApiServer = (port, argv) => {
     app.use(express.json({ limit: '50mb' })); 
     app.use(express.urlencoded({ limit: '50mb', extended: true })); 
 
-    console.log(`Serving UI from ${join(__dirname, '../ui/dist/spa')}`);
-    app.use(express.static(join(__dirname, '../ui/dist/spa')));
+    console.log(`Serving UI from ${join(packageRoot, 'ui/dist/spa')}`);
+    app.use(express.static(join(packageRoot, 'ui/dist/spa')));
 
     app.post('/api/getDatabasesFromExistingDumps', async (req, res) => {
         let { config } = req.body;
@@ -141,7 +157,7 @@ export const startApiServer = (port, argv) => {
 
     app.post('/api/browse-folders', async (req, res) => {
         try {
-            const { currentPath = __dirname } = req.body;
+            const { currentPath = packageRoot } = req.body;
             console.log('Browsing folder:', currentPath);
 
             const resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/)
@@ -194,7 +210,7 @@ export const startApiServer = (port, argv) => {
 
             const resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/)
                 ? resolve(folderPath)
-                : resolve(__dirname, folderPath);
+                : resolve(packageRoot, folderPath);
 
             await mkdir(resolvedPath, { recursive: true });