@sap/cds-dk 8.7.3 → 8.8.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.7.3",
+  "version": "8.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.7.3",
+      "version": "8.8.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -36,14 +36,14 @@
       }
     },
     "node_modules/@cap-js/asyncapi": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6"
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.17.2",
+      "version": "1.18.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -54,7 +54,7 @@
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.1.2",
+      "version": "1.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.8.0",
+      "version": "1.9.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.17.0",
+        "@cap-js/db-service": "^1.18.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -76,7 +76,7 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
+      "version": "4.5.1",
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -120,8 +120,15 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.1.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
-      "version": "0.11.0",
+      "version": "0.12.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -131,7 +138,7 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.2.0",
+      "version": "3.3.0",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -152,7 +159,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.20.0",
+      "version": "9.22.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -166,10 +173,10 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.6",
+      "version": "0.2.7",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.11.0",
+        "@eslint/core": "^0.12.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -217,7 +224,7 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.1",
+      "version": "0.4.2",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
@@ -228,7 +235,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.7.2",
+      "version": "8.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -258,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.7.4",
+      "version": "5.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -273,7 +280,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.3.0",
+      "version": "1.4.0",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6",
@@ -294,7 +301,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.5.1",
+      "version": "2.6.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -306,11 +313,11 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.1.2",
+      "version": "3.2.0",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=7",
-        "semver": "^7.3.4"
+        "semver": "^7.7.1"
       },
       "engines": {
         "node": ">=18"
@@ -342,10 +349,10 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "5.3.2",
+      "version": "5.4.1",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hdi": "^4.6.0",
+        "@sap/hdi": "^4.7.0",
         "@sap/xsenv": "^5.2.0",
         "async": "^3.2.6",
         "dotenv": "^16.4.5",
@@ -353,7 +360,7 @@
         "micromatch": "^4.0.8"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0"
+        "node": ">=18.x"
       },
       "peerDependencies": {
         "@sap/hana-client": "^2 >= 2.6",
@@ -369,10 +376,10 @@
       }
     },
     "node_modules/@sap/xsenv": {
-      "version": "5.4.0",
+      "version": "5.5.0",
       "license": "SEE LICENSE IN LICENSE file",
       "dependencies": {
-        "debug": "4.3.7",
+        "debug": "4.4.0",
         "node-cache": "^5.1.2",
         "verror": "1.10.1"
       },
@@ -400,7 +407,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
+      "version": "8.14.1",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -474,7 +481,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.9",
+      "version": "1.8.3",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -637,11 +644,11 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.3",
+      "version": "1.0.4",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "get-intrinsic": "^1.2.6"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -756,7 +763,7 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.7",
+      "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -919,19 +926,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.20.1",
+      "version": "9.22.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.11.0",
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.20.0",
-        "@eslint/plugin-kit": "^0.2.5",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.1.0",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.22.0",
+        "@eslint/plugin-kit": "^0.2.7",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.1",
+        "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -939,7 +947,7 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
+        "eslint-scope": "^8.3.0",
         "eslint-visitor-keys": "^4.2.0",
         "espree": "^10.3.0",
         "esquery": "^1.5.0",
@@ -976,7 +984,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
+      "version": "8.3.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -1283,15 +1291,15 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.7",
+      "version": "1.3.0",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
+        "call-bind-apply-helpers": "^1.0.2",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "get-proto": "^1.0.0",
+        "get-proto": "^1.0.1",
         "gopd": "^1.2.0",
         "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
@@ -2432,7 +2440,7 @@
       "optional": true
     },
     "node_modules/ws": {
-      "version": "8.18.0",
+      "version": "8.18.1",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.7.3",
+  "version": "8.8.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/lib/bind/KubernetesApiAccessor.js

@@ -1,81 +0,0 @@
-const { yaml } = require('../cds').utils
-const { execSync } = require('child_process');
-const { bold } = require('../util/term');
-
-class KubernetesApiAccessor {
-
-    constructor() {
-
-        this.config = once( async() => {
-            const configString = execSync('kubectl config view --raw').toString();
-            const config = yaml.parse(configString);
-
-            const currentContextName = config['current-context'];
-            if (!currentContextName) throw new Error(`No current context in kubectl config.`);
-            const currentContextEntry = config.contexts && config.contexts.find( entry => entry.name === currentContextName && entry.context && entry.context.cluster && entry.context.user );
-            if (!currentContextEntry) throw new Error(`Current context not found in kubectl config.`);
-            const currentContext = currentContextEntry.context;
-            const clusterEntry = config.clusters && config.clusters.find( entry => entry.name === currentContext.cluster && entry.cluster && entry.cluster.server );
-            if (!currentContextEntry) throw new Error(`Cluster ${bold(currentContext.cluster)} not found in kubectl config.`);
-            const { cluster } = clusterEntry;
-
-            const serverToContext = {};
-            for (const clusterEntry of config.clusters) {
-                const contextEntries = config.contexts.filter( contextEntry => contextEntry.context.cluster === clusterEntry.name );
-                // Collect only cluster servers that are used in exactly one context, to clearly identify the context to be used
-                if (contextEntries.length === 1) {
-                    serverToContext[clusterEntry.cluster.server] = contextEntries[0];
-                }
-            }
-
-            return {
-                namespace: currentContext.namespace || 'default',
-                context: currentContextEntry,
-                cluster,
-                serverToContext
-            }
-        });
-    }
-
-    async context({cluster, namespace}) {
-        const config = await this.config();
-        let contextEntry;
-
-        if (cluster && cluster !== config.cluster.server) {
-            contextEntry = config.serverToContext[cluster] || throwError(`Cluster ${bold(cluster)} not found in kubectl configuration`);
-        } else {
-            contextEntry = config.context;
-        }
-
-        return {
-            context: contextEntry.name,
-            cluster: cluster || config.cluster.server,
-            namespace: namespace || contextEntry.context.namespace || 'default'
-        };
-    }
-
-    async get(options) {
-        const {context, namespace, kind, name} = options;
-        try {
-            return JSON.parse(execSync(`kubectl --output json --context ${context} --namespace ${namespace} get ${kind} ${name}`).toString());
-          }
-          catch (error) {
-            if (error.status === 1) return null
-            else throw error
-        }
-    }
-}
-
-function once(func) {
-    let result;
-    return function(...args) {
-        if (!result) result = func(...args);
-        return result;
-    }
-}
-
-function throwError(msg = 'Internal Error') {
-    throw new Error(msg);
-}
-
-module.exports = KubernetesApiAccessor;

package/lib/bind/bindingManager.js

@@ -1,89 +0,0 @@
-const bindingResolver = require('./bindingResolver')
-const { logger } = require('./bindingUtil')
-const cds = require('../cds')
-const DEBUG = cds.log('cli')._debug // REVISIT: This loads cds.env too early!
-
-class BindingManager {
-    constructor(options = {}) {
-        this.cache = {}
-        this.bindingsStr = ''
-        this.options = options
-        logger.log = DEBUG || !options.silent ? console.log : () => { }
-    }
-
-    getBindings() {
-        const bindings = bindingResolver.getUnresolvedBindings(this.options)
-        return bindings
-    }
-
-    async resolve(bindings) {
-        if (!bindings) {
-            bindings = this.getBindings()
-            this.bindingsStr = JSON.stringify(bindings)
-        }
-
-        return await bindingResolver.resolveBindings({ ...this.options, bindings, cache: this.cache })
-    }
-
-    async bindingEnv(bindings) {
-        if (!bindings) bindings = await this.resolve()
-        if (bindings) {
-            const VCAP_SERVICES = JSON.stringify(BindingManager.toVcapServices(bindings))
-            return { VCAP_SERVICES }
-        } else {
-            return undefined
-        }
-    }
-
-    async update({ onBeforeUpdate, onAfterUpdate } = {}) {
-        const oldBindingsStr = this.bindingsStr
-        const bindings = this.getBindings()
-        const bindingsStr = JSON.stringify(bindings)
-        this.bindingsStr = bindingsStr
-
-        if (this.bindingsStr === oldBindingsStr) return // No change
-        if (onBeforeUpdate) await onBeforeUpdate()
-
-        try {
-            if (this.pendingUpdate) await this.pendingUpdate
-        } catch (error) {
-            // ignore
-        }
-        this.pendingUpdate = undefined
-
-        if (this.bindingsStr !== bindingsStr) return // Next update in progress
-
-        let resolvedBindings
-        try {
-            this.pendingUpdate = this.resolve(bindings)
-            resolvedBindings = await this.pendingUpdate
-        } catch (error) {
-            console.error(error.message)
-            return
-        }
-
-        if (this.bindingsStr !== bindingsStr) return // Next update in progress
-
-        const env = Object.assign({ VCAP_SERVICES: '{}' }, await this.bindingEnv(resolvedBindings));
-        if (onAfterUpdate) onAfterUpdate({ bindings: resolvedBindings, env })
-    }
-
-    static toVcapServices(bindings) {
-        const services = {}
-
-        for (const name in bindings) {
-            const binding = bindings[name]
-            const vcap = binding.binding.vcap || {}
-            const type = vcap.type || vcap.label
-            const serviceEntries = services[type] = services[type] || []
-
-            // setting the 'name' property is important to make CAP match the CDS service to the VCAP service
-            // it is also added to the 'vcap' property by 'cds bind'
-            serviceEntries.push({ ...vcap, name, credentials: binding.credentials })
-        }
-
-        return services
-    }
-}
-
-module.exports = BindingManager

package/lib/bind/bindingResolver.js

@@ -1,54 +0,0 @@
-const cds = require('../cds');
-const path = require('path');
-const { platformText, bindingText, logger } = require('./bindingUtil');
-const { bold } = require('../util/term');
-
-class BindingResolver {
-    getUnresolvedBindings({ cwd = process.cwd(), env } = {}) {
-        if (!env) {
-            env = cds.env.for('cds', path.resolve(cwd)) // REVISIT: This might load cds.env too early!
-        }
-        const bindings = {}
-        const requires = env.requires || {}
-        for (const name in requires) {
-            const service = requires[name]
-            if (service && service.binding && !service.binding.resolved) {
-                bindings[name] = { ...service.binding, kind: service.kind }
-            }
-        }
-        return bindings
-    }
-
-    async resolveBindings({ bindings, cwd = process.cwd(), env, cache = {} }) {
-        bindings = bindings || this.getUnresolvedBindings({ cwd, env })
-        if (Object.keys(bindings).length === 0) return undefined
-        logger.log(`resolving cloud service bindings...`)
-
-        const resolvedBindings = {}
-
-        // run in parallel
-        await Promise.all(Object.keys(bindings).map(async name => {
-            const binding = bindings[name]
-            const cacheKey = JSON.stringify(binding)
-            let resolvedBinding
-            if (!cache[cacheKey]) {
-                resolvedBinding = cache[cacheKey] = await this.resolveBinding(name, binding)
-                logger.log(`bound ${bold(name)} to ${platformText(binding)} ${bindingText(binding)}`)
-            } else {
-                resolvedBinding = cache[cacheKey]
-            }
-            resolvedBindings[name] = resolvedBinding
-        }));
-        return Object.keys(resolvedBindings).length > 0 ? resolvedBindings : undefined
-    }
-
-    resolveBinding(name, binding) {
-        switch (binding.type) {
-            case 'cf': return require('./cfKeyProvider').resolve(name, binding)
-            case 'k8s': return require('./kubernetesCredentialsProvider').resolve(name, binding)
-            default: throw new Error(`Unsupported binding type ${bold(binding.type)} for service ${bold(name)}.`)
-        }
-    }
-}
-
-module.exports = new BindingResolver()

package/lib/bind/bindingUtil.js

@@ -1,129 +0,0 @@
-const { bold } = require('../util/term');
-
-const KindToRequiresNameMap = {
-    xsuaa: 'auth', // REVISIT: remove with ^8
-    'xsuaa-auth': 'auth',
-    'ias-auth': 'auth',
-    'hana-cloud': 'db',
-    hana: 'db',
-    'hana-mt': 'db', // For compatibility only
-    'sql-mt': 'db', // For compatibility only
-    destinations: 'destinations',
-    connectivity: 'connectivity',
-    'audit-log': 'auditlog',
-    'audit-log-to-restv2': 'auditlog',
-    'enterprise-messaging': 'messaging',
-    'enterprise-messaging-amqp': 'messaging',
-    'enterprise-messaging-http': 'messaging',
-    'enterprise-messaging-shared': 'messaging',
-    'redis-messaging': 'messaging',
-    'multitenancy': 'multitenancy'
-}
-
-const PreferredKinds = {
-    multitenancy: 1, 'hana-cloud': 1, xsuaa: 1, 'xsuaa-auth': 1, 'ias-auth': 1, 'saas-registry': 1
-};
-
-const PLATFORM_TYPES = {
-    'cf': 'Cloud Foundry',
-    'k8s': 'Kubernetes'
-}
-
-class BindingUtil {
-    static getRequiresNameFromKind(service, kind) {
-        const requiresName = KindToRequiresNameMap[kind];
-        if (!requiresName) throw new Error(`Unknown CDS service name for service ${bold(service)}. Please specify as argument for ${bold('cds bind')}.`)
-        return requiresName;
-    }
-
-    /**
-     * Determine kind value for services based on VCAP binding
-     * information in the configuration.
-     */
-    static determineKinds(services) {
-        const vcapServices = {}
-
-        // Build VCAP_SERVICES
-        for (const service of services) {
-            service.kindCandidates = []
-
-            const { vcap = {} } = service.binding || {};
-            let { label, type } = vcap;
-            type = type || label;
-            if (!type) continue;
-
-            if (!vcapServices[type]) vcapServices[type] = [];
-            vcapServices[type].push({ credentials: { dummy: 'dummy' }, ...vcap, service });
-        }
-
-        // Auto configure services based on VCAP_SERVICES
-
-        const cds = require('../cds');
-        const env = cds.env.for('cds', process.cwd()); // REVISIT: This might load cds.env too early!
-
-        if (!env._find_credentials_for_required_service) {
-            throw new Error(`Please provide a service kind or update @sap/cds version to use the kind detection.`);
-        }
-
-        const requires = env.requires.kinds || {};
-        for (const [kind, service] of Object.entries(requires)) {
-            const vcapService = env._find_credentials_for_required_service(kind, service, vcapServices);
-            if (!vcapService) continue;
-            const isUniqueKind = !Object.values(requires).some(otherService =>
-                otherService !== service && otherService.kind === kind
-            )
-            if (isUniqueKind) vcapService.service.kindCandidates.push(kind);
-        }
-
-        // Check if one "kind" per service was found
-        for (const service of services) {
-            const preferredKind = service.kindCandidates.find(kind => kind in PreferredKinds);
-            if (preferredKind) {
-                service.kind = preferredKind;
-            } else if (service.kindCandidates.length === 1) {
-                service.kind = service.kindCandidates[0];
-            }
-            delete service.kindCandidates;
-        }
-    }
-
-    static async checkIsJavaProject(projectPath) {
-        const { constants, promises: fsp } = require('fs');
-        const path = require('path');
-        const pomXmlPath = path.join(projectPath, 'pom.xml');
-        try {
-            await fsp.access(pomXmlPath, constants.F_OK);
-            return true;
-        } catch (err) {
-            return false;
-        }
-    }
-
-    static platformText(binding) {
-        if (!PLATFORM_TYPES[binding.type]) throw new Error(`Unexpected binding type ${bold(binding.type)}.`);
-        return PLATFORM_TYPES[binding.type]
-    }
-
-    static bindingText(binding) {
-        switch (binding.type) {
-            case 'cf':
-                if (binding.key) {
-                    return `managed service ${bold(binding.instance + ':' + binding.key)}`
-                } else {
-                    return `user provided service ${bold(binding.instance)}`
-                }
-            case 'k8s':
-                if (binding.name) {
-                    return `service binding ${bold(binding.name)}`
-                } else {
-                    return `secret ${bold(binding.secret)}`
-                }
-            default:
-                throw new Error('Internal Error');
-        }
-    }
-
-    static logger = { log: console.log }
-}
-
-module.exports = BindingUtil