@cap-js/ord 1.4.5 → 1.6.0

package/README.md

@@ -231,6 +231,20 @@ const ord = cds.compile.to.ord(csn);
 
 Build all ord related documents, including ordDocument and services resources files:
 
+
+##### Supported Options
+
+1. **workers**:
+    * **Description**: Max number of workers to use during execution
+    * **Supported Values**:
+       * _**workers=N**_ - max number of N (int) workers (e.g. 2 workers => _**workers=2**_)
+       * _**workers=NC**_ - max N (int/float) workers per CPU core (e.g. max 5 workers on a 2 core machine, max 10 workers on a 4 core machine => _**workers=2.5C**_)
+    * **Default Value**: max 1 worker per every 2 CPU cores => _**workers=0.5C**_
+    * **Usage Examples**:
+      * `cds build --for ord --opts 'workers=2'`
+      * `cds build --for ord --opts 'workers=2.5C'`
+      * `cds build --for ord --opts 'workers=0.5C'` (equivalent to `cds build --for ord`)
+
 ```sh
 cds build --for ord
 

package/cds-plugin.js

@@ -4,17 +4,7 @@ if (cds.cli.command === "build") {
     cds.build?.register?.("ord", require("./lib/build"));
 }
 
-function _lazyRegisterCompileTarget() {
-    const ord = require("./lib/index").ord;
-    Object.defineProperty(this, "ord", { ord });
-    return ord;
-}
-
-const registerORDCompileTarget = () => {
-    Object.defineProperty(cds.compile.to, "ord", {
-        get: _lazyRegisterCompileTarget,
-        configurable: true,
-    });
-};
-
-registerORDCompileTarget();
+Object.defineProperty(cds.compile.to, "ord", {
+    configurable: true,
+    get: () => (model) => require("./lib/index").ord(model, []),
+});

package/lib/auth/mtls-endpoint-service.js

@@ -5,7 +5,7 @@
  * from external configuration endpoints and merge with static configuration.
  */
 
-/* global AbortController */
+/* global AbortController */ // eslint-disable-line no-redeclare
 
 const { HTTP_CONFIG } = require("../constants");
 
@@ -48,7 +48,7 @@ async function fetchMtlsCertInfo(endpoint, timeoutMs) {
     } catch (error) {
         clearTimeout(timeoutId);
         if (error.name === "AbortError") {
-            throw new Error(`Request timeout after ${timeoutMs}ms`);
+            throw new Error(`Request timeout after ${timeoutMs}ms`, { cause: error });
         }
         throw error;
     }

package/lib/build.js

@@ -1,83 +1,59 @@
-const cds = require("@sap/cds");
 const path = require("path");
+const cds = require("@sap/cds");
 const _ = require("lodash");
-const { ord, getMetadata } = require("./index");
+const Piscina = require("piscina");
 const cliProgress = require("cli-progress");
-const { BUILD_DEFAULT_PATH, ORD_SERVICE_NAME, ORD_DOCUMENT_FILE_NAME } = require("./constants");
-const { isMCPPluginInPackageJson } = require("./mcpAdapter");
 
-const { BuildError } = cds.build;
+const os = require("os");
+const { ord } = require("./index");
+const registerCompileTargets = require("./common/register-compile-targets");
+const { BUILD_DEFAULT_PATH, ORD_DOCUMENT_FILE_NAME } = require("./constants");
 
 module.exports = class OrdBuildPlugin extends cds.build.Plugin {
     static taskDefaults = { src: cds.env.folders.srv };
 
     init() {
-        if (this.task.dest === undefined) {
-            this.task.dest = path.join(cds.root, BUILD_DEFAULT_PATH);
-        }
+        this.task.dest = this.task.dest ?? path.join(cds.root, BUILD_DEFAULT_PATH);
+    }
+
+    async build() {
+        registerCompileTargets();
+
+        return this.model()
+            .then((model) => ({ model, document: ord(model) }))
+            .then(({ model, document }) =>
+                Promise.all([
+                    this.write(this._postProcess(document)).to(ORD_DOCUMENT_FILE_NAME),
+                    this._generateResourcesFiles(model, [
+                        ...(document.apiResources || []),
+                        ...(document.eventResources || []),
+                    ]),
+                ]),
+            )
+            .catch((error) => {
+                throw new cds.build.BuildError(`ORD build failed: ${error.message}`);
+            });
     }
 
-    _createProgressBar(totalFiles) {
-        const progressBar = new cliProgress.SingleBar({
+    _createProgressBar() {
+        return new cliProgress.SingleBar({
             format: "Processing resourcesFiles [{bar}] {percentage}% | {value}/{total} | ETA: {eta}s",
             barCompleteChar: "█",
             barIncompleteChar: "░",
             stopOnComplete: true,
         });
-        progressBar.start(totalFiles, 0);
-        return progressBar;
     }
 
-    _countTotalFiles(resObj) {
-        return resObj.reduce((total, resource) => {
-            if (!resource.ordId.includes(ORD_SERVICE_NAME) && resource.resourceDefinitions) {
-                return total + resource.resourceDefinitions.length;
-            }
-            return total;
-        }, 0);
-    }
+    _postProcess(document) {
+        const clone = _.cloneDeep(document);
 
-    async _writeResourcesFiles(resObj, model, promises) {
-        const totalFiles = this._countTotalFiles(resObj);
-        const progressBar = this._createProgressBar(totalFiles);
-        let completed = 0;
-
-        try {
-            for (const resource of resObj) {
-                const shouldGenerate = resource.resourceDefinitions || isMCPPluginInPackageJson();
-                if (!shouldGenerate) continue;
-
-                for (const resourceDefinition of resource.resourceDefinitions) {
-                    const { _, response } = await getMetadata(resourceDefinition.url, model); // eslint-disable-line no-unused-vars
-                    const fileName = path
-                        .join(resource.ordId, resourceDefinition.url.split("/").pop())
-                        .replace(/:/g, "_");
-                    promises.push(this.write(response).to(fileName));
-                    progressBar.update(++completed);
-                }
-            }
-            await Promise.all(promises);
-        } finally {
-            progressBar.stop();
-        }
-    }
+        [...(clone.apiResources || []), ...(clone.eventResources || [])]
+            .flatMap((resource) => resource.resourceDefinitions || [])
+            .forEach((resourceDefinition) => {
+                resourceDefinition.url = this._createRelativePath(resourceDefinition.url);
+            });
 
-    postProcess(ordDocument) {
-        const clonedOrdDocument = _.cloneDeep(ordDocument);
-        const _updateResourceUrls = (resources) => {
-            for (const resource of resources || []) {
-                if (resource.resourceDefinitions) {
-                    for (const resourceDefinition of resource.resourceDefinitions) {
-                        resourceDefinition.url = this._createRelativePath(resourceDefinition.url);
-                    }
-                }
-            }
-        };
-
-        _updateResourceUrls(clonedOrdDocument.apiResources);
-        _updateResourceUrls(clonedOrdDocument.eventResources);
-
-        return clonedOrdDocument;
+        return clone;
     }
 
     _createRelativePath(url) {
@@ -86,34 +62,42 @@ module.exports = class OrdBuildPlugin extends cds.build.Plugin {
         return path.join(...relative.replace(/:/g, "_").split("/"));
     }
 
-    async build() {
-        // @cap-js/graphql registers protocols and compile targets at runtime via cds-plugin.js,
-        // but cds build rebuilds cds.env afterwards, losing both registrations.
-        // Re-apply so endpoints4() and cds.compile.to.graphql work during build.
-        if ("@cap-js/graphql" in cds.env.plugins && !cds.env.protocols?.graphql) {
-            cds.env.protocols.graphql = { path: "/graphql", impl: "@cap-js/graphql" };
-            require("@cap-js/graphql/lib/api").registerCompileTargets();
-        }
-
-        try {
-            const model = await this.model();
-            const ordDocument = ord(model);
-            const postProcessedOrdDocument = this.postProcess(ordDocument);
-
-            const promises = [];
-            promises.push(this.write(postProcessedOrdDocument).to(ORD_DOCUMENT_FILE_NAME));
-
-            if (ordDocument.apiResources?.length > 0) {
-                await this._writeResourcesFiles(ordDocument.apiResources, model, promises);
-            }
-
-            if (ordDocument.eventResources?.length > 0) {
-                await this._writeResourcesFiles(ordDocument.eventResources, model, promises);
-            }
-
-            return Promise.all(promises);
-        } catch (error) {
-            throw new BuildError(`ORD build failed: ${error.message}`);
-        }
+    _createWorkerPool(tasks, model) {
+        const size = cds.cli?.options?.taskOptions?.workers || os.availableParallelism();
+        const maxThreads = Math.ceil(Number(size) || os.availableParallelism() * Number(size.replace(/C$/i, "")));
+
+        return new Piscina({
+            filename: path.join(__dirname, "threads", "compile.js"),
+            workerData: { model: JSON.parse(JSON.stringify(model)) },
+            minThreads: Math.min(tasks, maxThreads, Math.ceil(os.availableParallelism() * 1.5)),
+            maxThreads: Math.min(tasks, maxThreads, Math.ceil(os.availableParallelism() * 1.5)),
+        });
+    }
+
+    _extractCompileTasks(resources) {
+        return resources
+            .filter(({ resourceDefinitions }) => !!resourceDefinitions)
+            .flatMap(({ ordId, resourceDefinitions }) => resourceDefinitions.map(({ url }) => ({ url, ordId })));
+    }
+
+    _generateResourcesFiles(model, resources) {
+        const progressBar = this._createProgressBar();
+        const tasks = this._extractCompileTasks(resources);
+        const pool = !tasks.length ? null : this._createWorkerPool(tasks.length, model);
+
+        progressBar.start(tasks.length, 0);
+
+        return Promise.all(
+            tasks.map(({ url, ordId }) =>
+                pool.run({ url }).then((response) =>
+                    this.write(response)
+                        .to(path.join(ordId, url.split("/").pop()).replace(/:/g, "_"))
+                        .then(() => progressBar.increment()),
+                ),
+            ),
+        ).finally(() => {
+            progressBar.stop();
+            return pool?.close({ force: true });
+        });
     }
 };

package/lib/common/register-compile-targets.js

@@ -0,0 +1,31 @@
+const cds = require("@sap/cds");
+const Logger = require("../logger");
+
+const PROTOCOL_PROVIDERS = Object.freeze({
+    ["@cap-js/mcp"]: "mcp",
+    ["@cap-js/graphql"]: "graphql",
+});
+
+module.exports = () => {
+    // Plugins like @cap-js/mcp and @cap-js/graphql register protocols and compile targets
+    // at runtime via cds-plugin.js, but cds build rebuilds cds.env afterward, losing both
+    // registrations. Re-apply so that compilation works accordingly during build and runtime.
+
+    Object.keys(cds.env.plugins || {})
+        .filter((plugin) => plugin !== "@cap-js/ord")
+        .forEach((plugin) => {
+            try {
+                const protocol = PROTOCOL_PROVIDERS[plugin];
+
+                require(`${plugin}/lib/api`)?.registerCompileTargets?.();
+                cds.env.protocols = {
+                    ...cds.env.protocols,
+                    ...(!protocol || cds.env.protocols?.[protocol]
+                        ? {}
+                        : { [protocol]: { path: `/${protocol}`, impl: plugin } }),
+                };
+            } catch (error) {
+                Logger.warn(`Failed to register compile targets for ${plugin}: ${error}`);
+            }
+        });
+};

package/lib/constants.js

@@ -116,7 +116,7 @@ const SHORT_DESCRIPTION_PREFIX = "Short description of ";
 const SEM_VERSION_REGEX =
     /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
 
-const MCP_CUSTOM_TYPE = "sap:mcp-server-card:v0";
+const MCP_RESOURCE_DEFINITION_TYPE = "sap:mcp-server-card:v0";
 
 const EXTERNAL_DP_ORD_ID_ANNOTATION = "@cds.dp.ordId";
 
@@ -132,6 +132,7 @@ const ORD_API_PROTOCOL = Object.freeze({
     GRAPHQL: "graphql",
     SAP_INA: "sap-ina-api-v1",
     SAP_DATA_SUBSCRIPTION: "sap.dp:data-subscription-api:v1",
+    MCP: "mcp",
 });
 
 // Mapping from CAP protocol kind to ORD apiProtocol
@@ -200,7 +201,7 @@ module.exports = {
     EXTERNAL_SERVICE_ANNOTATION,
     INTEGRATION_DEPENDENCY_RESOURCE_NAME,
     LEVEL,
-    MCP_CUSTOM_TYPE,
+    MCP_RESOURCE_DEFINITION_TYPE,
     OPEN_RESOURCE_DISCOVERY_VERSION,
     OPENAPI_SERVERS_ANNOTATION,
     ORD_ACCESS_STRATEGY,

package/lib/{extendOrdWithCustom.js → extend-ord-with-custom.js}

@@ -20,37 +20,7 @@ function patchGeneratedOrdResources(destinationObj, sourceObj) {
     const destObj = _.keyBy(destinationObj, CONTENT_MERGE_KEY);
     const srcObj = _.keyBy(sourceObj, CONTENT_MERGE_KEY);
 
-    // Helper: extract MCP merge logic for clarity & reuse
-    const mergeMCPResource = (ordId, existingKey) => {
-        const baseKey = ordId in destObj ? ordId : existingKey;
-        if (baseKey) {
-            const base = structuredClone(destObj[baseKey]);
-            const override = structuredClone(srcObj[ordId]);
-            const merged = {
-                ...base, // preserve generated structural fields
-                ...override, // overlay custom changes
-                apiProtocol: "mcp", // enforce protocol
-                partOfPackage: base.partOfPackage || override.partOfPackage,
-                resourceDefinitions: base.resourceDefinitions || override.resourceDefinitions,
-            };
-            if (baseKey !== ordId) delete destObj[baseKey];
-            destObj[ordId] = merged;
-        } else {
-            // MCP plugin not available: do not introduce brand-new MCP resource purely from custom file
-            // This preserves contract: MCP resource only exists when plugin is available.
-            // Silently skip or log (warn) to avoid test noise.
-            // Logger.warn could be added here if desired.
-            return; // skip adding
-        }
-    };
-
-    const existingMCPKey = Object.keys(destObj).find((k) => destObj[k]?.apiProtocol === "mcp");
-
     for (const ordId in srcObj) {
-        if (ordId.endsWith(":apiResource:mcp-server:v1")) {
-            mergeMCPResource(ordId, existingMCPKey);
-            continue;
-        }
         destObj[ordId] =
             ordId in destObj
                 ? _.assignWith(structuredClone(destObj[ordId]), structuredClone(srcObj[ordId]))
@@ -92,13 +62,7 @@ function getCustomORDContent(appConfig) {
     return require(pathToCustomORDContent);
 }
 
-function extendCustomORDContentIfExists(appConfig, ordContent) {
-    const customORDContent = getCustomORDContent(appConfig);
-    return customORDContent
-        ? compareAndHandleCustomORDContentWithExistingContent(ordContent, customORDContent)
-        : ordContent;
-}
-
 module.exports = {
-    extendCustomORDContentIfExists,
+    getCustomORDContent,
+    compareAndHandleCustomORDContentWithExistingContent,
 };

package/lib/index.js

@@ -7,5 +7,5 @@
  */
 module.exports = {
     ord: require("./ord.js"),
-    getMetadata: require("./metaData.js"),
+    getMetadata: require("./meta-data.js"),
 };

package/lib/{interopCsn.js → interop-csn.js}

@@ -73,7 +73,7 @@ function remove_localized_assoc(csn) {
     // - name is "localized"
     // - type is "cds.Association"
     // - target name is source name + ".texts"
-    // - there is an ON condition 
+    // - there is an ON condition
     for (let n1 in csn.definitions) {
         let def = csn.definitions[n1];
         if (def.kind === "entity")
@@ -132,10 +132,18 @@ function map_annotations(csn) {
 function add_meta_info(csn) {
     if (typeof csn != "object") return csn; // needed to make tests pass
     csn["csnInteropEffective"] = "1.0";
-    csn.meta ??= {};
+    csn.meta ??= {};  // ensure there is a meta section
+
+    // Keep only the properties of csn.meta that are relevant for interop:
+    //   "flavor", "document", "features", and private extension names (starting with "__")
+    // Remove everything else, including "creator" (leaks build details) and
+    // any unknown compiler-added properties (e.g. "compilerCsnFlavor").
+    for (let k in csn.meta) {
+        if (!["flavor", "document", "features"].includes(k) && !k.startsWith("__")) {
+            delete csn.meta[k];
+        }
+    }
     csn.meta.flavor = "effective";
-    // Remove compiler creator information – not relevant for ORD interop and leaks build details
-    if (csn.meta.creator) delete csn.meta.creator;
 
     let services = Object.entries(csn.definitions).filter(([, def]) => def.kind === "service");
     if (services.length === 1) {
@@ -157,5 +165,5 @@ function add_meta_info(csn) {
 }
 
 module.exports = {
-    interopCSN,
+    interopCSN
 };

package/lib/meta-data.js

@@ -0,0 +1,90 @@
+const path = require("path");
+const cds = require("@sap/cds/lib");
+const assert = require("node:assert");
+const cdsc = require("@sap/cds-compiler/lib/main");
+const { compile: openapi } = require("@cap-js/openapi");
+const { compile: asyncapi } = require("@cap-js/asyncapi");
+
+const Logger = require("./logger");
+const { interopCSN } = require("./interop-csn.js");
+const { COMPILER_TYPES, OPENAPI_SERVERS_ANNOTATION } = require("./constants");
+
+function extractServiceName(url) {
+    return path.basename(url, ".json").split(".").slice(0, -1).join(".");
+}
+
+function extractCompilerType(url) {
+    return path.basename(url, ".json").split(".").pop();
+}
+
+const compilers = Object.freeze({
+    [COMPILER_TYPES.csn]: function (csn, options) {
+        return {
+            contentType: "application/json",
+            response: interopCSN(
+                cdsc.for.effective(csn, { beta: { effectiveCsn: true }, effectiveServiceName: options.service }),
+            ),
+        };
+    },
+    [COMPILER_TYPES.mcp]: async function (csn, options) {
+        return {
+            contentType: "application/json",
+            response: cds.compile(csn).to["mcp"]({ ...options, ...(cds.env.ord?.compileOptions?.mcp || {}) }),
+        };
+    },
+    [COMPILER_TYPES.oas3]: function (csn, options) {
+        // Check for service-level @OpenAPI.servers annotation
+        const servers = csn?.definitions?.[options.service]?.[OPENAPI_SERVERS_ANNOTATION];
+        const openapiOptions = { ...options, ...(cds.env?.ord?.compileOptions?.openapi || {}) };
+
+        // Service-level annotation takes precedence over global config
+        if (Array.isArray(servers) && servers.length) {
+            openapiOptions["openapi:servers"] = JSON.stringify(servers);
+        }
+
+        return {
+            contentType: "application/json",
+            response: openapi(csn, openapiOptions),
+        };
+    },
+    [COMPILER_TYPES.edmx]: function (csn, options) {
+        return {
+            contentType: "application/xml",
+            response: cds
+                .compile(csn)
+                .to["edmx"]({ ...options, ...(cds.env?.ord?.compileOptions?.edmx || {}) }),
+        };
+    },
+    [COMPILER_TYPES.graphql]: function (csn, options) {
+        const { generateSchema4 } = require("@cap-js/graphql/lib/schema");
+        const { printSchema, lexicographicSortSchema } = require("graphql");
+        const srv = new cds.ApplicationService(options.service, cds.linked(csn));
+
+        return {
+            contentType: "text/plain",
+            response: printSchema(lexicographicSortSchema(generateSchema4({ [options.service]: srv }))),
+        };
+    },
+    [COMPILER_TYPES.asyncapi2]: function (csn, options) {
+        return {
+            contentType: "application/json",
+            response: asyncapi(csn, { ...options, ...(cds.env?.ord?.compileOptions?.asyncapi || {}) }),
+        };
+    },
+});
+
+module.exports = async (url, model = null) => {
+    const name = extractServiceName(url);
+    const type = extractCompilerType(url);
+    const csn = model || cds.services[name]?.model;
+    const options = { service: name, as: "str", messages: [] };
+
+    assert(Object.hasOwn(compilers, type), `Unsupported format: ${type}`);
+
+    try {
+        return await compilers[type](csn, options);
+    } catch(error) {
+        Logger.error(`Compilation failed for service ${name} (compiler: ${type}) - ${error.message}`);
+        throw error;
+    }
+};

package/lib/ord.js

@@ -11,14 +11,15 @@ const {
     createEntityTypeMappingsItemTemplate,
     createEventResourceTemplate,
     createGroupsTemplateForService,
-    createMCPAPIResourceTemplate,
     _propagateORDVisibility,
 } = require("./templates");
-const { getIntegrationDependencies } = require("./integrationDependency");
-const { extendCustomORDContentIfExists } = require("./extendOrdWithCustom");
+const { getIntegrationDependencies } = require("./integration-dependency");
+const {
+    getCustomORDContent,
+    compareAndHandleCustomORDContentWithExistingContent,
+} = require("./extend-ord-with-custom");
 const { getRFC3339Date } = require("./date");
 const { createAuthConfig } = require("./auth/authentication");
-const { isMCPPluginReady } = require("./mcpAdapter");
 
 const Logger = require("./logger");
 const _ = require("lodash");
@@ -26,24 +27,6 @@ const cds = require("@sap/cds");
 const defaults = require("./defaults");
 const path = require("path");
 
-const _addMCPResourceIfAvailable = (apiResources, appConfig, packageIds, accessStrategies) => {
-    // Use comprehensive check for MCP plugin readiness
-    const shouldAddMCP = isMCPPluginReady();
-    if (shouldAddMCP) {
-        try {
-            const mcpResources = createMCPAPIResourceTemplate(appConfig, packageIds, accessStrategies);
-            // Handle both array and single object responses from MCP plugin
-            if (Array.isArray(mcpResources)) {
-                apiResources.push(...mcpResources);
-            } else if (mcpResources) {
-                apiResources.push(mcpResources);
-            }
-        } catch (error) {
-            Logger.warn("Failed to create MCP API resource:", error.message);
-        }
-    }
-};
-
 const initializeAppConfig = (csn) => {
     const packageJson = _loadPackageJson();
     const packageName = packageJson.name;
@@ -261,9 +244,6 @@ const _getAPIResources = (csn, appConfig, packageIds, accessStrategies) => {
         ),
     );
 
-    // Conditionally add MCP API resource if plugin is available
-    _addMCPResourceIfAvailable(apiResources, appConfig, packageIds, accessStrategies);
-
     return apiResources;
 };
 
@@ -344,7 +324,7 @@ function _filterUnusedPackages(ordDocument) {
     return ordDocument.packages.filter((pkg) => usedPackageIds.has(pkg.ordId));
 }
 
-module.exports = (csn) => {
+module.exports = (csn, extensions = []) => {
     const linkedCsn = _propagateORDVisibility(cds.linked(csn));
     const appConfig = initializeAppConfig(linkedCsn);
 
@@ -381,7 +361,12 @@ module.exports = (csn) => {
         ordDocument.integrationDependencies = integrationDependencies;
     }
 
-    ordDocument = extendCustomORDContentIfExists(appConfig, ordDocument);
+    [...(extensions || []), getCustomORDContent(appConfig)]
+        .filter((extension) => !!extension)
+        .forEach((extension) => {
+            ordDocument = compareAndHandleCustomORDContentWithExistingContent(ordDocument, extension);
+        });
+
     ordDocument.packages = _filterUnusedPackages(ordDocument);
 
     return ordDocument;

package/lib/services/mtx-ord-provider-service.cds

@@ -0,0 +1,21 @@
+@protocol: 'rest'
+@requires: [ 'internal-user' ]
+@path: '/-/cds/ord-provider-service'
+@impl:'@cap-js/ord/lib/services/mtx-ord-provider-service.js'
+service cds.xt.ord.MtxOrdProviderService {
+
+  action getOrdDocument(
+    tenant    : String,
+    @cds.validate: false
+    toggles   : array of String,
+    for       : String enum { nodejs; java; },
+  ) returns {};
+
+  action getOrdResourceDefinition(
+    tenant    : String,
+    @cds.validate: false
+    toggles   : array of String,
+    for       : String enum { nodejs; java; },
+    resource  : String,
+  ) returns LargeString;
+}

package/lib/services/mtx-ord-provider-service.js

@@ -0,0 +1,39 @@
+const cds = require("@sap/cds/lib");
+const { ord, getMetadata } = require("@cap-js/ord/lib");
+
+module.exports = class MtxOrdProviderService extends cds.ApplicationService {
+    init() {
+        this.on("getOrdDocument", async (req) => {
+            req._?.res?.set("Content-Type", "application/json");
+
+            return ord(
+                await (
+                    await cds.connect.to("cds.xt.ModelProviderService")
+                ).getCsn({
+                    for: req.data.for,
+                    tenant: req.data.tenant,
+                    toggles: req.data.toggles,
+                }),
+            );
+        });
+
+        this.on("getOrdResourceDefinition", async (req) => {
+            const { response, contentType } = await getMetadata(
+                req.data.resource,
+                await (
+                    await cds.connect.to("cds.xt.ModelProviderService")
+                ).getCsn({
+                    for: req.data.for,
+                    tenant: req.data.tenant,
+                    toggles: req.data.toggles,
+                }),
+            );
+
+            req._?.res?.set("Content-Type", contentType);
+
+            return response;
+        });
+
+        return super.init();
+    }
+};

package/lib/{ord-service.js → services/ord-service.js}

@@ -1,12 +1,21 @@
 const cds = require("@sap/cds");
-const ord = require("./ord.js");
-const getMetadata = require("./metaData.js");
-const defaults = require("./defaults.js");
-const { createAuthConfig, createAuthMiddleware } = require("./auth/authentication.js");
-const Logger = require("./logger.js");
+
+const ord = require("../ord.js");
+const Logger = require("../logger.js");
+const defaults = require("../defaults.js");
+const compileMetadata = require("../meta-data.js");
+const { createAuthConfig, createAuthMiddleware } = require("../auth/authentication.js");
 
 class OpenResourceDiscoveryService extends cds.ApplicationService {
     async init() {
+        this.extensions = {};
+
+        cds.on("ord.extension.publish", ({ id, data }) => {
+            Logger.info(`Registering extension with id ${id}...`);
+
+            this.extensions[id] = data;
+        });
+
         // Initialize authentication configuration from .cdsrc.json or environment variables
         // CF mTLS validator is lazily initialized on first mTLS request
         const authConfig = createAuthConfig();
@@ -23,7 +32,7 @@ class OpenResourceDiscoveryService extends cds.ApplicationService {
 
         cds.app.get(`/ord/v1/documents/ord-document`, authMiddleware, async (_, res) => {
             const csn = cds.context?.model || cds.model;
-            const data = ord(csn);
+            const data = ord(csn, Array.from(Object.values(this.extensions)));
             return res.status(200).send(data);
         });
 
@@ -34,7 +43,7 @@ class OpenResourceDiscoveryService extends cds.ApplicationService {
         // Handler for metadata requests (oas3, edmx, csn, etc.)
         const metadataHandler = async (req, res) => {
             try {
-                const { contentType, response } = await getMetadata(req.url);
+                const { contentType, response } = await compileMetadata(req.url);
                 return res.status(200).contentType(contentType).send(response);
             } catch (error) {
                 Logger.error(error, "Error while processing the resource definition document");

package/lib/templates.js

@@ -1,5 +1,4 @@
 const { hasSAPPolicyLevel } = require("./utils");
-const { isMCPPluginReady } = require("./mcpAdapter");
 const defaults = require("./defaults");
 const _ = require("lodash");
 const {
@@ -9,7 +8,6 @@ const {
     DESCRIPTION_PREFIX,
     ENTITY_RELATIONSHIP_ANNOTATION,
     LEVEL,
-    MCP_CUSTOM_TYPE,
     ORD_EXTENSIONS_PREFIX,
     ORD_ODM_ENTITY_NAME_ANNOTATION,
     ORD_RESOURCE_TYPE,
@@ -21,6 +19,7 @@ const {
     CONTENT_MERGE_KEY,
     CDS_ELEMENT_KIND,
     ORD_API_PROTOCOL,
+    MCP_RESOURCE_DEFINITION_TYPE,
 } = require("./constants");
 const Logger = require("./logger");
 const { ensureAccessStrategies } = require("./access-strategies");
@@ -348,6 +347,10 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
                 resourceDefinitions = [
                     _getResourceDefinition("openapi-v3", "json", ordId, serviceName, "oas3.json", accessStrategies),
                 ];
+            } else if (apiProtocol === ORD_API_PROTOCOL.MCP) {
+                resourceDefinitions = [
+                    _getResourceDefinition(MCP_RESOURCE_DEFINITION_TYPE, "json", ordId, serviceName, "mcp.json", accessStrategies),
+                ];
             } else if (apiProtocol === ORD_API_PROTOCOL.GRAPHQL) {
                 // GraphQL only has GraphQL SDL
                 resourceDefinitions = [
@@ -584,107 +587,6 @@ function _getPackageID(namespace, packageIds, resourceType, visibility = RESOURC
     return packageIds.find((id) => id.includes(`-${resourceType}-`)) || packageIds.find((id) => id.includes(namespace));
 }
 
-/**
- * Helper function to create a single MCP API resource.
- *
- * @param {object} metadata - The MCP metadata object.
- * @param {object} appConfig - The application configuration.
- * @param {Array} packageIds - The available package identifiers.
- * @param {Array} accessStrategies - The array of accessStrategies objects.
- * @returns {Object} An MCP API resource object.
- */
-function createSingleMCPResource(metadata, appConfig, packageIds, accessStrategies) {
-    const visibility = metadata?.visibility || RESOURCE_VISIBILITY.public;
-
-    // Generate ordId based on visibility
-    let resourceId;
-    if (visibility === RESOURCE_VISIBILITY.public) {
-        resourceId = "mcp-server"; // Default public resource
-    } else {
-        resourceId = `mcp-server-${visibility}`; // mcp-server-internal, mcp-server-private
-    }
-
-    const ordId = `${appConfig.ordNamespace}:apiResource:${resourceId}:v1`;
-
-    // Use metadata with proper fallbacks
-    const title = metadata?.title || `MCP Server for ${appConfig.appName}`;
-    const shortDescription =
-        metadata?.shortDescription || `This is the MCP server to interact with the ${appConfig.appName}`;
-    const description = metadata?.description || `This is the MCP server to interact with the ${appConfig.appName}`;
-    const version = metadata?.version || "1.0.0";
-
-    // Handle entryPoints: convert string to array, with fallback
-    const entryPoints = metadata?.entryPoints ? metadata.entryPoints : ["/rest/mcp/streaming"];
-
-    const packageId = _getPackageID(appConfig.ordNamespace, packageIds, ORD_RESOURCE_TYPE.api, visibility);
-    // Fallback: ensure partOfPackage never undefined to satisfy generic apiResources tests
-    const effectivePackageId = packageId || `${appConfig.ordNamespace}:package:${visibility}:v1`;
-
-    return {
-        ordId,
-        title,
-        shortDescription,
-        description,
-        version,
-        lastUpdate: appConfig.lastUpdate,
-        visibility,
-        partOfPackage: effectivePackageId,
-        releaseStatus: "active",
-        apiProtocol: "mcp",
-        resourceDefinitions: [
-            {
-                type: "custom",
-                customType: MCP_CUSTOM_TYPE,
-                mediaType: "application/json",
-                url: `/ord/v1/${ordId}/mcp-server-definition.mcp.json`,
-                accessStrategies,
-            },
-        ],
-        entryPoints,
-        extensible: { supported: "no" },
-    };
-}
-
-/**
- * This is a template function to create MCP API Resource object(s).
- *
- * The generated MCP API resource(s) can be customized via the generic overwrite mechanism
- * using custom.ord.json. Properties like visibility, title, version, entryPoints, etc.
- * can be overridden by matching the ordId pattern.
- *
- * Metadata values are sourced from the MCP plugin's generateORDMetadata function when available,
- * which reads from cds.env.mcp configuration. This allows users to customize MCP metadata via
- * package.json or .cdsrc.json files.
- *
- * @param {object} appConfig - The application configuration.
- * @param {Array} packageIds - The available package identifiers.
- * @param {Array} accessStrategies The array of accessStrategies objects
- * @returns {Object|Array} An MCP API resource object or array of objects.
- */
-const createMCPAPIResourceTemplate = (appConfig, packageIds, accessStrategies) => {
-    // Get ORD metadata from MCP plugin if available
-    let ordMetadata = null;
-    // Use comprehensive check for MCP plugin readiness
-    const shouldAddMCP = isMCPPluginReady();
-    if (shouldAddMCP) {
-        try {
-            const { generateORDMetadata } = require("@btp-ai/mcp-plugin/lib/utils/metadata");
-            ordMetadata = generateORDMetadata();
-        } catch (error) {
-            Logger.warn("Failed to generate MCP ORD metadata:", error.message);
-        }
-    }
-
-    // Handle both array and single object responses from MCP plugin
-    if (Array.isArray(ordMetadata)) {
-        return ordMetadata.map((metadata) =>
-            createSingleMCPResource(metadata, appConfig, packageIds, accessStrategies),
-        );
-    } else {
-        return createSingleMCPResource(ordMetadata || {}, appConfig, packageIds, accessStrategies);
-    }
-};
-
 function _propagateORDVisibility(model) {
     for (const [name, def] of Object.entries(model.definitions)) {
         if (def.kind === CDS_ELEMENT_KIND.service && def[ORD_EXTENSIONS_PREFIX + "visibility"]) {
@@ -710,7 +612,6 @@ module.exports = {
     createGroupsTemplateForService,
     createAPIResourceTemplate,
     createEventResourceTemplate,
-    createMCPAPIResourceTemplate,
     readORDExtensions,
     _getPackageID,
     _getEntityTypeMappings,

package/lib/threads/compile.js

@@ -0,0 +1,13 @@
+const { workerData } = require("piscina");
+
+const compileMetadata = require("../meta-data");
+const registerCompileTargets = require("../common/register-compile-targets");
+
+registerCompileTargets(); // Worker threads skip cds-plugin.js — re-register compile targets
+
+module.exports = ({ url }) => {
+    // JSON round-trip: CDS compiler output may contain Generator objects
+    // that cannot be transferred via postMessage (structured clone algorithm).
+    return compileMetadata(url, workerData.model) //
+        .then(({ response }) => JSON.parse(JSON.stringify(response)));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cap-js/ord",
-    "version": "1.4.5",
+    "version": "1.6.0",
     "description": "CAP Plugin for generating ORD document.",
     "repository": "cap-js/ord",
     "author": "SAP SE (https://www.sap.com)",
@@ -34,7 +34,7 @@
         "eslint": "^10.0.0",
         "express": "^4",
         "jest": "^30.0.0",
-        "prettier": "3.8.1",
+        "prettier": "3.8.3",
         "supertest": "^7.0.0"
     },
     "peerDependencies": {
@@ -45,21 +45,27 @@
         "@cap-js/openapi": "^1.2.1",
         "bcryptjs": "3.0.3",
         "cli-progress": "^3.12.0",
-        "lodash": "^4.17.21"
+        "lodash": "^4.17.21",
+        "piscina": "^5.1.4"
     },
     "engines": {
-        "node": ">=18 <23"
+        "node": ">=20 <25"
     },
     "overrides": {
-        "@sap/cds-compiler": "6.7.3"
+        "@sap/cds-compiler": "6.9.0"
     },
     "cds": {
         "requires": {
             "SAP ORD Service": {
-                "model": "@cap-js/ord/lib/ord-service"
+                "model": "@cap-js/ord/lib/services/ord-service"
             },
             "[java]": {
                 "SAP ORD Service": false
+            },
+            "[mtx-sidecar]": {
+                "SAP ORD Service": {
+                    "model": "@cap-js/ord/lib/services/mtx-ord-provider-service"
+                }
             }
         }
     }

package/lib/mcpAdapter.js

@@ -1,132 +0,0 @@
-const Logger = require("./logger");
-const cds = require("@sap/cds");
-const path = require("path");
-
-/**
- * MCP Plugin Adapter
- * Provides an abstraction layer for interacting with @btp-ai/mcp-plugin
- * This allows for easy mocking and testing without requiring the actual plugin
- */
-
-/**
- * Load package.json from project root
- * @returns {Object} Package.json content
- * @throws {Error} If package.json is not found
- */
-function _loadPackageJson() {
-    const packageJsonPath = path.join(cds.root, "package.json");
-    if (!cds.utils.exists(packageJsonPath)) {
-        throw new Error(`package.json not found in the project root directory`);
-    }
-    return require(packageJsonPath);
-}
-
-/**
- * Check if MCP plugin is listed in package.json dependencies
- * @param {Function} loadPackageJsonFn - Optional function to load package.json (for testing)
- * @returns {boolean} True if plugin is in dependencies or devDependencies
- */
-function isMCPPluginInPackageJson(loadPackageJsonFn = _loadPackageJson) {
-    try {
-        const packageJson = loadPackageJsonFn();
-        const allDependencies = {
-            ...(packageJson.dependencies || {}),
-            ...(packageJson.devDependencies || {}),
-        };
-        const isInstalled = "@btp-ai/mcp-plugin" in allDependencies;
-        if (isInstalled) {
-            Logger.log("MCP plugin found in package.json dependencies");
-        }
-        return isInstalled;
-    } catch (error) {
-        Logger.error("Could not check package.json for MCP plugin:", error.message);
-        return false;
-    }
-}
-
-/**
- * Check if MCP plugin is available at runtime
- * @param {Function} resolveFunction - Optional custom resolve function for testing
- * @returns {boolean} True if plugin is available
- */
-function isMCPPluginAvailable(resolveFunction = require.resolve) {
-    try {
-        resolveFunction("@btp-ai/mcp-plugin");
-        Logger.log("MCP plugin is available at runtime");
-        return true;
-    } catch {
-        return false;
-    }
-}
-
-/**
- * Get MCP plugin instance
- * Returns null if plugin is not available
- * @returns {Object|null} MCP plugin module or null
- */
-function getMcpPlugin() {
-    if (!isMCPPluginAvailable()) {
-        return null;
-    }
-
-    try {
-        return require("@btp-ai/mcp-plugin");
-    } catch (error) {
-        Logger.error("Failed to load MCP plugin:", error.message);
-        return null;
-    }
-}
-
-/**
- * Check if MCP plugin is ready for use (both installed and available)
- * This function combines the logic of both isMCPPluginInPackageJson and isMCPPluginAvailable
- * to provide a comprehensive check for MCP plugin readiness.
- * Maintains the original AND logic: both conditions must be true.
- *
- * @param {Object} options - Options for checking
- * @param {Function} options.resolveFunction - Custom resolve function for testing
- * @param {Function} options.loadPackageJsonFn - Custom package.json loader for testing
- * @returns {boolean} True if plugin is ready for use
- */
-function isMCPPluginReady(options = {}) {
-    const { resolveFunction, loadPackageJsonFn } = options;
-
-    // Both conditions must be satisfied: declared in package.json AND available at runtime
-    return isMCPPluginInPackageJson(loadPackageJsonFn) && isMCPPluginAvailable(resolveFunction);
-}
-
-/**
- * Build MCP server definition
- * @param {Array} services - Array of CDS services
- * @returns {Promise<Object>} MCP server definition
- * @throws {Error} If MCP plugin is not available
- */
-async function buildMcpServerDefinition(services = []) {
-    const plugin = getMcpPlugin();
-
-    if (!plugin) {
-        throw new Error("MCP plugin not available");
-    }
-
-    // Validate services parameter
-    if (!Array.isArray(services)) {
-        throw new Error("Services parameter must be an array");
-    }
-
-    try {
-        const { exposeMcpServerDefinitionForOrd } = require("@btp-ai/mcp-plugin/lib/utils/metadata");
-        return await exposeMcpServerDefinitionForOrd(services);
-    } catch (error) {
-        Logger.error("Failed to build MCP server definition:", error.message);
-        throw error;
-    }
-}
-
-module.exports = {
-    isMCPPluginAvailable,
-    isMCPPluginInPackageJson,
-    isMCPPluginReady,
-    getMcpPlugin,
-    buildMcpServerDefinition,
-    _loadPackageJson, // Export for testing
-};

package/lib/metaData.js

@@ -1,117 +0,0 @@
-const cds = require("@sap/cds/lib");
-const { compile: openapi } = require("@cap-js/openapi");
-const { compile: asyncapi } = require("@cap-js/asyncapi");
-const { COMPILER_TYPES, OPENAPI_SERVERS_ANNOTATION } = require("./constants");
-const Logger = require("./logger");
-const { interopCSN } = require("./interopCsn.js");
-const cdsc = require("@sap/cds-compiler/lib/main");
-const { isMCPPluginReady, buildMcpServerDefinition } = require("./mcpAdapter");
-
-/**
- * Read @OpenAPI.servers annotation from service definition
- * @param {object} csn - The CSN model
- * @param {string} serviceName - The service name
- * @returns {string|undefined} - JSON string of servers array or undefined
- */
-const _getServersFromAnnotation = (csn, serviceName) => {
-    const servers = csn?.definitions?.[serviceName]?.[OPENAPI_SERVERS_ANNOTATION];
-    const isValidServers = Array.isArray(servers) && servers.length > 0;
-    return isValidServers ? JSON.stringify(servers) : undefined;
-};
-
-const getMetadata = async (url, model = null) => {
-    const parts = url
-        ?.split("/")
-        .pop()
-        .replace(/\.json$/, "")
-        .split(".");
-    const compilerType = parts.pop();
-    const serviceName = parts.join(".");
-    const csn = model || cds.services[serviceName]?.model;
-    const compileOptions = cds.env["ord"]?.compileOptions || {};
-
-    let responseFile;
-    const options = { service: serviceName, as: "str", messages: [] };
-    switch (compilerType) {
-        case COMPILER_TYPES.oas3:
-            try {
-                // Check for service-level @OpenAPI.servers annotation
-                const serversFromAnnotation = _getServersFromAnnotation(csn, serviceName);
-                const openapiOptions = { ...options, ...(compileOptions?.openapi || {}) };
-
-                // Service-level annotation takes precedence over global config
-                if (serversFromAnnotation) {
-                    openapiOptions["openapi:servers"] = serversFromAnnotation;
-                }
-
-                responseFile = openapi(csn, openapiOptions);
-            } catch (error) {
-                Logger.error(`OpenApi error for service ${serviceName} - ${error.message}`);
-                throw error;
-            }
-            break;
-        case COMPILER_TYPES.asyncapi2:
-            try {
-                responseFile = asyncapi(csn, { ...options, ...(compileOptions?.asyncapi || {}) });
-            } catch (error) {
-                Logger.error(`AsyncApi error for service ${serviceName} - ${error.message}`);
-                throw error;
-            }
-            break;
-        case COMPILER_TYPES.csn:
-            try {
-                const opt_eff = { beta: { effectiveCsn: true }, effectiveServiceName: serviceName };
-                let effCsn = cdsc.for.effective(csn, opt_eff);
-                responseFile = interopCSN(effCsn);
-            } catch (error) {
-                Logger.error(`Csn error for service ${serviceName} - ${error.message}`);
-                throw error;
-            }
-            break;
-        case COMPILER_TYPES.edmx:
-            try {
-                responseFile = await cds.compile(csn).to["edmx"]({ ...options, ...(compileOptions?.edmx || {}) });
-            } catch (error) {
-                Logger.error(`Edmx error for service ${serviceName} - ${error.message}`);
-                throw error;
-            }
-            break;
-        case COMPILER_TYPES.mcp:
-            if (!isMCPPluginReady()) {
-                throw new Error("MCP plugin is not available or not ready for use");
-            }
-            try {
-                // Get all available CDS services
-                const allServices = Object.values(cds.services);
-                // Generate metadata from runtime services using adapter
-                const mcpResult = await buildMcpServerDefinition(allServices);
-                // Extract only the MCP content, not the ORD metadata
-                responseFile = mcpResult.mcp;
-            } catch (error) {
-                Logger.error(`MCP server definition error - ${error.message}`);
-                throw error;
-            }
-            break;
-        case COMPILER_TYPES.graphql:
-            try {
-                const { generateSchema4 } = require("@cap-js/graphql/lib/schema");
-                const { lexicographicSortSchema, printSchema } = require("graphql");
-                const linked = cds.linked(csn);
-                const srv = new cds.ApplicationService(serviceName, linked);
-                let schema = generateSchema4({ [serviceName]: srv });
-                schema = lexicographicSortSchema(schema);
-                responseFile = printSchema(schema);
-            } catch (error) {
-                Logger.error("GraphQL SDL error:", error.message);
-                throw error;
-            }
-            break;
-    }
-    return {
-        contentType:
-            compilerType === "graphql" ? "text/plain" : `application/${compilerType === "edmx" ? "xml" : "json"}`,
-        response: responseFile,
-    };
-};
-
-module.exports = getMetadata;