mysqlsyncr 1.0.68 → 1.0.72

package/dist/index.cjs

@@ -2288,13 +2288,13 @@ const y18n = (opts) => {
 const REQUIRE_ERROR = 'require is not supported by ESM';
 const REQUIRE_DIRECTORY_ERROR = 'loading a directory of commands is not supported yet for ESM';
 
-let __dirname$2;
+let __dirname$3;
 try {
-  __dirname$2 = 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)));
+  __dirname$3 = 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)));
 } catch (e) {
-  __dirname$2 = process.cwd();
+  __dirname$3 = process.cwd();
 }
-const mainFilename = __dirname$2.substring(0, __dirname$2.lastIndexOf('node_modules'));
+const mainFilename = __dirname$3.substring(0, __dirname$3.lastIndexOf('node_modules'));
 
 ({
   assert: {
@@ -2340,7 +2340,7 @@ const mainFilename = __dirname$2.substring(0, __dirname$2.lastIndexOf('node_modu
     return [...str].length
   },
   y18n: y18n({
-    directory: path.resolve(__dirname$2, '../../../locales'),
+    directory: path.resolve(__dirname$3, '../../../locales'),
     updateFiles: false
   })
 });
@@ -3457,7 +3457,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);
@@ -4232,6 +4232,8 @@ var compareAllDatabases = /*#__PURE__*/function () {
   };
 }();
 
+var __filename$1 = 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$2 = path.dirname(__filename$1);
 var setConfig = function setConfig(config, argv) {
   if (!config.host && argv.host) {
     config.host = argv.host;
@@ -4250,6 +4252,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({
@@ -4263,9 +4281,8 @@ var startApiServer = function startApiServer(port, argv) {
     limit: '50mb',
     extended: true
   }));
-  var __dirname = process.platform === "win32" ? process.cwd().replace(/\\/g, '/') : process.cwd();
-  console.log("Serving UI from ".concat(path.join(__dirname, './ui/dist/spa')));
-  app.use(express["static"](path.join(__dirname, './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;
@@ -4492,9 +4509,9 @@ 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 ? process.cwd() : _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(process.cwd(), currentPath);
+            resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/) ? path.resolve(currentPath) : path.resolve(currentPath);
             console.log('Resolved path:', resolvedPath);
             _context8.next = 7;
             return fs$1.readdir(resolvedPath, {
@@ -4556,7 +4573,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(process.cwd(), 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

@@ -2285,13 +2285,13 @@ const y18n = (opts) => {
 const REQUIRE_ERROR = 'require is not supported by ESM';
 const REQUIRE_DIRECTORY_ERROR = 'loading a directory of commands is not supported yet for ESM';
 
-let __dirname$2;
+let __dirname$3;
 try {
-  __dirname$2 = fileURLToPath(import.meta.url);
+  __dirname$3 = fileURLToPath(import.meta.url);
 } catch (e) {
-  __dirname$2 = process.cwd();
+  __dirname$3 = process.cwd();
 }
-const mainFilename = __dirname$2.substring(0, __dirname$2.lastIndexOf('node_modules'));
+const mainFilename = __dirname$3.substring(0, __dirname$3.lastIndexOf('node_modules'));
 
 ({
   assert: {
@@ -2337,7 +2337,7 @@ const mainFilename = __dirname$2.substring(0, __dirname$2.lastIndexOf('node_modu
     return [...str].length
   },
   y18n: y18n({
-    directory: resolve(__dirname$2, '../../../locales'),
+    directory: resolve(__dirname$3, '../../../locales'),
     updateFiles: false
   })
 });
@@ -3454,7 +3454,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);
@@ -4229,6 +4229,8 @@ var compareAllDatabases = /*#__PURE__*/function () {
   };
 }();
 
+var __filename = fileURLToPath(import.meta.url);
+var __dirname$2 = dirname(__filename);
 var setConfig = function setConfig(config, argv) {
   if (!config.host && argv.host) {
     config.host = argv.host;
@@ -4247,6 +4249,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({
@@ -4260,9 +4278,8 @@ var startApiServer = function startApiServer(port, argv) {
     limit: '50mb',
     extended: true
   }));
-  var __dirname = process.platform === "win32" ? process.cwd().replace(/\\/g, '/') : process.cwd();
-  console.log("Serving UI from ".concat(join(__dirname, './ui/dist/spa')));
-  app.use(express["static"](join(__dirname, './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;
@@ -4489,9 +4506,9 @@ 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 ? process.cwd() : _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(process.cwd(), currentPath);
+            resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/) ? resolve(currentPath) : resolve(currentPath);
             console.log('Resolved path:', resolvedPath);
             _context8.next = 7;
             return readdir(resolvedPath, {
@@ -4553,7 +4570,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(process.cwd(), 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.68",
+  "version": "1.0.72",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/differences.js

@@ -135,7 +135,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

@@ -8,6 +8,11 @@ import cors from 'cors';
 import { join } from 'path';
 import { readdir, mkdir } from 'fs/promises';
 import { resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 const setConfig = (config, argv) => {
     if(!config.host && argv.host){
@@ -28,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: '*' }));
@@ -35,11 +56,8 @@ export const startApiServer = (port, argv) => {
     app.use(express.json({ limit: '50mb' })); 
     app.use(express.urlencoded({ limit: '50mb', extended: true })); 
 
-    const __dirname = process.platform === "win32" 
-        ? process.cwd().replace(/\\/g, '/') 
-        : process.cwd();
-    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;
@@ -139,12 +157,12 @@ export const startApiServer = (port, argv) => {
 
     app.post('/api/browse-folders', async (req, res) => {
         try {
-            const { currentPath = process.cwd() } = req.body;
+            const { currentPath = packageRoot } = req.body;
             console.log('Browsing folder:', currentPath);
 
             const resolvedPath = currentPath.startsWith('/') || currentPath.match(/^[A-Z]:\\/)
                 ? resolve(currentPath)
-                : resolve(process.cwd(), currentPath);
+                : resolve(currentPath);
 
             console.log('Resolved path:', resolvedPath);
 
@@ -192,7 +210,7 @@ export const startApiServer = (port, argv) => {
 
             const resolvedPath = folderPath.startsWith('/') || folderPath.match(/^[A-Z]:\\/)
                 ? resolve(folderPath)
-                : resolve(process.cwd(), folderPath);
+                : resolve(packageRoot, folderPath);
 
             await mkdir(resolvedPath, { recursive: true });