Merge pull request #514 from tsedio/fix-missing-dependencies

Fix missing dependencies

Author: Romakita

packages/cli-core/src/packageManagers/PackageManagersModule.ts

@@ -160,4 +160,4 @@ export class PackageManagersModule {
   }
 }
 
-injectable(PackageManagersModule).imports([YarnManager, YarnBerryManager, NpmManager, PNpmManager, BunManager]);
+injectable(PackageManagersModule).imports([YarnBerryManager, YarnManager, NpmManager, PNpmManager, BunManager]);

packages/cli-core/src/packageManagers/index.ts

@@ -2,4 +2,5 @@ export * from "./PackageManagersModule.js";
 export * from "./supports/BaseManager.js";
 export * from "./supports/NpmManager.js";
 export * from "./supports/PNpmManager.js";
+export * from "./supports/YarnBerryManager.js";
 export * from "./supports/YarnManager.js";

packages/cli-core/src/services/CliService.ts

@@ -212,7 +212,8 @@ export class CliService {
       };
 
       if (inputSchema) {
-        const {isValid, errors, value} = validate(data, isArrowFn(inputSchema) ? inputSchema() : inputSchema);
+        const schema = isArrowFn(inputSchema) ? inputSchema() : inputSchema;
+        const {isValid, errors, value} = validate(data, schema);
 
         if (isValid) {
           data = value;

packages/cli-mcp/package.json

@@ -46,7 +46,7 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.19.1",
+    "@modelcontextprotocol/sdk": "^1.25.1",
     "@swc-node/register": "^1.10.9",
     "@swc/core": "1.7.26",
     "@swc/helpers": "^0.5.13",
@@ -69,7 +69,8 @@
     "rxjs": "^7.8.1",
     "semver": "^7.6.3",
     "ts-morph": "27.0.0",
-    "tslib": "^2.7.0"
+    "tslib": "^2.7.0",
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@tsed/typescript": "workspace:*",

packages/cli-mcp/src/fn/defineResource.ts

@@ -1,21 +1,20 @@
-import type {ReadResourceCallback, ResourceMetadata} from "@modelcontextprotocol/sdk/server/mcp.js";
+import type {ReadResourceCallback, ResourceMetadata, ResourceTemplate} from "@modelcontextprotocol/sdk/server/mcp.js";
 import {injectable} from "@tsed/cli-core";
 import {DIContext, injector, logger, runInContext, type TokenProvider} from "@tsed/di";
 import {v4} from "uuid";
 
 type ResourceBaseProps = ResourceMetadata & {
   token?: TokenProvider;
   name: string;
+  handler: ReadResourceCallback;
 };
 
 type ResourceReadProps = ResourceBaseProps & {
   uri: string;
-  handler: ReadResourceCallback;
 };
 
 type ResourceTemplateProps = ResourceBaseProps & {
-  uri: string;
-  handler: ReadResourceCallback;
+  template: ResourceTemplate;
 };
 
 export type ResourceProps = ResourceReadProps | ResourceTemplateProps;

packages/cli-mcp/src/fn/defineTool.spec.ts

@@ -1,4 +1,3 @@
-import {createInjector} from "@tsed/cli-core";
 import {DITest, injector} from "@tsed/di";
 import {s} from "@tsed/schema";
 import {beforeEach, describe, expect, it, vi} from "vitest";
@@ -69,7 +68,7 @@ describe("defineTool", () => {
     const extra = {} as any;
     const result = await instance.handler({param: "value"}, extra);
 
-    expect(result.content[0].text).toBe("Success");
+    expect(result.content[0]).toEqual({type: "text", text: "Success"});
   });
 
   it("should handle JsonSchema inputSchema", () => {

packages/cli-mcp/src/services/McpServerFactory.ts

@@ -1,3 +1,4 @@
+import type {ResourceTemplate} from "@modelcontextprotocol/sdk/server/mcp.js";
 import {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
 import {constant, inject, injectable, logger, type TokenProvider} from "@tsed/di";
 
@@ -21,13 +22,13 @@ export const MCP_SERVER = injectable(McpServer)
 
     tools.map((token) => {
       const {name, handler, ...opts} = inject<ToolProps<any, any>>(token);
-      server.registerTool(name, opts as any, handler);
+      server.registerTool(name, opts as any, handler as any);
     });
 
     const resources = constant<TokenProvider[]>("resources", []);
 
     resources.map((token) => {
-      const {name, uri, template, handler, ...opts} = inject<ResourceProps>(token);
+      const {name, handler, uri, template, ...opts} = inject<ResourceProps & {uri?: string; template: ResourceTemplate}>(token);
 
       server.registerResource(name, (uri || template) as any, opts, handler as any);
     });

packages/cli/package.json

@@ -45,7 +45,7 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.19.1",
+    "@modelcontextprotocol/sdk": "^1.25.1",
     "@npmcli/run-script": "9.0.0",
     "@swc-node/register": "^1.10.9",
     "@swc/core": "1.7.26",
@@ -71,7 +71,8 @@
     "rxjs": "^7.8.1",
     "semver": "^7.6.3",
     "ts-morph": "27.0.0",
-    "tslib": "^2.7.0"
+    "tslib": "^2.7.0",
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@tsed/typescript": "workspace:*",

packages/cli/src/commands/init/config/InitSchema.ts

@@ -11,7 +11,7 @@ import {FeaturesMap, FeatureType} from "../../init/config/FeaturesPrompt.js";
 export const InitSchema = () =>
   s
     .object({
-      root: s.string().required().description("Current working directory to initialize Ts.ED project"),
+      root: s.string().description("Current working directory to initialize Ts.ED project").default("."),
       projectName: s
         .string()
         .optional()

packages/cli/src/commands/mcp/schema/InitMCPSchema.ts

@@ -7,5 +7,5 @@ export const InitMCPSchema = () => {
     .object({
       cwd: s.string().required().description("Current working directory to initialize Ts.ED project")
     })
-    .merge(InitSchema().omit("root", "skipPrompts", "file"));
+    .merge(InitSchema().omit("root", "skipPrompt", "file"));
 };