Skip to content

Commit 63cf4fd

Browse files
committed
Merge branch 'main' of https://github.com/capire/docs
2 parents b6bfdd5 + 75e50d7 commit 63cf4fd

17 files changed

+133
-105
lines changed

.github/cli/grab-cli-texts.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ const toOutput = (str) => [
2020
`> ${cmd}`,
2121
'',
2222
str
23-
.replace(/\n.*home.*[|:].*/g, '') // remove absolute cds home path as it's system-specific
23+
.replace(/([\S]+)\/node_modules/g, '.../node_modules') // remove system-specific paths
24+
.replace(/([\S]+)\/bin\/node/g, '.../bin/node')
25+
.replace(/([\S]+)\/your-project/g, '.../your-project') // sample project path
2426
.replace(/\<(.*?)\>/g, '&lt;$1&gt;') // <foo> -> &lt;foo&gt;
25-
.replace(/^\x1b\[1m(.*?)\x1b\[(:?0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
26-
.replace(/(\s*)\x1b\[4m(.*?)\x1b\[(:?0|39|49)m/g, '$1<i>$2</i>') // underline -> i
27-
.replace(/(\s*)\x1b\[\d+m(.*?)\x1b\[(:?0|39|49)m/g, '$1<em>$2</em>') // other colors -> em
27+
.replace(/^\x1b\[1m(.*?)\x1b\[(?:0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
28+
.replace(/(\s*)\x1b\[(?:2|4)m(.*?)\x1b\[(?:0|39|49)m/g, '$1<i>$2</i>') // underline or grey -> i
29+
.replace(/(\s*)\x1b\[[1-9]+m(.*?)\x1b\[(?:0|32|33|39|49)m/g, '$1<em>$2</em>') // other colors -> em
30+
.replace(/\x1b\[0m/g, '') // remove all remaining resets
2831
,
2932
`</pre>`
3033
].join('\n')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dir=`dirname -- "$0"`
66
proj=/tmp/your-project
77
rm -rf ${proj}
88
mkdir -p `dirname ${proj}`
9-
pushd `dirname ${proj}` && cds init `basename ${proj}` && pushd `basename ${proj}` && npm i && popd && popd
9+
pushd `dirname ${proj}` && cds init `basename ${proj}` --nodejs && pushd `basename ${proj}` && npm i && popd && popd
1010

1111
echo
1212
echo "Grabbing CLI texts..."

.github/workflows/PR-SAP.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: PR Build (SAP)
22

33
on:
44
pull_request:
5-
branches: [main]
65
merge_group:
76

87
concurrency:

.github/workflows/update-content.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Set up Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v6
2323
with:
24-
node-version: '22'
24+
node-version: 24
2525

2626
- name: Extract CLI texts
2727
run: |
@@ -51,12 +51,12 @@ jobs:
5151

5252
steps:
5353
- name: Checkout repository
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v6
5555

5656
- name: Set up Node.js
57-
uses: actions/setup-node@v4
57+
uses: actions/setup-node@v6
5858
with:
59-
node-version: '22'
59+
node-version: 24
6060

6161
- name: Update Java Properties
6262
run: |

guides/protocols/odata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ OData is an OASIS standard that enhances plain REST with standardized system que
4040
| [Parameters Aliases](https://docs.oasis-open.org/odata/odata/v4.01/os/part1-protocol/odata-v4.01-os-part1-protocol.html#sec_ParameterAliases) | Replace literal value in URL with parameter alias | <X/> | <X/> <sup>(4)</sup> |
4141

4242
- <sup>(1)</sup> The elements to be searched are specified with the [`@cds.search` annotation](../services/served-ootb#searching-data).
43-
- <sup>(2)</sup> Node.js only supports a limited subset in `$select` query option.
43+
- <sup>(2)</sup> Node.js only supports a limited subset.
4444
- <sup>(3)</sup> The navigation path identifying the collection can only contain one segment.
4545
- <sup>(4)</sup> Supported for key values and for parameters of functions only.
4646

node.js/cds-ql.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,12 @@ INSERT.into (Books) .columns (
938938
[ 252, 'Eleonora', 150, 234 ]
939939
)
940940
```
941+
942+
::: tip In Essence:
943+
944+
[Managed fields](../guides/domain/index#managed-data) and [UUIDs](../guides/domain/index#prefer-uuids-for-keys) are automatically filled with `INSERT.entries()`, but not when using `INSERT.columns().values()` or `INSERT.columns().rows()`.
945+
:::
946+
941947
### from() {.method #from}
942948
943949

package-lock.json

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/assets/help/cds-add.out.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070

7171
Overwrite all files in case the target files already exist.
7272

73-
<em>--package</em> &lt;name&gt;
73+
<em>--package | -p</em> &lt;name&gt;
7474

75-
Pull a package from your npm registry.
75+
Pull a package from your configured npm registry.
7676

7777

7878
<strong>FEATURE OPTIONS</strong>

tools/assets/help/cds-compile.out.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,5 @@
126126
<em>cds</em> compile model.cds
127127
<em>cds</em> c model.json --to sql
128128
<em>cds</em> srv -s all -l all -2 edmx -o out
129-
<em>cds</em> compile srv -s sap.sample.TestService -2 asyncapi -o [0mout
129+
<em>cds</em> compile srv -s sap.sample.TestService -2 asyncapi -o out
130130
</pre>

tools/assets/help/cds-debug.out.md

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,49 @@
55
<strong>SYNOPSIS</strong>
66
<em>cds debug</em> [&lt;app&gt;]
77

8-
Debug applications running locally or remotely on Cloud Foundry.
9-
Local applications will be started in debug mode, while remote applications
10-
are put into debug mode.
8+
Debug applications running locally or remotely on Cloud Foundry or Kubernetes.
119

12-
If &lt;app&gt; is given, it's assumed to be running on the currently logged-in
13-
Cloud Foundry space (check with 'cf target').
14-
SSH access to the app is required (check with 'cf ssh-enabled').
15-
Chrome DevTools are opened automatically for Node.js applications.
10+
If &lt;app&gt; is given, it's assumed to be running on a remote system. The command defaults
11+
to Kubernetes if Helm deployment descriptors are present, otherwise Cloud Foundry.
12+
13+
For Cloud Foundry, the currently targeted space is used (check with 'cf target').
14+
For Kubernetes, the current context and namespace are used (check with 'kubectl config get-contexts').
15+
16+
SSH access to the app is required (check with 'cf ssh-enabled' on Cloud Foundry).
1617

1718
If no &lt;app&gt; is given, the app in the current working directory is started
1819
(with 'cds watch --debug' for Node.js and 'mvn spring-boot:run' for Java).
1920

21+
For Node.js, Chrome DevTools are opened automatically unless <em>--no-devtools</em> is set.
22+
2023
<strong>OPTIONS</strong>
2124
<em>-h</em> | <em>--host</em>
2225

23-
the debug host (default: '127.0.0.1')
26+
The debug host (default: '127.0.0.1').
2427

2528
<em>-p</em> | <em>--port</em>
2629

27-
the debug port (default: '9229' for Node.js, '8000' for Java)
30+
The debug port (default: '9229' for Node.js, '8000' for Java).
31+
32+
<em>--cf</em>
33+
34+
Force Cloud Foundry mode.
35+
36+
<em>--k8s</em>
37+
38+
Force Kubernetes mode. Use env vars KUBE_NAMESPACE or NAMESPACE to select a namespace.
2839

2940
<em>--no-devtools</em>
3041

31-
don't open developer tools automatically
42+
Don't open developer tools automatically (Node.js only).
3243

3344
<em>-f</em> | <em>--force</em>
3445

35-
if necessary, automatically enable ssh for the app and restart it
46+
If necessary, automatically enable SSH for the app and restart it.
3647

3748
<strong>EXAMPLES</strong>
3849
<em>cds debug</em>
3950
<em>cds debug</em> bookshop-srv --port 8001
4051
<em>cds debug</em> bookshop-srv --host 0.0.0.0
52+
<em>cds debug</em> --k8s bookshop-srv
4153
</pre>

0 commit comments

Comments
 (0)