Revert "Release 2025-01-30 (#1607)"

This reverts commit 4e979b6.

.github/cli/grab-cli-texts.sh

@@ -10,15 +10,11 @@ pushd `dirname ${proj}` && cds init `basename ${proj}` && pushd `basename ${proj
 
 echo
 echo "Grabbing CLI texts..."
+${dir}/grab-cli-texts.js @sap/cds-dk       "cds add --help"          ${proj} > ${dir}/../../tools/assets/help/cds-add.out.md
 ${dir}/grab-cli-texts.js @cap-js/cds-typer "cds-typer --help"        ${proj} > ${dir}/../../tools/assets/help/cds-typer.out.md
 ${dir}/grab-cli-texts.js @sap/cds-dk       "cds --help"              ${proj} > ${dir}/../../tools/assets/help/cds-help.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds add --help"          ${proj} > ${dir}/../../tools/assets/help/cds-add.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds compile --help"      ${proj} > ${dir}/../../tools/assets/help/cds-compile.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds debug --help"        ${proj} > ${dir}/../../tools/assets/help/cds-debug.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds env --help"          ${proj} > ${dir}/../../tools/assets/help/cds-env.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds init --help"         ${proj} > ${dir}/../../tools/assets/help/cds-init.out.md
-${dir}/grab-cli-texts.js @sap/cds-dk       "cds repl --help"         ${proj} > ${dir}/../../tools/assets/help/cds-repl.out.md
 ${dir}/grab-cli-texts.js @sap/cds-dk       "cds watch --help"        ${proj} > ${dir}/../../tools/assets/help/cds-watch.out.md
+${dir}/grab-cli-texts.js @sap/cds-dk       "cds repl --help"         ${proj} > ${dir}/../../tools/assets/help/cds-repl.out.md
 ${dir}/grab-cli-texts.js @sap/cds-dk       "cds version"             ${proj} > ${dir}/../../tools/assets/help/cds-version.out.md
 ${dir}/grab-cli-texts.js @sap/cds-dk       "cds version --markdown"  ${proj} > ${dir}/../../tools/assets/help/cds-version-md.out.md
 ${dir}/grab-cli-texts.js @sap/cds-dk       "cds env requires.db"     ${proj} > ${dir}/../../tools/assets/help/cds-env-requires-db.out.md

.github/etc/test/impl-variants/test.md

@@ -5,7 +5,7 @@ outline: [2,4]
 
 [[toc]]
 
-## H2 Node {.node}
+## H2 Node {.impl .node}
 
 ### H3 Node 1
 
@@ -21,7 +21,7 @@ Node text
 code
 ```
 
-## H2 Java {.java}
+## H2 Java {.impl .java}
 
 ### H3 Java
 

.github/workflows/PR-SAP.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 18.x
           cache: 'npm'
           cache-dependency-path: docs/package-lock.json
       - run: npm ci

.github/workflows/PR.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 18.x
           cache: 'npm'
       - name: Run CDS snippet checker
         run: |

.github/workflows/lint.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 22
+        node-version: 18.x
         cache: 'npm'
         cache-dependency-path: docs/package-lock.json
     - run: npm ci

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 18.x
           cache: 'npm'
       - run: npm ci
       - run: npm test
@@ -42,7 +42,7 @@ jobs:
           SITE_HOSTNAME: https://cap.js.org
           VITE_CAPIRE_PREVIEW: true
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v1
         with:
           name: github-pages
           path: .vitepress/dist
@@ -57,4 +57,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v1

.vitepress/config.js

@@ -47,8 +47,8 @@ const config = defineConfig({
       message: `
         <a href="https://www.sap.com/about/legal/impressum.html" target="_blank">Legal Disclosure</a> |
         <a href="https://www.sap.com/corporate/en/legal/terms-of-use.html" target="_blank">Terms of Use</a> |
-        <a href="${base}resources/privacy">Privacy</a> |
-        <a href="${base}resources/cookies">Cookies</a>`,
+        <a href="${base}/resources/privacy" target="_blank">Privacy</a> |
+        <a href="${base}/resources/cookies">Cookies</a>`,
       copyright: `Copyright © 2019-${new Date().getFullYear()} SAP SE`
     },
     externalLinkIcon: true,
@@ -101,8 +101,8 @@ config.rewrites = rewrites
 // Add custom capire info to the theme config
 config.themeConfig.capire = {
   versions: {
-    java_services: '3.7.1',
-    java_cds4j: '3.7.0'
+    java_services: '3.6.0',
+    java_cds4j: '3.6.1'
   },
   gotoLinks: [],
   maven_host_base: 'https://repo1.maven.org/maven2'

.vitepress/lib/md-attrs-propagate.ts

@@ -1,7 +1,7 @@
 import { MarkdownRenderer } from 'vitepress'
 
 /**
- * Propagates `java|node` classes that are set on a header
+ * Propagates `impl java|node` classes that are set on a header
  * down to sub headers. Example:
  * ```md
  * # Header 1 {.node}
@@ -10,12 +10,12 @@ import { MarkdownRenderer } from 'vitepress'
  * ```
  * Will result in HTML like this
  * ```html
- * <h1 class="node">
- * <p class="node">Text</p>
- * <h2 class="node">
+ * <h1 class="impl node">
+ * <p class="impl node">Text</p>
+ * <h2 class="impl node">
  * ```
  */
-export function install(md: MarkdownRenderer, classRegex=/\b(node|java)\b/) {
+export function install(md: MarkdownRenderer, classRegex=/impl (node|java)/) {
 
   // propagates class in sub headers as token.attrs
   md.core.ruler.push('propagate_attrs', (state) => {

.vitepress/theme/components/ConfigInspect.vue

@@ -15,7 +15,6 @@
       </div>
       <div class="vp-code-group vp-doc" v-else>
         <CodeGroup :groups="[
-          { id: 'pkg-priv', label: '~/.cdsrc.json',  lang: 'json',       group, code: pkgStr, private: true },
           { id: 'pkg', label: 'package/.cdsrc.json', lang: 'json',       group, code: pkgStr },
           { id: 'js',  label: '.cdsrc.js',           lang: 'js',         group, code: jsStr },
           { id: 'yml', label: '.cdsrc.yaml',         lang: 'yml',        group, code: ymlStr },
@@ -35,11 +34,10 @@
   import FloatingVue from 'floating-vue'
   import yaml from 'yaml'
 
-  const { java, keyOnly, filesOnly, showPrivate, label:labelProp } = defineProps<{
+  const { java, keyOnly, filesOnly, label:labelProp } = defineProps<{
     java?: boolean,
     keyOnly?: boolean,
     filesOnly?: boolean,
-    showPrivate?: boolean,
     label?: string
   }>()
 
@@ -48,7 +46,6 @@
     ({ groups }) => () => [
       h('div', { class: 'tabs' }, groups
         .filter((b) => filesOnly ? !b.transient : true)
-        .filter((b) => showPrivate ? true : !b.private)
         .flatMap((b, idx) => [
           h('input', { type: 'radio', name: 'group', id: `${b.group}-${b.id}`, checked: idx === 0 }),
           h('label', { for: `${b.group}-${b.id}` }, b.label)
@@ -68,7 +65,7 @@
       ]))
     ], {
       props: {
-        groups: { type: Array<{id:string, group:string, code:string, label:string, lang:string, transient?:boolean, private?:boolean }>, required: true }
+        groups: { type: Array<{id:string, group:string, code:string, label:string, lang:string, transient?:boolean }>, required: true }
       }
     }
   )

.vitepress/theme/styles.scss

@@ -367,7 +367,7 @@ main {
   .prefer::before { content: 'Prefer: '; color: #0a0 }
   .avoid::before { content: 'Avoid: '; color: #e00 }
 
-  .good, .green { color:#0a0; .dark & { color:#0a0 } };
+  .good, .green { color:#0a0 };
   .bad, .red, .important { color:darkred; .dark & { color:#e00 } }
   .grey { color:#777 };
 

README.md

@@ -53,4 +53,4 @@ We as members, contributors, and leaders pledge to make participation in our com
 
 ## Licensing
 
-Copyright 2023-2025 SAP SE or an SAP affiliate company and CAP contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/SAP/cap-js/docs).
+Copyright 2023-2024 SAP SE or an SAP affiliate company and CAP contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/SAP/cap-js/docs).

cds/cdl.md

@@ -815,7 +815,7 @@ In CAP Java, run a select statement against the view with named [parameter value
 
 ::: code-group
 ```js [Node]
-SELECT.from({ ref: [{ id: 'UsingView', args: { bar: { val: true }}} ]} )
+SELECT.from({ id: 'UsingView'. args: { bar: { val: true }}})
 ```
 ```Java [Java]
 var params = Map.of("bar", true);

cds/cxn.md

@@ -137,18 +137,17 @@ _operator = string
 Examples:
 
 ```js
-[dev] cds repl
-> cds.parse.expr(`x<9`)  == 
+cds.parse.expr(`x<9`)  ==//> returns:
 {xpr:[ {ref:['x']}, '<', {val:9} ]}
 
-> cds.parse.expr(`x<9 and (y=1 or z=2)`)  == 
+cds.parse.expr(`x<9 and (y=1 or z=2)`)  ==//> returns:
 {xpr:[
   {ref:['x']}, '<', {val:9}, 'and', {xpr:[
     {ref:['y']}, '=', {val:1}, 'or', {ref:['z']}, '=', {val:2}
   ]}
 ]}
 
-> cds.parse.expr(`exists books[year = 2000]`)  ==
+cds.parse.expr(`exists books[year = 2000]`)  ==//> returns:
 {xpr:[
   'exists',
   {ref: [ {id:'books', where:[ {'ref':['year']}, '=', {'val': 2000} ]}]}
@@ -161,8 +160,7 @@ As an exception to that rule, CDS supports the ternary conditional operator on s
 but immediately converts it to the corresponding CASE expression in CXN:
 
 ```js
-[dev] cds repl
-> cds.parse.expr(`x<10 ? y : z`)  ==
+cds.parse.expr(`x<10 ? y : z`)  ==//> returns:
 {xpr:['case', 'when', {ref:['x']}, '<', {val:10},
       'then', {ref:['y']}, 'else', {ref:['z']}, 'end']}
 ```
@@ -179,10 +177,9 @@ param = { ref:[ '?' | number | name ], param:true }
 
 Examples:
 ```js
-[dev] cds repl
-> cds.parse.expr(`x=:1`) //> [{ref:['x']}, '=', {ref:[1], param:true}]
-> cds.parse.expr(`x=:y`) //> [{ref:['x']}, '=', {ref:['y'], param:true}]
-> cds.parse.expr(`x=?`)  //> [{ref:['x']}, '=', {ref:['?'], param:true}]
+cds.parse.expr(`x=:1`) == [{ref:['x']}, '=', {ref:[1], param:true}]
+cds.parse.expr(`x=:y`) == [{ref:['x']}, '=', {ref:['y'], param:true}]
+cds.parse.expr(`x=?`)  == [{ref:['x']}, '=', {ref:['?'], param:true}]
 ```
 
 ## Sub Queries

get-started/in-a-nutshell.md

@@ -193,7 +193,7 @@ cds db/schema.cds -2 yml
 cds db/schema.cds -2 sql
 ```
 
-[Learn more about the command line interface by executing `cds help`.](../tools/cds-cli#cds-help){.learn-more}
+[Learn more about the command line interface by executing `cds help`.](#cli){.learn-more}
 
 
 

get-started/troubleshooting.md

@@ -715,35 +715,6 @@ cf logs <appname> --recent
 If you omit the option `--recent`, you can run this command in parallel to your deployment and see the logs as they come in.
 :::
 
-### Why do I get "404 Not Found: Requested route does not exist"?
-
-In order to send a request to an app, it must be associated with a route.
-Please see [Cloud Foundry Documentation -> Routes](https://docs.cloudfoundry.org/devguide/deploy-apps/routes-domains.html#routes) for details.
-As this is done automatically by default, the process is mostly transparent for developers.
-
-If you receive an error response `404 Not Found: Requested route ('<route>') does not exist`, this can have two reasons:
-1. The route really does not exist or is not bound to an app.
-  You can check this in SAP BTP cockpit either in the app details view or in the list of routes in the Cloud Foundry space.
-2. The app (or all app instances, in case of horizontal scale-out) failed the readiness check.
-  Please see [Health Checks](../guides/deployment/health-checks.md) and [Using Cloud Foundry health checks](https://docs.cloudfoundry.org/devguide/deploy-apps/healthchecks.html) for details on how to set up the check.
-
-    ::: details Troubleshoot using the Cloud Foundry CLI
-    
-    ```sh
-    cf apps # -> list all apps
-    cf app <your app name> # -> get details on your app, incl. state and routes
-    cf app <your app name> --guid # -> get your app's guid
-    cf curl "/v3/processes/<your app guid>/stats"
-      # -> list of processes (one per app instance) with property "routable"
-      #    indicating whether the most recent readiness check was successful
-    ```
-    
-    See [cf curl](https://cli.cloudfoundry.org/en-US/v7/curl.html) and [The process stats object](https://v3-apidocs.cloudfoundry.org/version/3.184.0/index.html#the-process-stats-object) for details on how to use the CLI.
-    
-    :::
-
-
-
 ## CAP on Kyma
 
 ### Pack Command Fails with Error `package.json and package-lock.json aren't in sync`

guides/data-privacy/audit-logging.md

@@ -42,25 +42,24 @@ npm add @cap-js/audit-logging
 
 1. Sets <Config>cds.requires.audit-log: true</Config>
 
-2. Which in turn activates the effective `audit-log` configuration via **presets**:
+2. Which in turn activates the `audit-log` configuration **presets**:
     ```jsonc
     {
-      "audit-log": {
-        "handle": ["READ", "WRITE"],
-        "outbox": true,
-        "[development]": { "kind": "audit-log-to-console" },
-        "[hybrid]": { "kind": "audit-log-to-restv2" },
-        "[production]": { "kind": "audit-log-to-restv2" }
-      },
-      "kinds": {
-        "audit-log-to-console": {
-          "impl": "@cap-js/audit-logging/srv/log2console"
-        },
-        "audit-log-to-restv2": {
-          "impl": "@cap-js/audit-logging/srv/log2restv2",
-          "vcap": { "label": "auditlog" }
-        }
-      }
+       "audit-log": {
+         "handle": [ "READ", "WRITE" ],
+         "outbox": true
+         "[development]": {
+           "impl": "@cap-js/audit-logging/srv/log2console"
+         },
+         "[hybrid]": {
+           "impl": "@cap-js/audit-logging/srv/log2restv2",
+           "vcap": { "label": "auditlog" }
+         },
+         "[production]": {
+           "impl": "@cap-js/audit-logging/srv/log2restv2",
+           "vcap": { "label": "auditlog" }
+         }
+       }
     }
     ```
 
@@ -183,7 +182,7 @@ There are two options to access audit logs:
 
 ### Behind the Scenes...
 
-For all [defined services](../providing-services#service-definitions), the generic audit logging implementation does the following:
+The generic audit logging implementation does the following:
 
 - Intercept all write operations potentially involving personal data.
 - Intercept all read operations potentially involving sensitive data.

guides/databases-postgres.md

@@ -183,8 +183,7 @@ spring:
 ```
 :::
 To start the application with the new profile `postgres-docker`, the `spring-boot-maven-plugin` can be used: `mvn spring-boot:run -Dspring-boot.run.profiles=postgres-docker`.
-
-[Learn more about the configuration of a PostgreSQL database](../java/cqn-services/persistence-services#postgresql-1){ .learn-more}
+Learn more about the [configuration of a PostgreSQL database](../java/cqn-services/persistence-services#postgresql-1){ .learn-more}
 
 ### Service Bindings for CDS Tooling {.java}
 

guides/databases-sqlite.md

@@ -611,10 +611,9 @@ entity Foo {
 The behaviour has changed to:
 
 ```js
-[dev] cds repl
-> SELECT.from('Foo')         //> [{ foo:1, bar:null }, ...] // [!code --]
-> SELECT.from('Foo')         //> [{ foo:1 }, ...]
-> SELECT('bar').from('Foo')  //> ERROR: no columns to read
+SELECT.from('Foo')         //> [{ foo:1, bar:null }, ...] // [!code --]
+SELECT.from('Foo')         //> [{ foo:1 }, ...]
+SELECT('bar').from('Foo')  //> ERROR: no columns to read
 ```
 
 ### <> Operator {.node}