mysqlsyncr 1.0.60 → 1.0.64

package/__tests__/import.cjs

@@ -1,4 +1,4 @@
-const mysqlSyncr = require('../dist/index.cjs.cjs');
+const mysqlSyncr = require('../dist/index.cjs');
 const path = require('path');
 
 const dotenv = require('dotenv');

package/dist/index.cjs

@@ -3456,36 +3456,39 @@ var findDifferences = function findDifferences(expected, current) {
   }
 
   // Compare stored procedures
-  if (!expected.procedures) throw new Error('No procedures found in expected');
-  var _loop6 = function _loop6() {
-    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
-      _Object$entries2$_i[0];
-      var contents = _Object$entries2$_i[1];
-    var procName = contents.Name;
-    var currentProc = current.procedures.find(function (p) {
-      return p.Name === procName;
-    });
-    if (!currentProc) {
-      console.log('missing_procedure', contents);
-      differences.push(_objectSpread2({
-        type: 'missing_procedure'
-      }, contents));
-      return 1; // continue
-    }
-
-    // Check if the procedure definition matches
-    if (currentProc.Definition !== contents.Definition) {
-      var normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
-      var normalizedNewDef = normalizeSQLDefinition(contents.Definition);
-      if (normalizedCurrentDef !== normalizedNewDef) {
+  if (!expected.procedures) {
+    console.log('No procedures found in expected for database', current.database);
+  } else {
+    var _loop6 = function _loop6() {
+      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
+        _Object$entries2$_i[0];
+        var contents = _Object$entries2$_i[1];
+      var procName = contents.Name;
+      var currentProc = current.procedures.find(function (p) {
+        return p.Name === procName;
+      });
+      if (!currentProc) {
+        console.log('missing_procedure', contents);
         differences.push(_objectSpread2({
-          type: 'mismatched_procedure'
+          type: 'missing_procedure'
         }, contents));
+        return 1; // continue
       }
+
+      // Check if the procedure definition matches
+      if (currentProc.Definition !== contents.Definition) {
+        var normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
+        var normalizedNewDef = normalizeSQLDefinition(contents.Definition);
+        if (normalizedCurrentDef !== normalizedNewDef) {
+          differences.push(_objectSpread2({
+            type: 'mismatched_procedure'
+          }, contents));
+        }
+      }
+    };
+    for (var _i3 = 0, _Object$entries2 = Object.entries(expected.procedures); _i3 < _Object$entries2.length; _i3++) {
+      if (_loop6()) continue;
     }
-  };
-  for (var _i3 = 0, _Object$entries2 = Object.entries(expected.procedures); _i3 < _Object$entries2.length; _i3++) {
-    if (_loop6()) continue;
   }
 
   // Compare views
@@ -4261,7 +4264,7 @@ var startApiServer = function startApiServer(port, argv) {
     extended: true
   }));
   var __dirname = process.platform === "win32" ? process.cwd().replace(/\\/g, '/') : process.cwd();
-  app.use(express["static"](path.join(__dirname, '../ui/dist/spa')));
+  app.use(express["static"](path.join(__dirname, './ui/dist/spa')));
   app.post('/api/getDatabasesFromExistingDumps', /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
       var config, databases;
@@ -5217,6 +5220,9 @@ var compare = /*#__PURE__*/function () {
 // Only run this if this is the main module
 var isMain = function () {
   try {
+    console.log('Checking if this is the main module');
+    console.log(require.main === module);
+    console.log(require.main);
     return require.main === module;
   } catch (e) {
     return false;

package/dist/index.js

@@ -3453,36 +3453,39 @@ var findDifferences = function findDifferences(expected, current) {
   }
 
   // Compare stored procedures
-  if (!expected.procedures) throw new Error('No procedures found in expected');
-  var _loop6 = function _loop6() {
-    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
-      _Object$entries2$_i[0];
-      var contents = _Object$entries2$_i[1];
-    var procName = contents.Name;
-    var currentProc = current.procedures.find(function (p) {
-      return p.Name === procName;
-    });
-    if (!currentProc) {
-      console.log('missing_procedure', contents);
-      differences.push(_objectSpread2({
-        type: 'missing_procedure'
-      }, contents));
-      return 1; // continue
-    }
-
-    // Check if the procedure definition matches
-    if (currentProc.Definition !== contents.Definition) {
-      var normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
-      var normalizedNewDef = normalizeSQLDefinition(contents.Definition);
-      if (normalizedCurrentDef !== normalizedNewDef) {
+  if (!expected.procedures) {
+    console.log('No procedures found in expected for database', current.database);
+  } else {
+    var _loop6 = function _loop6() {
+      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2);
+        _Object$entries2$_i[0];
+        var contents = _Object$entries2$_i[1];
+      var procName = contents.Name;
+      var currentProc = current.procedures.find(function (p) {
+        return p.Name === procName;
+      });
+      if (!currentProc) {
+        console.log('missing_procedure', contents);
         differences.push(_objectSpread2({
-          type: 'mismatched_procedure'
+          type: 'missing_procedure'
         }, contents));
+        return 1; // continue
       }
+
+      // Check if the procedure definition matches
+      if (currentProc.Definition !== contents.Definition) {
+        var normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
+        var normalizedNewDef = normalizeSQLDefinition(contents.Definition);
+        if (normalizedCurrentDef !== normalizedNewDef) {
+          differences.push(_objectSpread2({
+            type: 'mismatched_procedure'
+          }, contents));
+        }
+      }
+    };
+    for (var _i3 = 0, _Object$entries2 = Object.entries(expected.procedures); _i3 < _Object$entries2.length; _i3++) {
+      if (_loop6()) continue;
     }
-  };
-  for (var _i3 = 0, _Object$entries2 = Object.entries(expected.procedures); _i3 < _Object$entries2.length; _i3++) {
-    if (_loop6()) continue;
   }
 
   // Compare views
@@ -4258,7 +4261,7 @@ var startApiServer = function startApiServer(port, argv) {
     extended: true
   }));
   var __dirname = process.platform === "win32" ? process.cwd().replace(/\\/g, '/') : process.cwd();
-  app.use(express["static"](join(__dirname, '../ui/dist/spa')));
+  app.use(express["static"](join(__dirname, './ui/dist/spa')));
   app.post('/api/getDatabasesFromExistingDumps', /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
       var config, databases;
@@ -5214,6 +5217,9 @@ var compare = /*#__PURE__*/function () {
 // Only run this if this is the main module
 var isMain = function () {
   try {
+    console.log('Checking if this is the main module');
+    console.log(require.main === module);
+    console.log(require.main);
     return require.main === module;
   } catch (e) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.60",
+  "version": "1.0.64",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -18,7 +18,7 @@
     "build": "rollup -c"
   },
   "bin": {
-    "mysqlsyncr": "src/index.js"
+    "mysqlsyncr": "dist/index.cjs"
   },
   "author": "",
   "license": "ISC",

package/src/differences.js

@@ -15,7 +15,7 @@ export const findDifferences = (expected, current) => {
     if (!expected.tables) throw new Error('No tables found in expected');
     for (const [tableName, contents] of Object.entries(expected.tables)) {
         //check if craete table matches from json, if so, we dont need to compare indexes, triggers, or fields
-        
+
         if (!current.tables[tableName]) {
             console.log('missing_table', contents);
             differences.push({ type: 'missing_table', tableName, createSQL: contents.createSQL });
@@ -134,28 +134,29 @@ export const findDifferences = (expected, current) => {
 
 
     // Compare stored procedures
-    if (!expected.procedures) throw new Error('No procedures found in expected');
-    for (const [position, contents] of Object.entries(expected.procedures)) {
-        let procName = contents.Name;
-        let currentProc = current.procedures.find(p => p.Name === procName);
-        if (!currentProc) {
-            console.log('missing_procedure', contents);
-            differences.push({ type: 'missing_procedure', ...contents });
-            continue;
-        }
+    if (!expected.procedures) {
+        console.log('No procedures found in expected for database', current.database);
+    } else {
+        for (const [position, contents] of Object.entries(expected.procedures)) {
+            let procName = contents.Name;
+            let currentProc = current.procedures.find(p => p.Name === procName);
+            if (!currentProc) {
+                console.log('missing_procedure', contents);
+                differences.push({ type: 'missing_procedure', ...contents });
+                continue;
+            }
 
 
-        // Check if the procedure definition matches
-        if (currentProc.Definition !== contents.Definition) {
-            const normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
-            const normalizedNewDef = normalizeSQLDefinition(contents.Definition);
+            // Check if the procedure definition matches
+            if (currentProc.Definition !== contents.Definition) {
+                const normalizedCurrentDef = normalizeSQLDefinition(currentProc.Definition);
+                const normalizedNewDef = normalizeSQLDefinition(contents.Definition);
 
-            if (normalizedCurrentDef !== normalizedNewDef) {
-                differences.push({ type: 'mismatched_procedure', ...contents });
+                if (normalizedCurrentDef !== normalizedNewDef) {
+                    differences.push({ type: 'mismatched_procedure', ...contents });
+                }
             }
         }
-
-
     }
 
     // Compare views
@@ -179,15 +180,15 @@ export const findDifferences = (expected, current) => {
                 if (!current.views[viewName]) {
                     differences.push({ type: 'missing_view', viewName, definition: expectedDefinition });
                 } else if (current.views[viewName] !== expectedDefinition) {
-                    differences.push({ 
-                        type: 'mismatched_view', 
-                        viewName, 
-                        definition: expectedDefinition, 
-                        current: current.views[viewName] 
+                    differences.push({
+                        type: 'mismatched_view',
+                        viewName,
+                        definition: expectedDefinition,
+                        current: current.views[viewName]
                     });
                 }
             }
-            
+
             // Check for extra views
             for (const viewName of Object.keys(current.views)) {
                 if (!expected.views[viewName]) {

package/src/index.js

@@ -64,6 +64,9 @@ export { DBStructureChecker, dumpAllDatabases, compare, startApiServer };
 // Only run this if this is the main module
 const isMain = (() => {
     try {
+        console.log('Checking if this is the main module');
+        console.log(require.main === module)
+        console.log(require.main);
         return require.main === module;
     } catch (e) {
         return false;

package/src/socketServer.js

@@ -5,8 +5,7 @@ import { compareAllDatabases } from './compare.js';
 import { DBStructureChecker } from './index.js'; // Import your DBStructureChecker class
 import { applyDifferences } from './apply.js';
 import cors from 'cors';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
+import { join } from 'path';
 import { readdir, mkdir } from 'fs/promises';
 import { resolve } from 'path';
 
@@ -40,7 +39,7 @@ export const startApiServer = (port, argv) => {
         ? process.cwd().replace(/\\/g, '/') 
         : process.cwd();
 
-    app.use(express.static(join(__dirname, '../ui/dist/spa')));
+    app.use(express.static(join(__dirname, './ui/dist/spa')));
 
     app.post('/api/getDatabasesFromExistingDumps', async (req, res) => {
         let { config } = req.body;