@sap/cds-dk 7.9.5 → 7.9.7

package/bin/version.js

@@ -62,27 +62,29 @@ function list_versions(args, options) {
 }
 
 function info({ root:cwd=process.cwd() }) {
-  const env = require('../lib').env.for('cds', cwd)
-  const isJava = env['project-nature'] === 'java'
-  if (isJava && process.stderr.isTTY) {
+  const cds = require('../lib')
+  const env = cds.env.for('cds', cwd)
+  env.cli ??= {}; env.cli.version ??= {}
+  const javaInfo = !env.cli.version.skipjava && env['project-nature'] === 'java'
+  if (javaInfo && process.stderr.isTTY) {
     console.error('\x1b[2m'+'This takes a while. Collecting Java versions...', '\x1b[0m')
   }
 
   const npmRoot = execSync('npm root -g').toString().trim()
   let versions = {
-    ..._versions_from(_pkg_path('@sap/cds-dk', __dirname), '@sap/cds-dk (global)'), // ... linked in cap/dev setup
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
+    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // linked in cap/dev or installed globally
     ..._versions_from(_pkg_path('@sap/cds-dk', cwd)), // local dk, important for Java projects
     ..._versions_from(_pkg_path('@sap/cds', __dirname)), // @sap/cds from here
-    ..._versions_from(cwd), // ... or from local app dependencies
-    ..._versions_from(_pkg_path('@sap/cds-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
+    ..._versions_from(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
+    ..._versions_from(cwd), // ... more from local app dependencies
+    '@sap/cds-compiler': cds.compiler.version(),
     'Node.js': process.version,
-    'home': require('../lib/cds').home, // effective (local) cds
+    'home': cds.home, // effective cds home
   }
   // sort Node entries
   versions = Object.keys(versions).sort().reduce((all, key) => { all[key] = versions[key]; return all }, {})
 
-  if (isJava) {
+  if (javaInfo) {
     Object.assign(versions, capJavaVersion(cwd))
   }
   return versions

package/lib/build/provider/mtx-sidecar/index.js

@@ -45,7 +45,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
      */
     async _buildNodeApp(sidecarEnv) {
         const destSidecar = this.task.dest
-        const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
+        const destSidecarSrc = path.join(destSidecar, sidecarEnv.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
         await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))

package/lib/build/provider/nodejs/index.js

@@ -165,6 +165,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.task.options.workspaces) {
             workspaces = Array.isArray(this.task.options.workspaces) ? this.task.options.workspaces : [this.task.options.workspaces]
         } else {
+            // devDependencies are not considered
             workspaces = await getWorkspaces(true, false, wsRoot);
         }
         if (workspaces.length) {
@@ -203,7 +204,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         } catch (err) {
             // ignore
         }
-        if (fs.existsSync(path.join(dir, '.gitmodules')) || fs.existsSync(path.join(dir, 'node_modules'))) {
+        if (fs.existsSync(path.join(dir, '.gitmodules'))) {
             return // project root reached
         }
         if (path.dirname(dir) !== dir) {

package/lib/build/util.js

@@ -189,7 +189,8 @@ async function getWorkspaces(resolve = false, devDependencies = true, wsRoot = c
         // read npm workspaces
         const pkgs = await _execNpmWs(wsRoot)
         pkgs.forEach(pkg => {
-            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] || pgkJson.dependencies?.[pkg]) {
+            // only create tarball archives for dependencies with version '*' 
+            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] === '*' || pgkJson.dependencies?.[pkg] === '*') {
                 const workspace = _getWorkspace(wsRoot, pkg)
                 if (workspace) {
                     workspaces.push(workspace)

package/lib/init/template/data/as-json.js

@@ -3,7 +3,7 @@ const { dirname } = require('node:path')
 const cds = require('../../../cds')
 
 let counter = Math.round(Math.random() * 10000) // Default random seed // Non-deterministic behaviour
-const MAX_ASSOC_DEPTH = 1
+const MAX_ASSOC_DEPTH = 5
 
 /**
  * Creates JSON test data for the given entities
@@ -40,25 +40,35 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
 
   for (const name of entityNames) {
     if (!data[name] // removed on purpose because records are created inline through compositions
-      || data[name].length >= numRecords) { // already created by following associations
+      || data[name].length >= numRecords) { // numRecords already created by following associations
       continue
     }
 
-    const records = data[name] = Array(numRecords).fill({}).map(() => ({}))
+    let numRecordsToGenerate // numRecords might be reduced if some records were created by following associations
+    let records = []
+    if (data[name].length > 0) {
+      numRecordsToGenerate = numRecords - data[name].length 
+      records = Array(numRecordsToGenerate).fill({}).map(() => ({}))
+    } else {
+      numRecordsToGenerate = numRecords
+      records = data[name] = Array(numRecordsToGenerate).fill({}).map(() => ({}))
+    }
     const entity = defs[name]
 
     const idNum = randomNumber()
-    for (let i = 0; i < numRecords; i++) {
+    for (let i = 0; i < numRecordsToGenerate; i++) {
       fillRecord(records[i], idNum+i, entity, csn, data, null, 0, referenceData)
     }
-    // Remove records w/ duplicate keys. This can happen if the key is an enum (and we have less enum values than requested records).
-    data[name] = uniqRecords(records, entity)
+    data[name] = data[name].concat(records) // append the new records to the possibly existingand referenced records
+    // remove records w/ duplicate keys. This can happen if the key is an enum (and we have less enum values than requested records).
+    data[name] = uniqRecords(data[name], entity)
   }
   return data
 }
 
 function fillRecord(record, recordID, entity, csn, data, parentEntity, depth, referenceData) {
   Object.defineProperty(record, '$id', {value: recordID, enumerable: false})
+  if (data[entity.name]) data[entity.name].push(record) // add id to data, to be referenced by associations to prevent circular dependencies
 
   const { elements } = entity
   Object.values(elements).sort(asJson.elementsSorter(csn)).forEach(el => {
@@ -242,7 +252,7 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       if (element.is2many)
         return
       const target = csn.definitions[element.target]
-      if (!target || target === parentEntity || depth > MAX_ASSOC_DEPTH)
+      if (!target || depth > MAX_ASSOC_DEPTH)
         return
 
       let targetRecord = randomFromReferenceData(target, csn, referenceData)
@@ -256,10 +266,14 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
           targetRecords = data[target.name] = []
         else if (!targetRecords) // target entity is not in the list of entities to be created
           return
-
-        targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth, referenceData)
-        targetRecords.push(targetRecord)
-        uniqRecords(targetRecords, target)
+        
+        if (targetRecords.length > 0) { // use record generated by following asociation
+          targetRecord = targetRecords[0]
+        } else {
+          targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth+1, referenceData)
+          targetRecords.push(targetRecord)
+          uniqRecords(targetRecords, target)
+        }
       }
 
       // TODO: handle foreign keys correctly

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.5",
+  "version": "7.9.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.9.5",
+      "version": "7.9.7",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -81,7 +81,7 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -124,7 +124,7 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -208,10 +208,10 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.9.3",
+      "version": "7.9.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@cap-js/cds-types": "<1",
+        "@cap-js/cds-types": "<=0.2.0",
         "@sap/cds-compiler": "^4",
         "@sap/cds-fiori": "^1",
         "@sap/cds-foss": "^5.0.0"
@@ -225,7 +225,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.9.4",
+      "version": "4.9.8",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -261,7 +261,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.18.2",
+      "version": "1.18.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -424,7 +424,7 @@
       }
     },
     "node_modules/agent-base/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -549,7 +549,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -1141,7 +1141,7 @@
       }
     },
     "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -1666,7 +1666,7 @@
       }
     },
     "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1699,7 +1699,7 @@
       }
     },
     "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1757,7 +1757,7 @@
       "optional": true
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
+      "version": "5.3.2",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -2225,12 +2225,9 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "7.1.0",
+      "version": "7.1.1",
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": "^16 || ^18 || >= 20"
-      }
+      "optional": true
     },
     "node_modules/node-cache": {
       "version": "5.1.2",
@@ -2691,7 +2688,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.6.2",
+      "version": "7.6.3",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -2891,7 +2888,7 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -3139,7 +3136,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.18.0",
+      "version": "3.19.2",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -3283,7 +3280,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
+      "version": "2.5.0",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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