@gavdi/cap-mcp 1.2.0 → 1.2.2

package/lib/annotations/parser.js

@@ -39,19 +39,19 @@ function parseDefinitions(model) {
                 const resourceAnnotation = constructResourceAnnotation(serviceName, target, verifiedAnnotations, def, model);
                 if (!resourceAnnotation)
                     continue;
-                result.set(resourceAnnotation.target, resourceAnnotation);
+                result.set(`${serviceName}.${target}`, resourceAnnotation);
                 continue;
             case "function":
                 const functionAnnotation = constructToolAnnotation(model, serviceName, target, verifiedAnnotations);
                 if (!functionAnnotation)
                     continue;
-                result.set(functionAnnotation.target, functionAnnotation);
+                result.set(`${serviceName}.${target}`, functionAnnotation);
                 continue;
             case "action":
                 const actionAnnotation = constructToolAnnotation(model, serviceName, target, verifiedAnnotations);
                 if (!actionAnnotation)
                     continue;
-                result.set(actionAnnotation.target, actionAnnotation);
+                result.set(`${serviceName}.${target}`, actionAnnotation);
                 continue;
             case "service":
                 const promptsAnnotation = constructPromptAnnotation(serviceName, verifiedAnnotations);
@@ -125,13 +125,17 @@ function parseAnnotations(definition) {
 function constructResourceAnnotation(serviceName, target, annotations, definition, model) {
     if (!(0, utils_1.isValidResourceAnnotation)(annotations))
         return undefined;
+    const entityTarget = `${serviceName}.${target}`;
     const functionalities = (0, utils_1.determineResourceOptions)(annotations);
-    const foreignKeys = new Map(Object.entries(model.definitions?.[`${serviceName}.${target}`].elements ?? {})
+    const foreignKeys = new Map(Object.entries(model.definitions?.[entityTarget].elements ?? {})
         .filter(([_, v]) => v["@odata.foreignKey4"] !== undefined)
         .map(([k, v]) => [k, v["@odata.foreignKey4"]]));
+    const computedFields = new Set(Object.entries(model.definitions?.[entityTarget].elements ?? {})
+        .filter(([_, v]) => new Map(Object.entries(v).map(([key, value]) => [key.toLowerCase(), value])).get("@core.computed"))
+        .map(([k, _]) => k));
     const { properties, resourceKeys } = (0, utils_1.parseResourceElements)(definition, model);
     const restrictions = (0, utils_1.parseCdsRestrictions)(annotations.restrict, annotations.requires);
-    return new structures_1.McpResourceAnnotation(annotations.name, annotations.description, target, serviceName, functionalities, properties, resourceKeys, foreignKeys, annotations.wrap, restrictions);
+    return new structures_1.McpResourceAnnotation(annotations.name, annotations.description, target, serviceName, functionalities, properties, resourceKeys, foreignKeys, annotations.wrap, restrictions, computedFields);
 }
 /**
  * Constructs a tool annotation from parsed annotation data
@@ -193,6 +197,6 @@ function parseBoundOperations(model, serviceName, entityKey, definition, resultR
         const toolAnnotation = constructToolAnnotation(model, serviceName, k, verifiedAnnotations, entityKey, keyParams);
         if (!toolAnnotation)
             continue;
-        resultRef.set(k, toolAnnotation);
+        resultRef.set(`${serviceName}.${entityKey}.${k}`, toolAnnotation);
     }
 }

package/lib/annotations/structures.js

@@ -84,6 +84,8 @@ class McpResourceAnnotation extends McpAnnotation {
     _wrap;
     /** Map of foreign keys property -> associated entity */
     _foreignKeys;
+    /** Set of computed field names */
+    _computedFields;
     /**
      * Creates a new MCP resource annotation
      * @param name - Unique identifier for this resource
@@ -96,14 +98,16 @@ class McpResourceAnnotation extends McpAnnotation {
      * @param foreignKeys - Map of foreign keys used by entity
      * @param wrap - Wrap usage
      * @param restrictions - Optional restrictions based on CDS roles
+     * @param computedFields - Optional set of fields that are computed and should be ignored in create scenarios
      */
-    constructor(name, description, target, serviceName, functionalities, properties, resourceKeys, foreignKeys, wrap, restrictions) {
+    constructor(name, description, target, serviceName, functionalities, properties, resourceKeys, foreignKeys, wrap, restrictions, computedFields) {
         super(name, description, target, serviceName, restrictions ?? []);
         this._functionalities = functionalities;
         this._properties = properties;
         this._resourceKeys = resourceKeys;
         this._wrap = wrap;
         this._foreignKeys = foreignKeys;
+        this._computedFields = computedFields;
     }
     /**
      * Gets the set of enabled OData query functionalities
@@ -139,6 +143,12 @@ class McpResourceAnnotation extends McpAnnotation {
     get wrap() {
         return this._wrap;
     }
+    /**
+     * Gets the computed fields if any are available
+     */
+    get computedFields() {
+        return this._computedFields;
+    }
 }
 exports.McpResourceAnnotation = McpResourceAnnotation;
 /**

package/lib/annotations/utils.js

@@ -322,7 +322,7 @@ function translateOperationRestriction(restrictionType) {
         case "CHANGE":
             return ["UPDATE"];
         case "WRITE":
-            return ["CREATE", "READ", "UPDATE", "DELETE"];
+            return ["CREATE", "UPDATE", "DELETE"];
         case "*":
             return ["CREATE", "READ", "UPDATE", "DELETE"];
         default:

package/lib/auth/factory.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authHandlerFactory = authHandlerFactory;
 exports.errorHandlerFactory = errorHandlerFactory;
 const xsuaa_service_1 = require("./xsuaa-service");
+const utils_1 = require("./utils");
+const logger_1 = require("../logger");
 /** JSON-RPC 2.0 error code for unauthorized requests */
 const RPC_UNAUTHORIZED = 10;
 /* @ts-ignore */
@@ -33,7 +35,8 @@ const cds = global.cds || require("@sap/cds"); // This is a work around for miss
  */
 function authHandlerFactory() {
     const authKind = cds.env.requires.auth.kind;
-    const xsuaaService = new xsuaa_service_1.XSUAAService();
+    const xsuaaService = !(0, utils_1.useMockAuth)(authKind) ? new xsuaa_service_1.XSUAAService() : undefined;
+    logger_1.LOGGER.debug("Authentication kind", authKind);
     return async (req, res, next) => {
         if (!req.headers.authorization && authKind !== "dummy") {
             res.status(401).json({
@@ -48,7 +51,7 @@ function authHandlerFactory() {
         }
         // For XSUAA/JWT auth types, use @sap/xssec for validation
         if ((authKind === "jwt" || authKind === "xsuaa" || authKind === "ias") &&
-            xsuaaService.isConfigured()) {
+            xsuaaService?.isConfigured()) {
             const securityContext = await xsuaaService.createSecurityContext(req);
             if (!securityContext) {
                 res.status(401).json({

package/lib/auth/utils.js

@@ -8,6 +8,7 @@ exports.getAccessRights = getAccessRights;
 exports.registerAuthMiddleware = registerAuthMiddleware;
 exports.hasToolOperationAccess = hasToolOperationAccess;
 exports.getWrapAccesses = getWrapAccesses;
+exports.useMockAuth = useMockAuth;
 const express_1 = __importDefault(require("express"));
 const helmet_1 = __importDefault(require("helmet"));
 const factory_1 = require("./factory");
@@ -480,3 +481,10 @@ function getWrapAccesses(user, restrictions) {
     }
     return access;
 }
+/**
+ * Utility method for checking whether auth used is mocked and not live
+ * @returns boolean
+ */
+function useMockAuth(authKind) {
+    return authKind !== "jwt" && authKind !== "ias" && authKind !== "xsuaa";
+}

package/lib/mcp/entity-tools.js

@@ -344,7 +344,8 @@ function registerCreateTool(resAnno, server, authEnabled) {
     const inputSchema = {};
     for (const [propName, cdsType] of resAnno.properties.entries()) {
         const isAssociation = String(cdsType).toLowerCase().includes("association");
-        if (isAssociation) {
+        const isComputed = resAnno.computedFields?.has(propName);
+        if (isAssociation || isComputed) {
             // Association keys are supplied directly from model loading as of v1.1.2
             continue;
         }
@@ -431,8 +432,9 @@ function registerUpdateTool(resAnno, server, authEnabled) {
     for (const [propName, cdsType] of resAnno.properties.entries()) {
         if (resAnno.resourceKeys.has(propName))
             continue;
+        const isComputed = resAnno.computedFields?.has(propName);
         const isAssociation = String(cdsType).toLowerCase().includes("association");
-        if (isAssociation) {
+        if (isAssociation || isComputed) {
             // Association keys are supplied directly from model loading as of v1.1.2
             continue;
         }

package/package.json

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