@gavdi/cap-mcp 1.0.0 → 1.0.2

package/lib/annotations/constants.js

@@ -25,8 +25,12 @@ exports.MCP_ANNOTATION_PROPS = {
     MCP_TOOL: "@mcp.tool",
     /** Prompt templates annotation for CAP services */
     MCP_PROMPT: "@mcp.prompts",
-    /** Wrapper configuration for exposing entities as tools */
-    MCP_WRAP: "@mcp.wrap",
+    /** Wrapper configuration for exposing entities as tools - tools prop*/
+    MCP_WRAP_TOOLS: "@mcp.wrap.tools",
+    /** Wrapper configuration for exposing entities as tools - modes prop*/
+    MCP_WRAP_MODES: "@mcp.wrap.modes",
+    /** Wrapper configuration for exposing entities as tools - hint prop*/
+    MCP_WRAP_HINT: "@mcp.wrap.hint",
     /** Elicited user input annotation for tools in CAP services */
     MCP_ELICIT: "@mcp.elicit",
 };

package/lib/annotations/parser.js

@@ -22,7 +22,7 @@ function parseDefinitions(model) {
         const def = value;
         const parsedAnnotations = parseAnnotations(def);
         const { serviceName, target } = (0, utils_1.splitDefinitionName)(key);
-        parseBoundOperations(serviceName, target, def, result); // Mutates result map with bound operations
+        parseBoundOperations(model, serviceName, target, def, result); // Mutates result map with bound operations
         if (!parsedAnnotations || !(0, utils_1.containsRequiredAnnotations)(parsedAnnotations)) {
             continue; // This check must occur here, since we do want the bound operations even if the parent is not annotated
         }
@@ -42,13 +42,13 @@ function parseDefinitions(model) {
                 result.set(resourceAnnotation.target, resourceAnnotation);
                 continue;
             case "function":
-                const functionAnnotation = constructToolAnnotation(serviceName, target, verifiedAnnotations);
+                const functionAnnotation = constructToolAnnotation(model, serviceName, target, verifiedAnnotations);
                 if (!functionAnnotation)
                     continue;
                 result.set(functionAnnotation.target, functionAnnotation);
                 continue;
             case "action":
-                const actionAnnotation = constructToolAnnotation(serviceName, target, verifiedAnnotations);
+                const actionAnnotation = constructToolAnnotation(model, serviceName, target, verifiedAnnotations);
                 if (!actionAnnotation)
                     continue;
                 result.set(actionAnnotation.target, actionAnnotation);
@@ -100,9 +100,23 @@ function parseAnnotations(definition) {
             case constants_1.MCP_ANNOTATION_PROPS.MCP_PROMPT:
                 annotations.prompts = v;
                 continue;
-            case constants_1.MCP_ANNOTATION_PROPS.MCP_WRAP:
-                // Wrapper container to expose resources as tools
-                annotations.wrap = v;
+            case constants_1.MCP_ANNOTATION_PROPS.MCP_WRAP_TOOLS:
+                if (!annotations.wrap) {
+                    annotations.wrap = {};
+                }
+                annotations.wrap.tools = v;
+                continue;
+            case constants_1.MCP_ANNOTATION_PROPS.MCP_WRAP_HINT:
+                if (!annotations.wrap) {
+                    annotations.wrap = {};
+                }
+                annotations.wrap.hint = v;
+                continue;
+            case constants_1.MCP_ANNOTATION_PROPS.MCP_WRAP_MODES:
+                if (!annotations.wrap) {
+                    annotations.wrap = {};
+                }
+                annotations.wrap.modes = v;
                 continue;
             case constants_1.MCP_ANNOTATION_PROPS.MCP_ELICIT:
                 annotations.elicit = v;
@@ -144,10 +158,10 @@ function constructResourceAnnotation(serviceName, target, annotations, definitio
  * @param keyParams - Optional key parameters for bound operations
  * @returns Tool annotation or undefined if invalid
  */
-function constructToolAnnotation(serviceName, target, annotations, entityKey, keyParams) {
+function constructToolAnnotation(model, serviceName, target, annotations, entityKey, keyParams) {
     if (!(0, utils_1.isValidToolAnnotation)(annotations))
         return undefined;
-    const { parameters, operationKind } = (0, utils_1.parseOperationElements)(annotations);
+    const { parameters, operationKind } = (0, utils_1.parseOperationElements)(annotations, model);
     const restrictions = (0, utils_1.parseCdsRestrictions)(annotations.restrict, annotations.requires);
     return new structures_1.McpToolAnnotation(annotations.name, annotations.description, target, serviceName, parameters, entityKey, operationKind, keyParams, restrictions, annotations.elicit);
 }
@@ -170,7 +184,7 @@ function constructPromptAnnotation(serviceName, annotations) {
  * @param definition - CSN entity definition containing bound operations
  * @param resultRef - Map to store parsed annotations (mutated by this function)
  */
-function parseBoundOperations(serviceName, entityKey, definition, resultRef) {
+function parseBoundOperations(model, serviceName, entityKey, definition, resultRef) {
     if (definition.kind !== "entity")
         return;
     const boundOperations = definition
@@ -192,7 +206,7 @@ function parseBoundOperations(serviceName, entityKey, definition, resultRef) {
             continue;
         }
         const verifiedAnnotations = parsedAnnotations;
-        const toolAnnotation = constructToolAnnotation(serviceName, k, verifiedAnnotations, entityKey, keyParams);
+        const toolAnnotation = constructToolAnnotation(model, serviceName, k, verifiedAnnotations, entityKey, keyParams);
         if (!toolAnnotation)
             continue;
         resultRef.set(k, toolAnnotation);

package/lib/annotations/utils.js

@@ -156,7 +156,7 @@ function determineResourceOptions(annotations) {
 function parseResourceElements(definition) {
     const properties = new Map();
     const resourceKeys = new Map();
-    for (const [key, value] of Object.entries(definition.elements)) {
+    for (const [key, value] of Object.entries(definition.elements || {})) {
         if (!value.type)
             continue;
         const parsedType = value.type.replace("cds.", "");
@@ -175,12 +175,22 @@ function parseResourceElements(definition) {
  * @param annotations - The annotation structure to parse
  * @returns Object containing parameters and operation kind
  */
-function parseOperationElements(annotations) {
+function parseOperationElements(annotations, model) {
     let parameters;
     const params = annotations.definition["params"];
     if (params && Object.entries(params).length > 0) {
         parameters = new Map();
         for (const [k, v] of Object.entries(params)) {
+            if (typeof v.type !== "string") {
+                // const references = v.type.ref;
+                // const typeReference =
+                //   model.definitions?.[references[0]].elements[references[1]];
+                // parameters.set(k, typeReference?.type?.replace("cds.", "") as string);
+                const referencedType = parseTypedReference(v.type, model);
+                parameters.set(k, referencedType);
+                logger_1.LOGGER.debug("Typed reference found", referencedType);
+                continue;
+            }
             parameters.set(k, v.type.replace("cds.", ""));
         }
     }
@@ -189,6 +199,22 @@ function parseOperationElements(annotations) {
         operationKind: annotations.definition.kind,
     };
 }
+/**
+ * Recursively digs through the typed reference object of an operation parameter.
+ * @param param
+ * @param model
+ * @returns string|undefined
+ * @throws Error if nested type is not parseable
+ */
+function parseTypedReference(param, model) {
+    if (!param || !param.ref) {
+        throw new Error("Failed to parse nested type reference");
+    }
+    const referenceType = model.definitions?.[param.ref[0]].elements[param.ref[1]];
+    return typeof referenceType?.type === "string"
+        ? referenceType.type?.replace("cds.", "")
+        : parseTypedReference(referenceType?.type, model);
+}
 /**
  * Parses entity keys from a definition
  * @param definition - The definition to parse keys from

package/lib/mcp/factory.js

@@ -51,7 +51,8 @@ function createMcpServer(config, annotations) {
             const localWrap = entry.wrap?.tools;
             const enabled = localWrap === true || (localWrap === undefined && globalWrap);
             if (enabled) {
-                const modes = config.wrap_entity_modes ?? ["query", "get"];
+                const modes = entry.wrap?.modes ??
+                    config.wrap_entity_modes ?? ["query", "get"];
                 (0, entity_tools_1.registerEntityWrappers)(entry, server, authEnabled, modes, accesses);
             }
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gavdi/cap-mcp",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "MCP Pluging for CAP",
   "keywords": [
     "MCP",