mick-templates 1.1.5 → 1.1.6

package/bin/cli.js

@@ -2,6 +2,7 @@
 import { spawn } from "child_process";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 import { getUserAgent } from "package-manager-detector";
 
 // Get the directory where this script is located
@@ -20,11 +21,18 @@ if (agent === "bun") {
   command = "bun";
   args = [cliPath, ...process.argv.slice(2)];
 } else {
-  // Use the local tsx from the package's node_modules
-  const isWin = process.platform === "win32";
-  const tsxBin = join(projectRoot, "node_modules", ".bin", "tsx");
-  command = isWin ? `${tsxBin}.cmd` : tsxBin;
-  args = [cliPath, ...process.argv.slice(2)];
+  const require = createRequire(import.meta.url);
+  try {
+    // Try to resolve tsx from the package's dependencies
+    const tsxPath = require.resolve("tsx/cli");
+    command = process.execPath || "node";
+    args = [tsxPath, cliPath, ...process.argv.slice(2)];
+  } catch (_err) {
+    // Fallback to npx if tsx is not resolvable
+    const isWin = process.platform === "win32";
+    command = isWin ? "npx.cmd" : "npx";
+    args = ["tsx", cliPath, ...process.argv.slice(2)];
+  }
 }
 
 // Spawn the command

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mick-templates",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "CLI tool for creating projects from templates",
   "bin": {
     "mick-templates": "bin/cli.js"

package/src/lib/pm.ts

@@ -1,6 +1,9 @@
 import { getUserAgent, resolveCommand } from "package-manager-detector";
 import type { AgentName } from "package-manager-detector";
 import { spawn } from "child_process";
+import { createRequire } from "module";
+import { join, dirname } from "path";
+import { readFile } from "fs/promises";
 
 /**
  * Get the current package manager agent.
@@ -42,6 +45,36 @@ export async function execute(
   args: string[]
 ): Promise<void> {
   const agent = getAgent();
+
+  if (agent === "bun") {
+    await run("bunx", [pkg, ...args], cwd);
+    return;
+  }
+
+  // Try to resolve the package binary from our own dependencies
+  try {
+    const require = createRequire(import.meta.url);
+    const pkgJsonPath = require.resolve(`${pkg}/package.json`);
+    const pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8")) as Record<
+      string,
+      any
+    >;
+
+    let binPath: string | undefined;
+    if (typeof pkgJson.bin === "string") {
+      binPath = join(dirname(pkgJsonPath), pkgJson.bin);
+    } else if (pkgJson.bin && pkgJson.bin[pkg]) {
+      binPath = join(dirname(pkgJsonPath), pkgJson.bin[pkg]);
+    }
+
+    if (binPath) {
+      await run("node", [binPath, ...args], cwd);
+      return;
+    }
+  } catch (_err) {
+    // Fallback to global execute
+  }
+
   const resolved = resolveCommand(agent, "execute", [pkg, ...args]);
   if (!resolved) throw new Error(`Cannot resolve execute command for ${agent}`);