@erik9994857/cag 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erik9994857/cag",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "CaG — A code library and custom language for building 3D worlds with .cagc files, .bbmodel support, and auto UV mapping",
   "main": "src/index.js",
   "bin": {

package/src/builder/exe-builder.js

@@ -107,28 +107,33 @@ ExeBuilder.prototype.ensureDirectories = function () {
 };
 
 ExeBuilder.prototype.ensurePkgInstalled = function () {
-  var pkgPath = path.join(this.projectRoot, "node_modules", ".bin", "pkg");
-  var pkgPathWin = pkgPath + ".cmd";
+  var found = this.findPkgBin();
+  if (found !== "npx pkg") return;
 
-  if (!fs.existsSync(pkgPath) && !fs.existsSync(pkgPathWin)) {
-    var globalCheck;
-    try {
-      globalCheck = childProcess.execSync("pkg --version", { stdio: "pipe" });
-    } catch (e) {
-      globalCheck = null;
-    }
+  var npxCheck = null;
+  try {
+    npxCheck = childProcess.execSync("npx pkg --version", { stdio: "pipe" });
+  } catch (e) {
+    npxCheck = null;
+  }
 
-    if (!globalCheck) {
-      try {
-        childProcess.execSync("npm install --save-dev pkg@5.8.1", {
-          cwd: this.projectRoot,
-          stdio: "inherit"
-        });
-      } catch (e) {
-        throw new Error(
-          "Failed to install pkg. Run manually: npm install -g pkg"
-        );
-      }
+  if (npxCheck) return;
+
+  try {
+    childProcess.execSync("npm install -g pkg@5.8.1", {
+      cwd: this.projectRoot,
+      stdio: "inherit"
+    });
+  } catch (e) {
+    try {
+      childProcess.execSync("npm install pkg@5.8.1", {
+        cwd: this.projectRoot,
+        stdio: "inherit"
+      });
+    } catch (e2) {
+      throw new Error(
+        "Failed to install pkg. Run manually: npm install -g pkg"
+      );
     }
   }
 };
@@ -382,7 +387,13 @@ ExeBuilder.prototype.getRuntimeSource = function () {
 
 ExeBuilder.prototype.runPkg = function (entryFile, outputPath, target) {
   var pkgBin = this.findPkgBin();
-  var cmd = '"' + pkgBin + '" "' + entryFile + '" --target ' + target + ' --output "' + outputPath + '"';
+  var cmd;
+
+  if (pkgBin === "npx pkg") {
+    cmd = 'npx pkg "' + entryFile + '" --target ' + target + ' --output "' + outputPath + '"';
+  } else {
+    cmd = '"' + pkgBin + '" "' + entryFile + '" --target ' + target + ' --output "' + outputPath + '"';
+  }
 
   try {
     childProcess.execSync(cmd, {
@@ -400,20 +411,49 @@ ExeBuilder.prototype.runPkg = function (entryFile, outputPath, target) {
 };
 
 ExeBuilder.prototype.findPkgBin = function () {
-  var localBin = path.join(this.projectRoot, "node_modules", ".bin", "pkg");
-  if (fs.existsSync(localBin)) return localBin;
+  var projectLocal = path.join(this.projectRoot, "node_modules", ".bin", "pkg");
+  if (fs.existsSync(projectLocal)) return projectLocal;
+  var projectLocalCmd = projectLocal + ".cmd";
+  if (fs.existsSync(projectLocalCmd)) return projectLocalCmd;
+
+  var cagRoot = path.join(__dirname, "..", "..");
+  var cagLocal = path.join(cagRoot, "node_modules", ".bin", "pkg");
+  if (fs.existsSync(cagLocal)) return cagLocal;
+  var cagLocalCmd = cagLocal + ".cmd";
+  if (fs.existsSync(cagLocalCmd)) return cagLocalCmd;
+
+  var npmGlobalPrefix = "";
+  try {
+    npmGlobalPrefix = childProcess.execSync("npm config get prefix", {
+      stdio: "pipe"
+    }).toString().trim();
+  } catch (e) {
+    npmGlobalPrefix = "";
+  }
 
-  var localBinCmd = localBin + ".cmd";
-  if (fs.existsSync(localBinCmd)) return localBinCmd;
+  if (npmGlobalPrefix) {
+    var isWin = process.platform === "win32";
+    var globalBin;
+    if (isWin) {
+      globalBin = path.join(npmGlobalPrefix, "pkg.cmd");
+      if (fs.existsSync(globalBin)) return globalBin;
+      globalBin = path.join(npmGlobalPrefix, "node_modules", ".bin", "pkg.cmd");
+      if (fs.existsSync(globalBin)) return globalBin;
+    } else {
+      globalBin = path.join(npmGlobalPrefix, "bin", "pkg");
+      if (fs.existsSync(globalBin)) return globalBin;
+    }
+  }
 
   try {
-    var globalPath = childProcess.execSync("which pkg 2>/dev/null || where pkg 2>nul", {
-      stdio: "pipe"
-    }).toString().trim().split("\n")[0];
-    if (globalPath && fs.existsSync(globalPath)) return globalPath;
+    var whereResult = childProcess.execSync(
+      process.platform === "win32" ? "where pkg 2>nul" : "which pkg 2>/dev/null",
+      { stdio: "pipe" }
+    ).toString().trim().split("\n")[0].trim();
+    if (whereResult && fs.existsSync(whereResult)) return whereResult;
   } catch (e) {}
 
-  return "pkg";
+  return "npx pkg";
 };
 
 ExeBuilder.prototype.cleanup = function () {