forge-sql-orm 1.0.11 → 1.0.12

package/dist-cli/forgeSqlCLI.js

@@ -4,36 +4,47 @@ const path = require("path");
 const fs = require("fs");
 const os = require("os");
 
-// Get all command-line arguments except the first two (node and script path)
+// Get CLI arguments (excluding "node" and script path)
 const args = process.argv.slice(2).join(" ");
 
-// Resolve the path to cli.ts
+// Resolve the path to cli.ts (your TypeScript entry file)
 const cliPath = path.resolve(__dirname, "cli.js");
 
-// Determine the path to the local ts-node in node_modules/.bin
-let localTsNode = path.resolve(__dirname, "../node_modules/.bin/ts-node");
+// Detect platform-specific `ts-node` binary paths
+const localTsNode = path.resolve(__dirname, "../node_modules/.bin/ts-node") + (os.platform() === "win32" ? ".cmd" : "");
 
-// On Windows, the ts-node binary is named ts-node.cmd
-if (os.platform() === "win32") {
-    localTsNode += ".cmd";
-}
-
-// Function to execute a shell command
+// Function to run a command
 const runCommand = (cmd) => {
     try {
-        // Execute the command with inherited stdio for proper CLI output
         execSync(cmd, { stdio: "inherit", shell: true });
-        process.exit(0); // Exit successfully after execution
+        process.exit(0);
     } catch (e) {
         console.error("⚠️  Command execution failed:", e.message);
-        process.exit(1); // Exit with an error code
+        process.exit(1);
     }
 };
 
-// If local ts-node exists, use it
+// **1. Check if `ts-node` is globally installed**
+const isGlobalTsNodeInstalled = (() => {
+    try {
+        execSync("ts-node --version", { stdio: "ignore" }); // Check if `ts-node` runs without error
+        return true;
+    } catch {
+        return false;
+    }
+})();
+
+if (isGlobalTsNodeInstalled) {
+    console.log("✅ Using global ts-node");
+    runCommand(`ts-node ${cliPath} ${args}`);
+}
+
+// **2. If not, check for local ts-node**
 if (fs.existsSync(localTsNode)) {
+    console.log("✅ Using local ts-node");
     runCommand(`"${localTsNode}" ${cliPath} ${args}`);
-} else {
-    console.warn("⚠️  Local ts-node not found, trying npx ts-node...");
-    runCommand(`npx ts-node ${cliPath} ${args}`);
 }
+
+// **3. If neither found, fallback to npx**
+console.warn("⚠️  Neither global nor local ts-node found, using npx...");
+runCommand(`npx ts-node ${cliPath} ${args}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-sql-orm",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Mikro-ORM integration for Forge-SQL in Atlassian Forge applications.",
   "main": "dist/ForgeSQLORM.js",
   "module": "dist/ForgeSQLORM.mjs",