@sap/cds-dk 7.9.4 → 7.9.6

package/bin/watch.js

@@ -65,7 +65,7 @@ const t = module.exports.codes = {
 }
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
 const ignore = RegExp(
-  `(node_modules|_out|@types|@cds-models)\\${sep}` +
+  `(.git|node_modules|_out|@types|@cds-models)\\${sep}` +
   `|app(\\${sep}.+)?\\${sep}(` +
     `(webapp|dist|target)\\${sep}|` +
     `tsconfig\\.json$|` +

package/lib/build/provider/hana/template/.hdiconfig-all

@@ -158,6 +158,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/lib/build/provider/hana/template/.hdiconfig-cloud

@@ -132,6 +132,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/lib/init/index.js

@@ -245,6 +245,8 @@ module.exports = class CDSGenerator {
                     templates.set(plugin, template)
                     const dependencies = await template.requires()
                     dependencies?.forEach(d => plugins.add(d))
+                } else {
+                    throw 'cannot run plugin \'' + plugin + '\'' + (DEBUG ? 'Does not satisfy the canRun() function:\n    ' + template.canRun : '')
                 }
             }
         }

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/lib/init/template/hana/files/src/.hdiconfig

@@ -131,6 +131,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.4",
+  "version": "7.9.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.9.4",
+      "version": "7.9.6",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -53,7 +53,7 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.1",
+      "version": "4.11.0",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -208,10 +208,10 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.9.2",
+      "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.6",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -240,7 +240,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.2.4",
+      "version": "1.2.7",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6",
@@ -261,7 +261,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.18.1",
+      "version": "1.18.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -396,7 +396,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.0",
+      "version": "8.12.1",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -1175,7 +1175,7 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
+      "version": "1.6.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -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",
@@ -2301,8 +2298,11 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
+      "version": "1.13.2",
       "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2688,7 +2688,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.6.2",
+      "version": "7.6.3",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3136,7 +3136,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.18.0",
+      "version": "3.19.0",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -3244,7 +3244,7 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.17.1",
+      "version": "8.18.0",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/package.json

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