@sap/cds-dk 8.8.2 → 8.9.1

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

@@ -28,6 +28,6 @@ module.exports = class MtaTemplate extends require('../../plugin') {
     }
 
     async finalize() {
-        if (!exists('pom.xml')) console.log(`\nRun ${bold('npm update --package-lock-only')} to freeze dependencies.`)
+        if (!exists('pom.xml')) console.log(`\nrun ${bold('npm update --package-lock-only')} to freeze dependencies`)
     }
 }

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

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1",
-    "@cap-js/cds-types": "^0.9.0"
+    "@cap-js/cds-types": "^0.10.0"
   },
   "scripts": {
     "start": "cds-serve"

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

@@ -21,7 +21,7 @@ module.exports = class NodejsTemplate extends require('../../plugin') {
             throw `You can't change the runtime of an existing project.`
         }
         if (cds.cli.options.add?.has(JAVA)) {
-            throw `Only one runtime per project is supported. Specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}.`
+            throw `only one runtime per project is supported – specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}`
         }
         return true
     }
@@ -33,7 +33,7 @@ module.exports = class NodejsTemplate extends require('../../plugin') {
     }
 
     async finalize() {
-        console.log(`Find samples on ${term.link(URLS.SAMPLES)}`)
-        console.log(`Learn about next steps at ${term.link(URLS.CAPIRE)}`)
+        console.log(`\nfind samples on ${term.link(URLS.SAMPLES)}`)
+        console.log(`learn about next steps at ${term.link(URLS.CAPIRE)}`)
     }
 }

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

@@ -26,6 +26,6 @@ module.exports = class PipelineTemplate extends require('../../plugin') {
     }
 
     async finalize() {
-        console.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
+        console.log(`for information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
     }
 }

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

@@ -13,6 +13,12 @@ module.exports = class SampleTemplate extends require('../../plugin') {
 
     async run() {
         const project = readProject()
+
+        if (project.extendsApp) { // for extension projects, delegate to extension generator
+            const ExtensionGenerator = require('../extension')
+            return new ExtensionGenerator().addSample()
+        }
+
         const { db, srv, app } = env4('production').folders
 
         switch (project.language) {

package/lib/init/template/typer/files/package.json

@@ -4,8 +4,5 @@
   },
   "imports": {
     "#cds-models/*": "./@cds-models/*/index.js"
-  },
-  "scripts": {
-    "before:cds-watch": "cds-typer \"*\""
   }
 }

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

@@ -28,8 +28,8 @@ module.exports = class TyperTemplate extends require('../../plugin') {
     }
     await merge(template('package.json')).into('package.json')
     await mergeGitignore('.gitignore', template('gitignore'))
-    console.log(dim(`  Adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
-    console.log(dim('  Added new dependencies to the project. Run ') + bold('npm i') + dim(' to install.'))
+    console.log(dim(`  adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
+    console.log(dim('  added new dependencies to the project. Run ') + bold('npm i') + dim(' to install.'))
     try {
       await merge(source).into(target)
     } catch (e) {

package/lib/init/template/typescript/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.9.0",
+    "@cap-js/cds-types": "^0.10.0",
     "@types/node": "^22.0.0",
     "typescript": "^5"
   },

package/lib/init/validate.js

@@ -5,23 +5,21 @@ const { exists } = cds.utils
 const { bold } = require('../../lib/util/term')
 
 module.exports.projectName = projectName => {
-  if (!projectName) throw 'Specify a project name.'
+  if (!projectName) throw 'specify a project name'
   const invalidChars = new Set(projectName.match(REGEX_PROJECT_NAME)) // remove duplicates
   if (invalidChars.size > 0) {
-    throw `Project name '${projectName}' contains at least one character ('${[...invalidChars]}') which is not supported in npm package names.
+    throw `project name '${projectName}' contains at least one character ('${[...invalidChars]}') which is not supported in npm package names.
 Specify a different project name by replacing characters with '_' or '-', for example '${projectName.replace(REGEX_PROJECT_NAME, '_')}' or '${projectName.replace(REGEX_PROJECT_NAME, '-')}'.`
   }
 }
 
 module.exports.projectFolder = cwd => {
+  if (cds.cli.options.force) return
   const existingProjectFile = PROJECT_FILES.find(exists)
   if (existingProjectFile) {
-    let message
     if (cwd === cds.root) {
-      message = `You seem to be working in a project which is already initialized. Use ${bold('cds add')} to add more features.`
-    } else {
-      message = `You seem to be trying to initialize an existing project. Use a different project name instead.`
+      throw `project already initialized (existing ${existingProjectFile})\nuse ${bold('cds add')} to add more features`
     }
-    throw `${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${bold('cds add')} to add more features.`
+    throw `project already initialized (existing ${existingProjectFile})\nuse a different project name instead`
   }
 }

package/lib/lint/Linter.js

@@ -9,6 +9,7 @@ const { exit } = require("process");
 const LOG = cds.debug("lint");
 const LOG_CONFIG = cds.debug("lint:config");
 const GENERAL_ERROR = 1;
+const FATAL_ERROR = 2;
 
 /**
  * Safely require a module, return empty object if module not found
@@ -325,6 +326,12 @@ class Linter {
 
         if (results?.length > 0) {
           console.log(formatter.format(results));
+          const { errorCount, fatalErrorCount } = this.#countErrors(results);
+          if (fatalErrorCount > 0) {
+            exit(FATAL_ERROR);
+          } else if (errorCount > 0) {
+            exit(GENERAL_ERROR);
+          }
         }
       }
     } catch (err) {
@@ -343,6 +350,18 @@ class Linter {
     }
   }
 
+  #countErrors(results) {
+    let errorCount = 0;
+    let fatalErrorCount = 0;
+
+    for (const result of results) {
+      errorCount += result.errorCount;
+      fatalErrorCount += result.fatalErrorCount;
+    }
+
+    return { errorCount, fatalErrorCount };
+  }
+
   async #getConfigFileAndSetProjectPath(args) {
     // Get config path
     if (args.length > 0) {

package/lib/mtx/pull.js

@@ -138,11 +138,19 @@ module.exports = class Pull {
         }
     }
 
+    getExtensionName() {
+        try {
+            return require(join(this.projectFolder, 'package.json')).name;
+        } catch (error) {
+            throw getMessage(`Extension project at ${this.projectFolder} is missing package.json file`, { error, command: 'push' });
+        }
+    }
+
     async pullTgz() {
         const pullUrl = `${(this.params.get('appUrl'))}/-/cds/extensibility/pull`;
         const options = { ...this.params.get('reqAuth'), responseType: 'arraybuffer' };
 
-        return axios.post(pullUrl, {}, options)
+        return axios.post(pullUrl, { tag: this.getExtensionName() }, options)
             .then(response => Buffer.from(response.data))
             .catch(error => handleHttpError(error, this.params, { url: pullUrl }));
     }

package/lib/util/question.js

@@ -1,28 +1,31 @@
-const readline = require('readline')
+const readline = require('node:readline')
+
 async function ask4(...args) {
-    const answers = []
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
+
+  // If not in interactive mode, read all input at once.
+  if (!process.stdin.isTTY) {
+    const data = await new Promise(resolve => {
+      let result = ''
+      process.stdin.on('data', chunk => result += chunk)
+      process.stdin.on('end', () => resolve(result))
     })
+    return data.split(/\r?\n/).slice(0, args.length)
+  }
 
-    async function askQuestion(questionParam) {
-        return new Promise(function (resolve) {
-            rl.question(`${questionParam}`, function (answer) {
-                answers.push(answer);
-                resolve();
-            });
-        });
-    }
+  const answers = []
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
 
-    for (const idx in args) {
-        await askQuestion(args[idx])
-    }
+  const askQuestion = question =>
+    new Promise(resolve => rl.question(question, answer => {
+      answers.push(answer)
+      resolve()
+    }))
 
-    rl.close()
-    return answers
+  for (const question of args) {
+    await askQuestion(question)
+  }
+  rl.close()
+  return answers
 }
 
-module.exports = {
-  ask4
-}
+module.exports = { ask4 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.8.2",
+  "version": "8.9.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.8.2",
+      "version": "8.9.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -14,7 +14,7 @@
         "@sap/cds": ">=7",
         "@sap/cds-foss": "^5.0.0",
         "@sap/cds-mtxs": ">=1.9.0",
-        "@sap/eslint-plugin-cds": "^3.0.1",
+        "@sap/eslint-plugin-cds": ">=3.0.1",
         "@sap/hdi-deploy": "^5",
         "axios": "^1",
         "eslint": "^9",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.18.0",
+      "version": "1.19.1",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.9.0",
+      "version": "1.10.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.18.0",
+        "@cap-js/db-service": "^1.19.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -121,7 +121,7 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.1.0",
+      "version": "0.2.1",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -138,7 +138,7 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.0",
+      "version": "3.3.1",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -159,7 +159,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.22.0",
+      "version": "9.23.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -173,16 +173,26 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.7",
+      "version": "0.2.8",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.12.0",
+        "@eslint/core": "^0.13.0",
         "levn": "^0.4.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.13.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "license": "Apache-2.0",
@@ -235,7 +245,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.8.3",
+      "version": "8.9.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -245,13 +255,13 @@
       "bin": {
         "cds-deploy": "lib/dbs/cds-deploy.js",
         "cds-serve": "bin/serve.js",
-        "cds-test": "bin/test.js",
-        "chest": "bin/test.js"
+        "cds-test": "bin/test.js"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
+        "@eslint/js": "^9",
         "express": "^4",
         "tar": "^7"
       },
@@ -265,7 +275,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.8.2",
+      "version": "5.9.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -280,7 +290,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6",
@@ -301,7 +311,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.6.1",
+      "version": "2.7.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -349,7 +359,7 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "5.4.1",
+      "version": "5.4.2",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/hdi": "^4.7.0",
@@ -388,7 +398,7 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
+      "version": "1.0.7",
       "license": "MIT"
     },
     "node_modules/@types/json-schema": {
@@ -926,16 +936,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.22.0",
+      "version": "9.23.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.2",
-        "@eslint/config-helpers": "^0.1.0",
+        "@eslint/config-helpers": "^0.2.0",
         "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.22.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.23.0",
         "@eslint/plugin-kit": "^0.2.7",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -2476,7 +2486,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.7.0",
+      "version": "2.7.1",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.8.2",
+  "version": "8.9.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -22,7 +22,7 @@
     "@sap/cds": ">=7",
     "@sap/cds-foss": "^5.0.0",
     "@sap/cds-mtxs": ">=1.9.0",
-    "@sap/eslint-plugin-cds": "^3.0.1",
+    "@sap/eslint-plugin-cds": ">=3.0.1",
     "@sap/hdi-deploy": "^5",
     "axios": "^1",
     "eslint": "^9",