Merge pull request #31 from QuantGeekDev/fix/cli-add-functionality

feat: fix directory validation issue

Author: QuantGeekDev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-framework",
-  "version": "0.1.27",
+  "version": "0.1.28",
 
   "description": "Framework for building Model Context Protocol (MCP) servers in Typescript",
   "type": "module",
@@ -18,7 +18,7 @@
   ],
   "bin": {
     "mcp": "dist/cli/index.js",
-    "mcp-build": "dist/cli/framework/build.js"
+    "mcp-build": "dist/cli/framework/build-cli.js"
   },
   "scripts": {
     "build": "tsc",

src/cli/framework/build-cli.ts

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+import { buildFramework } from './build.js';
+
+if (process.argv[1].endsWith('mcp-build')) {
+    buildFramework().catch(error => {
+        process.stderr.write(`Fatal error: ${error instanceof Error ? error.message : String(error)}\n`);
+        process.exit(1);
+    });
+} 

src/cli/framework/build.ts

@@ -1,36 +1,44 @@
 #!/usr/bin/env node
 import { execa } from "execa";
 import { readFile, writeFile } from "fs/promises";
-import { join } from "path";
-
-process.stderr.write("MCP Build Script Starting...\n");
+import { join, dirname } from "path";
+import { findUp } from 'find-up';
 
 export async function buildFramework() {
+    process.stderr.write("MCP Build Script Starting...\n");
     process.stderr.write("Finding project root...\n");
 
     const startDir = process.cwd();
     process.stderr.write(`Starting search from: ${startDir}\n`);
 
-    if (process.argv.includes('create')) {
-        process.stderr.write(`Skipping build for create command\n`);
-        return;
+    const skipValidation = process.env.MCP_SKIP_VALIDATION === 'true';
+    if (skipValidation) {
+        process.stderr.write(`Skipping dependency validation\n`);
     }
 
     try {
-        const pkgPath = join(startDir, 'package.json');
-        const pkgContent = await readFile(pkgPath, 'utf8');
-        const pkg = JSON.parse(pkgContent);
+        const pkgPath = await findUp('package.json');
+        if (!pkgPath) {
+            throw new Error("Could not find package.json in current directory or any parent directories");
+        }
 
-        if (!pkg.dependencies?.["mcp-framework"]) {
-            throw new Error("This directory is not an MCP project (mcp-framework not found in dependencies)");
+        const projectRoot = dirname(pkgPath);
+        
+        if (!skipValidation) {
+            const pkgContent = await readFile(pkgPath, 'utf8');
+            const pkg = JSON.parse(pkgContent);
+            
+            if (!pkg.dependencies?.["mcp-framework"]) {
+                throw new Error("This directory is not an MCP project (mcp-framework not found in dependencies)");
+            }
         }
 
-        process.stderr.write(`Running tsc in ${startDir}\n`);
+        process.stderr.write(`Running tsc in ${projectRoot}\n`);
 
         const tscCommand = process.platform === 'win32' ? ['npx.cmd', 'tsc'] : ['npx', 'tsc'];
 
         await execa(tscCommand[0], [tscCommand[1]], {
-            cwd: startDir,
+            cwd: projectRoot,
             stdio: "inherit",
             env: {
                 ...process.env,
@@ -39,7 +47,7 @@ export async function buildFramework() {
             }
         });
 
-        const distPath = join(startDir, "dist");
+        const distPath = join(projectRoot, "dist");
         const projectIndexPath = join(distPath, "index.js");
         const shebang = "#!/usr/bin/env node\n";
 
@@ -61,12 +69,4 @@ export async function buildFramework() {
     }
 }
 
-if (import.meta.url.startsWith('file:')) {
-    process.stderr.write("Script running as main module\n");
-    buildFramework().catch(error => {
-        process.stderr.write(`Fatal error: ${error instanceof Error ? error.message : String(error)}\n`);
-        process.exit(1);
-    });
-}
-
 export default buildFramework;

src/cli/project/create.ts

@@ -55,17 +55,17 @@ export async function createProject(name?: string) {
       },
       files: ["dist"],
       scripts: {
-        build: "mcp-build",
+        build: "tsc && mcp-build",
         prepare: "npm run build",
         watch: "tsc --watch",
         start: "node dist/index.js"
       },
       dependencies: {
-        "mcp-framework": "^0.1.27",
+        "mcp-framework": "0.1.28-beta.6"
       },
       devDependencies: {
         "@types/node": "^20.11.24",
-        typescript: "^5.3.3",
+        "typescript": "^5.3.3"
       },
     };
 
@@ -140,14 +140,14 @@ export default ExampleTool;`;
     console.log("Installing dependencies...");
     const npmInstall = spawnSync("npm", ["install"], {
       stdio: "inherit",
-      shell: true,
+      shell: true
     });
 
     if (npmInstall.status !== 0) {
       throw new Error("Failed to install dependencies");
     }
 
-    console.log("Building TypeScript...");
+    console.log("Building project...");
     const tscBuild = await execa('npx', ['tsc'], {
       cwd: projectDir,
       stdio: "inherit",
@@ -157,18 +157,17 @@ export default ExampleTool;`;
       throw new Error("Failed to build TypeScript");
     }
 
-    console.log("Adding shebang...");
-    const mcpBuild = spawnSync("npm", ["run", "build"], {
+    const mcpBuild = await execa('npx', ['mcp-build'], {
+      cwd: projectDir,
       stdio: "inherit",
-      shell: true,
       env: {
         ...process.env,
-        FORCE_COLOR: "1"
+        MCP_SKIP_VALIDATION: "true"
       }
     });
 
-    if (mcpBuild.status !== 0) {
-      throw new Error("Failed to add shebang");
+    if (mcpBuild.exitCode !== 0) {
+      throw new Error("Failed to run mcp-build");
     }
 
     console.log(`

src/cli/utils/validate-project.ts

@@ -1,18 +1,23 @@
-import { access } from "fs/promises";
-import { join } from "path";
+import { readFile } from "fs/promises";
+import { findUp } from 'find-up';
 
 export async function validateMCPProject() {
   try {
-    const packageJsonPath = join(process.cwd(), "package.json");
-    await access(packageJsonPath);
+    const packageJsonPath = await findUp('package.json');
+    
+    if (!packageJsonPath) {
+      throw new Error("Could not find package.json in current directory or any parent directories");
+    }
 
-    const package_json = (
-      await import(packageJsonPath, { assert: { type: "json" } })
-    ).default;
+    const packageJsonContent = await readFile(packageJsonPath, 'utf-8');
+    const package_json = JSON.parse(packageJsonContent);
 
-    if (!package_json.dependencies?.["mcp-framework"]) {
+    if (
+      !package_json.dependencies?.["mcp-framework"] &&
+      !package_json.devDependencies?.["mcp-framework"]
+    ) {
       throw new Error(
-        "This directory is not an MCP project (mcp-framework not found in dependencies)"
+        "This directory is not an MCP project (mcp-framework not found in dependencies or devDependencies)"
       );
     }
   } catch (error) {