@sap/cds-dk 7.1.0 → 7.2.0

package/lib/init/util/template.js

@@ -1,7 +1,8 @@
 const Mustache = require('mustache')
-const { copy, read, write, exists, readdir, path, isdir } = require('../../cds').utils
+const cds = require('../../cds')
+const { copy, read, write, exists, readdir, path, isdir } = cds.utils
 
-async function copyFiles(from, into, replacements, overwrite = false) {
+async function renderAndCopy(from, into, replacements, overwrite = cds.cli.options.force) {
     const dirents = await readdir(from)
     await Promise.all(dirents.map(async dirent => {
         const fileNew = Mustache.render(dirent, replacements)
@@ -9,7 +10,7 @@ async function copyFiles(from, into, replacements, overwrite = false) {
         const dest = path.join(into, fileNew)
 
         if (isdir(src)) {
-            return copyFiles(path.join(from, dirent), dest, replacements, overwrite)
+            return renderAndCopy(path.join(from, dirent), dest, replacements, overwrite)
         } else if (path.extname(dirent) === '.hbs') {
             const destinationPath = dest.replace('.hbs', '')
             if (overwrite || !exists(destinationPath)) {
@@ -23,11 +24,11 @@ async function copyFiles(from, into, replacements, overwrite = false) {
 }
 
 async function render(src, templateValues) {
-    const content = await read(src, 'utf-8');
-    return Mustache.render(content, templateValues);
+    const content = await read(src, 'utf-8')
+    return Mustache.render(content, templateValues)
 }
 
 module.exports = {
     render,
-    copyFiles
+    renderAndCopy
 }

package/lib/watch/node-watch.js

@@ -1,5 +1,6 @@
 const cds = require ('../cds')
 const DEBUG = cds.debug('cli|watch')
+const { relative } = require('path')
 
 module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}, delay=200, options={} })=>{
 
@@ -52,7 +53,11 @@ module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}
   // Watching for touched files...
   const watch = require('node-watch')
   const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$|${includes.source}`)
-  const filter = f => !ignore.test(f) && include.test(f)
+  const filter = f => {
+    const isIn = !ignore.test(f) && include.test(f)
+    if (!isIn)  DEBUG?. (`ignored: ${relative(cwd||process.cwd(), f)}`)
+    return isIn
+  }
   const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
   if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)

package/npm-shrinkwrap.json

@@ -1,23 +1,23 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.1.0",
+      "version": "7.2.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
         "@sap/cds-foss": "^4.0.2",
         "@sap/cds-mtxs": "^1.9.0",
         "@sap/eslint-plugin-cds": "^2.6.0",
-        "axios": ">=0.21",
+        "@sap/hdi-deploy": "^4.8.0",
+        "axios": "^1",
         "eslint": "^8",
         "express": "^4.17.3",
         "livereload-js": "^4.0.1",
-        "md5": "^2.3.0",
         "mustache": "^4.0.1",
         "node-watch": ">=0.7",
         "pluralize": "^8.0.0",
@@ -53,14 +53,14 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
+      "version": "4.8.0",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.1",
+      "version": "2.1.2",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -100,7 +100,7 @@
       "license": "MIT"
     },
     "node_modules/@eslint/js": {
-      "version": "8.46.0",
+      "version": "8.48.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -112,7 +112,7 @@
       "optional": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
+      "version": "0.11.11",
       "license": "Apache-2.0",
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -249,7 +249,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.1.0",
+      "version": "7.2.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^4",
@@ -265,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.1.2",
+      "version": "4.2.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -280,7 +280,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.0.0",
+      "version": "1.1.0",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7",
@@ -302,11 +302,11 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.10.0",
+      "version": "1.11.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
-        "axios": ">=0.27.2"
+        "axios": "^1"
       },
       "bin": {
         "cds-mtx": "bin/cds-mtx.js",
@@ -328,7 +328,7 @@
       }
     },
     "node_modules/@sap/hana-client": {
-      "version": "2.17.21",
+      "version": "2.17.22",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "dependencies": {
@@ -339,13 +339,13 @@
       }
     },
     "node_modules/@sap/hdi": {
-      "version": "4.4.0",
+      "version": "4.5.0",
       "license": "See LICENSE file",
       "dependencies": {
         "async": "3.2.3"
       },
       "engines": {
-        "node": ">=12 <=18"
+        "node": ">=12 <=20"
       },
       "peerDependencies": {
         "@sap/hana-client": "^2 >= 2.5",
@@ -361,11 +361,11 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.7.1",
+      "version": "4.8.0",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hana-client": "2.17.21",
-        "@sap/hdi": "4.4.0",
+        "@sap/hana-client": "2.17.22",
+        "@sap/hdi": "4.5.0",
         "@sap/xsenv": "3.4.0",
         "async": "3.2.3",
         "dotenv": "10.0.0",
@@ -374,7 +374,7 @@
         "micromatch": "4.0.4"
       },
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || ^16.0.0 || ^18.0.0"
+        "node": "^12.0.0 || ^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0"
       }
     },
     "node_modules/@sap/xsenv": {
@@ -482,39 +482,16 @@
       "optional": true
     },
     "node_modules/agentkeepalive": {
-      "version": "4.3.0",
+      "version": "4.5.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
         "humanize-ms": "^1.2.1"
       },
       "engines": {
         "node": ">= 8.0.0"
       }
     },
-    "node_modules/agentkeepalive/node_modules/debug": {
-      "version": "4.3.4",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/agentkeepalive/node_modules/ms": {
-      "version": "2.1.2",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "license": "MIT",
@@ -609,7 +586,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.4.0",
+      "version": "1.5.0",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.0",
@@ -762,13 +739,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/charenc": {
-      "version": "0.0.2",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/chownr": {
       "version": "2.0.0",
       "license": "ISC",
@@ -877,13 +847,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/debug": {
       "version": "3.1.0",
       "license": "MIT",
@@ -1010,13 +973,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.46.0",
+      "version": "8.48.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1027,7 +990,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -1076,7 +1039,7 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
+      "version": "3.4.3",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1291,14 +1254,15 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.0.4",
+      "version": "3.1.0",
       "license": "MIT",
       "dependencies": {
-        "flatted": "^3.1.0",
+        "flatted": "^3.2.7",
+        "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/flatted": {
@@ -1436,7 +1400,7 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.20.0",
+      "version": "13.21.0",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1697,10 +1661,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT"
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "license": "MIT",
@@ -1759,6 +1719,10 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "license": "MIT"
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "license": "MIT"
@@ -1767,6 +1731,13 @@
       "version": "1.0.1",
       "license": "MIT"
     },
+    "node_modules/keyv": {
+      "version": "4.5.3",
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "license": "MIT",
@@ -1841,15 +1812,6 @@
       "license": "ISC",
       "optional": true
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "license": "MIT",
@@ -2069,7 +2031,7 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.12",
+      "version": "2.7.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2155,7 +2117,7 @@
       }
     },
     "node_modules/node-watch": {
-      "version": "0.7.3",
+      "version": "0.7.4",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -3044,7 +3006,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.3.1",
+      "version": "2.3.2",
       "license": "ISC",
       "engines": {
         "node": ">= 14"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -20,11 +20,11 @@
     "@sap/cds-foss": "^4.0.2",
     "@sap/cds-mtxs": "^1.9.0",
     "@sap/eslint-plugin-cds": "^2.6.0",
-    "axios": ">=0.21",
+    "@sap/hdi-deploy": "^4.8.0",
+    "axios": "^1",
     "eslint": "^8",
     "express": "^4.17.3",
     "livereload-js": "^4.0.1",
-    "md5": "^2.3.0",
     "mustache": "^4.0.1",
     "node-watch": ">=0.7",
     "pluralize": "^8.0.0",
@@ -39,5 +39,6 @@
     "lib/",
     "npm-shrinkwrap.json",
     "LICENSE"
-  ]
+  ],
+  "_hasShrinkwrap": true
 }

package/lib/init/template/auditlog/files/mta.yaml.hbs

@@ -1,14 +0,0 @@
----
-modules:
- - name: {{appName}}-srv
-   type: {{language}}
-   path: {{& srvPath}}
-   requires:
-    - name: {{appName}}-auditlog
-
-resources:
-  - name: {{appName}}-auditlog
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: auditlog-api
-      service-plan: default

package/lib/init/template/auditlog/files/package.json.hbs

@@ -1,27 +0,0 @@
-{
-  {{#isNodejs}}
-  "dependencies": {
-      "@sap/audit-logging": "^5"
-  },
-  "cds": {
-  {{/isNodejs}}
-    "requires": {
-      {{#profile}}
-      "[{{profile}}]": {
-      {{/profile}}
-      {{#shortcut}}
-        "audit-log": "service"
-      {{/shortcut}}
-      {{^shortcut}}
-        "audit-log": {
-          "kind": "service"
-        }
-      {{/shortcut}}
-      {{#profile}}
-      }
-      {{/profile}}
-    }
-  {{#isNodejs}}
-  }
-  {{/isNodejs}}
-}

package/lib/init/template/auditlog/index.js

@@ -1,74 +0,0 @@
-const cds = require('../../../cds')
-const { read } = cds.utils
-const { join } = require('path')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { parseMd5File, writeMd5File } = require('../../util/md5')
-const { srvNode4, srvJava4, auditlog } = require('../_merging/registry-mta')
-
-module.exports = class AuditlogTemplate extends require('../templateBase') {
-
-    static hasFacet(env) {
-        return env.requires?.['audit-log']
-    }
-
-    async run() {
-        const project = await readProject()
-        const { configFile } = project
-        project.shortcut = !(await read(configFile)).cds?.requires?.['audit-log']?.kind
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-    }
-
-    async runDependentMerging(context = {}) {
-        const project = await readProject()
-        const { isNodejs, hasMta, hasHelm, srvPath } = project
-
-        if (hasMta) {
-            const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
-            await mergeYAML(
-                'mta.yaml',
-                join(__dirname, 'files', 'mta.yaml.hbs'),
-                project,
-                {
-                    additions: [srv, auditlog],
-                    relationships: [{
-                        insert: [auditlog, 'name'],
-                        into: [srv, 'requires', 'name']
-                    }]
-                }
-            )
-        }
-
-        if (hasHelm) {
-            //in case facet is being added to the already exisiting charts folder
-            let isIndependentCommand = false
-            if(Object.keys(context).length == 0){
-                isIndependentCommand = true
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
-            }
-
-            await mergeYAML(
-                join('chart', 'values.yaml'),
-                {
-                    srv: { bindings: {
-                        auditlog: { serviceInstanceName: 'auditlog' }
-                    }},
-                    auditlog: {
-                        serviceOfferingName: 'auditlog-api',
-                        servicePlanName: 'default'
-                    }
-                }
-            )
-
-            // copy service instance chart if it is not present
-            const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
-            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
-
-            // add dependency entry in chart.yaml
-            await helmTemplate.addDependency('service-instance', 'auditlog');
-
-            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
-        }
-    }
-}