@sap/cds-dk 10.1.0 → 10.1.1

package/bin/completion/scripts/cds.ps1

@@ -22,7 +22,7 @@ $_CDS_COMMAND = "cds"
 #   __shortcuts   — hashtable of shortcut → canonical command name
 #   __positionals — hashtable of command → array of known positional string values
 #   __optionValues — hashtable of command → hashtable of flag → array of values,
-#                   or one of the file sentinels ':file', ':dir', ':file:ext1,ext2'
+#                   or one of the file sentinels ':file', ':dir', ':file:ext1,ext2', ':file+dir:ext1,ext2'
 #   __commaCases  — hashtable of command → hashtable of flag → array of comma-separable values
 #   <cmd>         — array of flags/options for that subcommand (used by step 3)
 $_CDS_COMPLETIONS = @{
@@ -52,12 +52,17 @@ $_CDS_COMPLETIONS = @{
     '__optionValues' = @{
     'bind' = @{
         '--on' = @('cf', 'k8s');
+        '--for' = @('development', 'hybrid', 'production');
+        '-4' = @('development', 'hybrid', 'production');
         '--out' = ':file';
-        '--output-file' = ':file'
+        '--output-file' = ':file';
+        '--credentials' = ':file:json';
+        '-c' = ':file:json'
     };
     'build' = @{
         '--for' = @('hana', 'helm', 'java', 'mtx', 'mtx-extension', 'mtx-sidecar', 'nodejs');
         '--log-level' = @('debug', 'error', 'info', 'warn');
+        '--project' = ':dir';
         '--dest' = ':dir';
         '--src' = ':dir'
     };
@@ -72,7 +77,8 @@ $_CDS_COMPLETIONS = @{
         '--service' = @('all');
         '--lang' = @('all');
         '--dest' = ':dir';
-        '_' = ':file:cds,json'
+        '--openapi:config-file' = ':file:json';
+        '_' = ':file+dir:cds,json'
     };
     'completion' = @{
         '--shell' = @('bash', 'fish', 'gitbash', 'ps', 'zsh')
@@ -80,19 +86,44 @@ $_CDS_COMPLETIONS = @{
     'deploy' = @{
         '--to' = @('hana', 'sqlite');
         '--on' = @('cf', 'k8s');
-        '_' = ':file:cds,json'
+        '--for' = @('development', 'hybrid', 'production');
+        '-4' = @('development', 'hybrid', 'production');
+        '--vcap-file' = ':file:json';
+        '--delta-from' = ':file:json';
+        '_' = ':file+dir:cds,json'
+    };
+    'env' = @{
+        '--for' = @('development', 'hybrid', 'production');
+        '-4' = @('development', 'hybrid', 'production')
+    };
+    'export' = @{
+        '--as' = @('cdl', 'csn');
+        '--for' = @('mvn', 'npm');
+        '_' = ':file+dir:cds,json';
+        '--to' = ':dir'
     };
     'import' = @{
         '--from' = @('asyncapi', 'edmx', 'openapi');
         '--as' = @('cds', 'csn', 'json');
+        '--out' = ':dir';
+        '-o' = ':dir';
         '_' = ':file:json,xml,edmx'
     };
     'init' = @{
-        '--java:package' = ':dir'
+        '--java:package' = ':dir';
+        '--base' = ':dir'
     };
     'inspect' = @{
         '--kind' = @('aspect', 'entity', 'service', 'type');
-        '_' = ':file:cds,json'
+        '--list' = @('all', 'associations', 'compositions', 'elements', 'ids', 'keys', 'names', 'sources');
+        '-l' = @('all', 'associations', 'compositions', 'elements', 'ids', 'keys', 'names', 'sources');
+        '_' = ':file+dir:cds,json'
+    };
+    'lint' = @{
+        '_' = ':file+dir:js,ts,cds'
+    };
+    'minify' = @{
+        '_' = ':file+dir:cds,json'
     };
     'parse' = @{
         '--to' = @('asyncapi', 'cdl', 'edm', 'edmx', 'edmx-v2', 'edmx-v4', 'hana', 'hdbtable', 'json', 'openapi', 'sql', 'xsuaa', 'yml');
@@ -105,17 +136,51 @@ $_CDS_COMPLETIONS = @{
         '--service' = @('all');
         '--lang' = @('all');
         '--dest' = ':dir';
-        '_' = ':file:cds,json'
+        '--openapi:config-file' = ':file:json';
+        '_' = ':file+dir:cds,json'
+    };
+    'repl' = @{
+        '--use' = @('entities', 'ql', 'services', 'xl');
+        '-u' = @('entities', 'ql', 'services', 'xl');
+        '_' = ':dir';
+        '--run' = ':dir';
+        '-r' = ':dir'
+    };
+    'run' = @{
+        '--to' = @('fiori', 'odata', 'rest');
+        '-2' = @('fiori', 'odata', 'rest');
+        '_' = ':dir';
+        '--from' = ':dir';
+        '-f' = ':dir';
+        '--with' = ':dir';
+        '-w' = ':dir'
+    };
+    'serve' = @{
+        '--to' = @('fiori', 'odata', 'rest');
+        '-2' = @('fiori', 'odata', 'rest');
+        '_' = ':dir';
+        '--from' = ':dir';
+        '-f' = ':dir';
+        '--with' = ':dir';
+        '-w' = ':dir'
     };
     'up' = @{
-        '--to' = @('cf', 'k8s')
+        '--to' = @('cf', 'k8s');
+        '--overlay' = ':file:mtaext'
     };
     'version' = @{
         '--omit' = @('dev', 'optional', 'peer')
     };
     'watch' = @{
+        '--to' = @('fiori', 'odata', 'rest');
+        '-2' = @('fiori', 'odata', 'rest');
         '--experimental-hot-reload' = @('false', 'true');
         '--livereload' = @('false');
+        '_' = ':dir';
+        '--from' = ':dir';
+        '-f' = ':dir';
+        '--with' = ':dir';
+        '-w' = ':dir';
         '--include' = ':dir';
         '--exclude' = ':dir'
     }
@@ -128,7 +193,7 @@ $_CDS_COMPLETIONS = @{
         '--add' = @('ai', 'ams', 'app-frontend', 'application-logging', 'approuter', 'attachments', 'audit-logging', 'cf-manifest', 'cjs', 'cloud-logging', 'completion', 'connectivity', 'console', 'data', 'destination', 'dynatrace', 'enterprise-messaging', 'enterprise-messaging-shared', 'event-mesh', 'event-mesh-shared', 'extensibility', 'extension', 'file-based-messaging', 'github-actions', 'h2', 'hana', 'hana-serverless', 'handler', 'html5-repo', 'http', 'ias', 'initial', 'kafka', 'kyma', 'lint', 'liquibase', 'local-messaging', 'malware-scanner', 'mta', 'mtx', 'multitenancy', 'notifications', 'pipeline', 'portal', 'postgres', 'react', 'redis', 'redis-messaging', 'sample', 'side-by-side-extensibility', 'sqlite', 'telemetry', 'test', 'tiny-sample', 'toggles', 'typer', 'typescript', 'ui5', 'vue', 'workzone', 'workzone-standard', 'xsuaa')
     }
     };
-    'add' = @('--base', '--cdm', '--cloudevents', '--content-type', '--data:for', '--dry', '--filter', '--for', '--for-app', '--force', '--into', '--java:mvn', '--keys-only', '--out', '--package', '--plan', '--records', '--sap', '--shell', '--unified-runtime', '--with-telemetry', '--y');
+    'add' = @('--base', '--cdm', '--cloudevents', '--composition-records', '--content-type', '--data:for', '--dry', '--filter', '--for', '--for-app', '--force', '--into', '--java:mvn', '--keys-only', '--out', '--package', '--plan', '--records', '--sap', '--shell', '--unified-runtime', '--with-telemetry', '--y');
     'bind' = @('--credentials', '--exec', '--for', '--kind', '--no-create-service-key', '--on', '--out', '--output-file', '--to', '--to-app-services');
     'build' = @('--dest', '--for', '--log-level', '--no-clean', '--no-ws-pack', '--options-model', '--opts', '--project', '--src', '--ws', '--ws-pack');
     'compile' = @('--all', '--asyncapi:merged', '--beta', '--clean', '--conceptual', '--dest', '--dialect', '--docs', '--files', '--flavor', '--for', '--from', '--lang', '--locations', '--log-level', '--min', '--odata-version', '--openapi:config-file', '--openapi:diagram', '--openapi:servers', '--openapi:url', '--parse', '--plain', '--resolved', '--service', '--sort', '--sources', '--sql-dialect', '--to');
@@ -175,14 +240,16 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
 
     # Helper: emit file/dir completions for a sentinel value.
     # Sentinel formats: ':file' (any file), ':dir' (directories only),
-    #                   ':file:ext1,ext2' (files with specific extensions).
+    #                   ':file:ext1,ext2' (files with specific extensions),
+    #                   ':file+dir:ext1,ext2' (files with extensions + directories).
     # Uses relative paths (preserving any typed prefix) so the completed text stays short.
     function _CdsFileComplete($sentinel, $word) {
         $base   = if ($word) { $word } else { '' }
         $search = if ($word) { "$word*" } else { '*' }
-        # Parse extension list from ':file:cds,json' → @('.cds', '.json')
-        $exts = if ($sentinel -like ':file:*') {
-            ($sentinel -replace '^:file:', '').Split(',') | ForEach-Object { ".$_" }
+        $inclDirs = $sentinel -like ':file+dir:*'
+        # Parse extension list from ':file:cds,json' or ':file+dir:cds,json' → @('.cds', '.json')
+        $exts = if ($sentinel -like ':file:*' -or $inclDirs) {
+            ($sentinel -replace '^:file(\+dir)?:', '').Split(',') | ForEach-Object { ".$_" }
         } else { $null }
         if ($sentinel -eq ':dir') {
             Get-ChildItem -Path $search -Directory -ErrorAction SilentlyContinue |
@@ -197,6 +264,13 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
                     $rel = $base + $_.Name
                     [System.Management.Automation.CompletionResult]::new($rel, $_.Name, 'ProviderItem', $_.Name)
                 }
+            if ($inclDirs) {
+                Get-ChildItem -Path $search -Directory -ErrorAction SilentlyContinue |
+                    ForEach-Object {
+                        $rel = $base + $_.Name
+                        [System.Management.Automation.CompletionResult]::new($rel, $_.Name, 'ProviderContainer', $_.Name)
+                    }
+            }
         }
     }
 
@@ -247,7 +321,7 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
     if ($null -ne $optVals) {
         $entry = $optVals[$previousWord]
         if ($null -ne $entry) {
-            if ($entry -eq ':dir' -or $entry -eq ':file' -or $entry -like ':file:*') {
+            if ($entry -eq ':dir' -or $entry -eq ':file' -or $entry -like ':file:*' -or $entry -like ':file+dir:*') {
                 _CdsFileComplete $entry $wordToComplete
             } else {
                 foreach ($val in $entry) {

package/bin/completion/scripts/cds.sh

@@ -60,7 +60,7 @@ _completeCds()
     # Step 3: flag/option completion — only triggered when the token starts with '-'.
     if [[ "$current" == -* ]]; then
         case "$cmd" in
-            add) COMPREPLY=( $(compgen -W ""--base" "--cdm" "--cloudevents" "--content-type" "--data:for" "--dry" "--filter" "--for" "--for-app" "--force" "--into" "--java:mvn" "--keys-only" "--out" "--package" "--plan" "--records" "--sap" "--shell" "--unified-runtime" "--with-telemetry" "--y"" -- "$current") ) ;;
+            add) COMPREPLY=( $(compgen -W ""--base" "--cdm" "--cloudevents" "--composition-records" "--content-type" "--data:for" "--dry" "--filter" "--for" "--for-app" "--force" "--into" "--java:mvn" "--keys-only" "--out" "--package" "--plan" "--records" "--sap" "--shell" "--unified-runtime" "--with-telemetry" "--y"" -- "$current") ) ;;
             bind) COMPREPLY=( $(compgen -W ""--credentials" "--exec" "--for" "--kind" "--no-create-service-key" "--on" "--out" "--output-file" "--to" "--to-app-services"" -- "$current") ) ;;
             build) COMPREPLY=( $(compgen -W ""--dest" "--for" "--log-level" "--no-clean" "--no-ws-pack" "--options-model" "--opts" "--project" "--src" "--ws" "--ws-pack"" -- "$current") ) ;;
             compile) COMPREPLY=( $(compgen -W ""--all" "--asyncapi:merged" "--beta" "--clean" "--conceptual" "--dest" "--dialect" "--docs" "--files" "--flavor" "--for" "--from" "--lang" "--locations" "--log-level" "--min" "--odata-version" "--openapi:config-file" "--openapi:diagram" "--openapi:servers" "--openapi:url" "--parse" "--plain" "--resolved" "--service" "--sort" "--sources" "--sql-dialect" "--to"" -- "$current") ) ;;
@@ -103,13 +103,18 @@ _completeCds()
         bind)
             case "$previous" in
             --on) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --for) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
+            -4) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
             --out) COMPREPLY=( $(compgen -f -- "$current") ) ; return 0 ;;
             --output-file) COMPREPLY=( $(compgen -f -- "$current") ) ; return 0 ;;
+            --credentials) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
+            -c) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
             esac ;;
         build)
             case "$previous" in
             --for) COMPREPLY=( $(compgen -W ""hana" "helm" "java" "mtx" "mtx-extension" "mtx-sidecar" "nodejs"" -- "$current") ) ; return 0 ;;
             --log-level) COMPREPLY=( $(compgen -W ""debug" "info" "warn" "error"" -- "$current") ) ; return 0 ;;
+            --project) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             --dest) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             --src) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
@@ -125,6 +130,7 @@ _completeCds()
             --service) COMPREPLY=( $(compgen -W ""all"" -- "$current") ) ; return 0 ;;
             --lang) COMPREPLY=( $(compgen -W ""all"" -- "$current") ) ; return 0 ;;
             --dest) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --openapi:config-file) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
             esac ;;
         completion)
             case "$previous" in
@@ -134,19 +140,39 @@ _completeCds()
             case "$previous" in
             --to) COMPREPLY=( $(compgen -W ""sqlite" "hana"" -- "$current") ) ; return 0 ;;
             --on) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --for) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
+            -4) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
+            --vcap-file) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
+            --delta-from) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
+            esac ;;
+        env)
+            case "$previous" in
+            --for) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
+            -4) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
+            esac ;;
+        export)
+            case "$previous" in
+            --as) COMPREPLY=( $(compgen -W ""csn" "cdl"" -- "$current") ) ; return 0 ;;
+            --for) COMPREPLY=( $(compgen -W ""npm" "mvn"" -- "$current") ) ; return 0 ;;
+            --to) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
         import)
             case "$previous" in
             --from) COMPREPLY=( $(compgen -W ""asyncapi" "edmx" "openapi"" -- "$current") ) ; return 0 ;;
             --as) COMPREPLY=( $(compgen -W ""cds" "csn" "json"" -- "$current") ) ; return 0 ;;
+            --out) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -o) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
         init)
             case "$previous" in
             --java:package) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --base) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
         inspect)
             case "$previous" in
             --kind) COMPREPLY=( $(compgen -W ""entity" "aspect" "type" "service"" -- "$current") ) ; return 0 ;;
+            --list) COMPREPLY=( $(compgen -W ""names" "elements" "keys" "associations" "compositions" "ids" "sources" "all"" -- "$current") ) ; return 0 ;;
+            -l) COMPREPLY=( $(compgen -W ""names" "elements" "keys" "associations" "compositions" "ids" "sources" "all"" -- "$current") ) ; return 0 ;;
             esac ;;
         parse)
             case "$previous" in
@@ -160,10 +186,37 @@ _completeCds()
             --service) COMPREPLY=( $(compgen -W ""all"" -- "$current") ) ; return 0 ;;
             --lang) COMPREPLY=( $(compgen -W ""all"" -- "$current") ) ; return 0 ;;
             --dest) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --openapi:config-file) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
+            esac ;;
+        repl)
+            case "$previous" in
+            --use) COMPREPLY=( $(compgen -W ""xl" "ql" "entities" "services"" -- "$current") ) ; return 0 ;;
+            -u) COMPREPLY=( $(compgen -W ""xl" "ql" "entities" "services"" -- "$current") ) ; return 0 ;;
+            --run) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -r) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            esac ;;
+        run)
+            case "$previous" in
+            --to) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
+            -2) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
+            --from) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -f) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --with) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -w) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            esac ;;
+        serve)
+            case "$previous" in
+            --to) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
+            -2) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
+            --from) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -f) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --with) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -w) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
         up)
             case "$previous" in
             --to) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --overlay) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(mtaext)$') ) ; return 0 ;;
             esac ;;
         version)
             case "$previous" in
@@ -171,8 +224,14 @@ _completeCds()
             esac ;;
         watch)
             case "$previous" in
+            --to) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
+            -2) COMPREPLY=( $(compgen -W ""odata" "fiori" "rest"" -- "$current") ) ; return 0 ;;
             --experimental-hot-reload) COMPREPLY=( $(compgen -W ""true" "false"" -- "$current") ) ; return 0 ;;
             --livereload) COMPREPLY=( $(compgen -W ""false"" -- "$current") ) ; return 0 ;;
+            --from) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -f) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            --with) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
+            -w) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             --include) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             --exclude) COMPREPLY=( $(compgen -d -- "$current") ) ; return 0 ;;
             esac ;;
@@ -226,11 +285,18 @@ _completeCds()
 
     # Step 4: file-sentinel positionals — fill COMPREPLY with files and return.
     case "$cmd" in
-            compile) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(cds|json)$') ) ;;
-            deploy) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(cds|json)$') ) ;;
+            compile) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
+            deploy) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
+            export) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
             import) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json|xml|edmx)$') ) ;;
-            inspect) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(cds|json)$') ) ;;
-            parse) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(cds|json)$') ) ;;
+            inspect) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
+            lint) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(js|ts|cds)$'; compgen -d -- "$current"; }) ) ;;
+            minify) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
+            parse) COMPREPLY=( $({ compgen -f -- "$current" | grep -E '\.(cds|json)$'; compgen -d -- "$current"; }) ) ;;
+            repl) COMPREPLY=( $(compgen -d -- "$current") ) ;;
+            run) COMPREPLY=( $(compgen -d -- "$current") ) ;;
+            serve) COMPREPLY=( $(compgen -d -- "$current") ) ;;
+            watch) COMPREPLY=( $(compgen -d -- "$current") ) ;;
     esac
     if [[ "${#COMPREPLY[@]}" -gt 0 ]]; then
         compopt -o nospace

package/bin/completion/scripts/cds.zsh

@@ -57,7 +57,7 @@ _completeCds() {
     # 'case ... esac && return' exits the function when a case arm matched.
     if [[ "$current" == -* ]]; then
         case "$cmd" in
-        add) compadd -S '' -- "--base" "--cdm" "--cloudevents" "--content-type" "--data:for" "--dry" "--filter" "--for" "--for-app" "--force" "--into" "--java:mvn" "--keys-only" "--out" "--package" "--plan" "--records" "--sap" "--shell" "--unified-runtime" "--with-telemetry" "--y" ;;
+        add) compadd -S '' -- "--base" "--cdm" "--cloudevents" "--composition-records" "--content-type" "--data:for" "--dry" "--filter" "--for" "--for-app" "--force" "--into" "--java:mvn" "--keys-only" "--out" "--package" "--plan" "--records" "--sap" "--shell" "--unified-runtime" "--with-telemetry" "--y" ;;
         bind) compadd -S '' -- "--credentials" "--exec" "--for" "--kind" "--no-create-service-key" "--on" "--out" "--output-file" "--to" "--to-app-services" ;;
         build) compadd -S '' -- "--dest" "--for" "--log-level" "--no-clean" "--no-ws-pack" "--options-model" "--opts" "--project" "--src" "--ws" "--ws-pack" ;;
         compile) compadd -S '' -- "--all" "--asyncapi:merged" "--beta" "--clean" "--conceptual" "--dest" "--dialect" "--docs" "--files" "--flavor" "--for" "--from" "--lang" "--locations" "--log-level" "--min" "--odata-version" "--openapi:config-file" "--openapi:diagram" "--openapi:servers" "--openapi:url" "--parse" "--plain" "--resolved" "--service" "--sort" "--sources" "--sql-dialect" "--to" ;;
@@ -96,15 +96,20 @@ _completeCds() {
         bind)
             case "$previous" in
             --on) compadd -S '' -- "cf" "k8s" ; return ;;
-            --out) _files ; return ;;
-            --output-file) _files ; return ;;
+            --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            -4) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            --out) compstate[nomatches]='' ; _path_files ; return ;;
+            --output-file) compstate[nomatches]='' ; _path_files ; return ;;
+            --credentials) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
+            -c) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
             esac ;;
         build)
             case "$previous" in
             --for) compadd -S '' -- "hana" "helm" "java" "mtx" "mtx-extension" "mtx-sidecar" "nodejs" ; return ;;
             --log-level) compadd -S '' -- "debug" "error" "info" "warn" ; return ;;
-            --dest) _files -/ ; return ;;
-            --src) _files -/ ; return ;;
+            --project) compstate[nomatches]='' ; _files -/ ; return ;;
+            --dest) compstate[nomatches]='' ; _files -/ ; return ;;
+            --src) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
         compile)
             case "$previous" in
@@ -117,7 +122,8 @@ _completeCds() {
             --flavor) compadd -S '' -- "files" "inferred" "parsed" "sources" "xtended" ; return ;;
             --service) compadd -S '' -- "all" ; return ;;
             --lang) compadd -S '' -- "all" ; return ;;
-            --dest) _files -/ ; return ;;
+            --dest) compstate[nomatches]='' ; _files -/ ; return ;;
+            --openapi:config-file) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
             esac ;;
         completion)
             case "$previous" in
@@ -127,19 +133,39 @@ _completeCds() {
             case "$previous" in
             --to) compadd -S '' -- "hana" "sqlite" ; return ;;
             --on) compadd -S '' -- "cf" "k8s" ; return ;;
+            --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            -4) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            --vcap-file) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
+            --delta-from) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
+            esac ;;
+        env)
+            case "$previous" in
+            --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            -4) compadd -S '' -- "development" "hybrid" "production" ; return ;;
+            esac ;;
+        export)
+            case "$previous" in
+            --as) compadd -S '' -- "cdl" "csn" ; return ;;
+            --for) compadd -S '' -- "mvn" "npm" ; return ;;
+            --to) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
         import)
             case "$previous" in
             --from) compadd -S '' -- "asyncapi" "edmx" "openapi" ; return ;;
             --as) compadd -S '' -- "cds" "csn" "json" ; return ;;
+            --out) compstate[nomatches]='' ; _files -/ ; return ;;
+            -o) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
         init)
             case "$previous" in
-            --java:package) _files -/ ; return ;;
+            --java:package) compstate[nomatches]='' ; _files -/ ; return ;;
+            --base) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
         inspect)
             case "$previous" in
             --kind) compadd -S '' -- "aspect" "entity" "service" "type" ; return ;;
+            --list) compadd -S '' -- "all" "associations" "compositions" "elements" "ids" "keys" "names" "sources" ; return ;;
+            -l) compadd -S '' -- "all" "associations" "compositions" "elements" "ids" "keys" "names" "sources" ; return ;;
             esac ;;
         parse)
             case "$previous" in
@@ -152,11 +178,38 @@ _completeCds() {
             --flavor) compadd -S '' -- "files" "inferred" "parsed" "sources" "xtended" ; return ;;
             --service) compadd -S '' -- "all" ; return ;;
             --lang) compadd -S '' -- "all" ; return ;;
-            --dest) _files -/ ; return ;;
+            --dest) compstate[nomatches]='' ; _files -/ ; return ;;
+            --openapi:config-file) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
+            esac ;;
+        repl)
+            case "$previous" in
+            --use) compadd -S '' -- "entities" "ql" "services" "xl" ; return ;;
+            -u) compadd -S '' -- "entities" "ql" "services" "xl" ; return ;;
+            --run) compstate[nomatches]='' ; _files -/ ; return ;;
+            -r) compstate[nomatches]='' ; _files -/ ; return ;;
+            esac ;;
+        run)
+            case "$previous" in
+            --to) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
+            -2) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
+            --from) compstate[nomatches]='' ; _files -/ ; return ;;
+            -f) compstate[nomatches]='' ; _files -/ ; return ;;
+            --with) compstate[nomatches]='' ; _files -/ ; return ;;
+            -w) compstate[nomatches]='' ; _files -/ ; return ;;
+            esac ;;
+        serve)
+            case "$previous" in
+            --to) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
+            -2) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
+            --from) compstate[nomatches]='' ; _files -/ ; return ;;
+            -f) compstate[nomatches]='' ; _files -/ ; return ;;
+            --with) compstate[nomatches]='' ; _files -/ ; return ;;
+            -w) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
         up)
             case "$previous" in
             --to) compadd -S '' -- "cf" "k8s" ; return ;;
+            --overlay) compstate[nomatches]='' ; _path_files -g '*.mtaext' ; return ;;
             esac ;;
         version)
             case "$previous" in
@@ -164,10 +217,16 @@ _completeCds() {
             esac ;;
         watch)
             case "$previous" in
+            --to) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
+            -2) compadd -S '' -- "fiori" "odata" "rest" ; return ;;
             --experimental-hot-reload) compadd -S '' -- "false" "true" ; return ;;
             --livereload) compadd -S '' -- "false" ; return ;;
-            --include) _files -/ ; return ;;
-            --exclude) _files -/ ; return ;;
+            --from) compstate[nomatches]='' ; _files -/ ; return ;;
+            -f) compstate[nomatches]='' ; _files -/ ; return ;;
+            --with) compstate[nomatches]='' ; _files -/ ; return ;;
+            -w) compstate[nomatches]='' ; _files -/ ; return ;;
+            --include) compstate[nomatches]='' ; _files -/ ; return ;;
+            --exclude) compstate[nomatches]='' ; _files -/ ; return ;;
             esac ;;
 
     esac
@@ -206,11 +265,18 @@ _completeCds() {
 
     # Step 4: file-sentinel positionals — emit files and return.
     case "$cmd" in
-        compile) _files -g '(*.cds|*.json)' ; return ;;
-        deploy) _files -g '(*.cds|*.json)' ; return ;;
-        import) _files -g '(*.json|*.xml|*.edmx)' ; return ;;
-        inspect) _files -g '(*.cds|*.json)' ; return ;;
-        parse) _files -g '(*.cds|*.json)' ; return ;;
+        compile) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        deploy) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        export) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        import) compstate[nomatches]='' ; _path_files -g '*.json *.xml *.edmx' ; return ;;
+        inspect) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        lint) compstate[nomatches]='' ; _path_files -g '*.js *.ts *.cds' -/ ; return ;;
+        minify) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        parse) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
+        repl) compstate[nomatches]='' ; _files -/ ; return ;;
+        run) compstate[nomatches]='' ; _files -/ ; return ;;
+        serve) compstate[nomatches]='' ; _files -/ ; return ;;
+        watch) compstate[nomatches]='' ; _files -/ ; return ;;
     esac
 
     # Step 4.6: string positionals (e.g. cds help <tab>) — return after matching.

package/bin/completion/templates/cds-tmpl.ps1

@@ -22,7 +22,7 @@ $_CDS_COMMAND = "cds"
 #   __shortcuts   — hashtable of shortcut → canonical command name
 #   __positionals — hashtable of command → array of known positional string values
 #   __optionValues — hashtable of command → hashtable of flag → array of values,
-#                   or one of the file sentinels ':file', ':dir', ':file:ext1,ext2'
+#                   or one of the file sentinels ':file', ':dir', ':file:ext1,ext2', ':file+dir:ext1,ext2'
 #   __commaCases  — hashtable of command → hashtable of flag → array of comma-separable values
 #   <cmd>         — array of flags/options for that subcommand (used by step 3)
 $_CDS_COMPLETIONS = @{
@@ -54,14 +54,16 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
 
     # Helper: emit file/dir completions for a sentinel value.
     # Sentinel formats: ':file' (any file), ':dir' (directories only),
-    #                   ':file:ext1,ext2' (files with specific extensions).
+    #                   ':file:ext1,ext2' (files with specific extensions),
+    #                   ':file+dir:ext1,ext2' (files with extensions + directories).
     # Uses relative paths (preserving any typed prefix) so the completed text stays short.
     function _CdsFileComplete($sentinel, $word) {
         $base   = if ($word) { $word } else { '' }
         $search = if ($word) { "$word*" } else { '*' }
-        # Parse extension list from ':file:cds,json' → @('.cds', '.json')
-        $exts = if ($sentinel -like ':file:*') {
-            ($sentinel -replace '^:file:', '').Split(',') | ForEach-Object { ".$_" }
+        $inclDirs = $sentinel -like ':file+dir:*'
+        # Parse extension list from ':file:cds,json' or ':file+dir:cds,json' → @('.cds', '.json')
+        $exts = if ($sentinel -like ':file:*' -or $inclDirs) {
+            ($sentinel -replace '^:file(\+dir)?:', '').Split(',') | ForEach-Object { ".$_" }
         } else { $null }
         if ($sentinel -eq ':dir') {
             Get-ChildItem -Path $search -Directory -ErrorAction SilentlyContinue |
@@ -76,6 +78,13 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
                     $rel = $base + $_.Name
                     [System.Management.Automation.CompletionResult]::new($rel, $_.Name, 'ProviderItem', $_.Name)
                 }
+            if ($inclDirs) {
+                Get-ChildItem -Path $search -Directory -ErrorAction SilentlyContinue |
+                    ForEach-Object {
+                        $rel = $base + $_.Name
+                        [System.Management.Automation.CompletionResult]::new($rel, $_.Name, 'ProviderContainer', $_.Name)
+                    }
+            }
         }
     }
 
@@ -126,7 +135,7 @@ Register-ArgumentCompleter -Native -CommandName $_CDS_COMMAND -ScriptBlock {
     if ($null -ne $optVals) {
         $entry = $optVals[$previousWord]
         if ($null -ne $entry) {
-            if ($entry -eq ':dir' -or $entry -eq ':file' -or $entry -like ':file:*') {
+            if ($entry -eq ':dir' -or $entry -eq ':file' -or $entry -like ':file:*' -or $entry -like ':file+dir:*') {
                 _CdsFileComplete $entry $wordToComplete
             } else {
                 foreach ($val in $entry) {

package/bin/deploy/index.js

@@ -3,9 +3,13 @@ const { options, flags, shortcuts } = require('./options');
 
 module.exports = Object.assign(deploy, {
   staticCompletions: () => ({
-      '--to': ['sqlite', 'hana'],
-      '--on': ['cf', 'k8s'],
-      '_':   FILE('cds,json'),
+      '--to':         ['sqlite', 'hana'],
+      '--on':         ['cf', 'k8s'],
+      '--for':        ['development', 'production', 'hybrid'],
+      '-4':           ['development', 'production', 'hybrid'],
+      '--vcap-file':  FILE('json'),
+      '--delta-from': FILE('json'),
+      '_':            FILE('cds,json', { dirs: true }),
   }),
   options,
   flags,

package/bin/env.js

@@ -1,4 +1,8 @@
 module.exports = Object.assign (env, {
+  staticCompletions: () => ({
+    '--for': ['development', 'production', 'hybrid'],
+    '-4':    ['development', 'production', 'hybrid'],
+  }),
   options: ['--for', '--mocked'],
   flags: ['--keys', '--properties', '--list', '--json', '--raw', '--process-env', '--resolve-bindings', '--sources'],
   shortcuts: ['-4', 0, '-k', '-p', '-l', '-j', '-r', '-P', '-b'],
@@ -63,7 +67,6 @@ async function env ([cmd, key, value], options={}) {
   )
 
   let env = cds.env
-  // REVISIT: Currently only read in env.test.js
   env['_home_cds-dk'] = path.resolve(__dirname, '..')  // to help tools find the DK
 
   if (!options.for && options.mocked || options["resolve-bindings"]) 

package/bin/export.js

@@ -278,4 +278,12 @@ class Export extends Minify {
 
 const { DIMMED, RESET } = cds.utils.colors
 
-module.exports = Object.assign (Export._for_cds_dk(), { Export })
+const { FILE, DIR } = require('./completion')
+module.exports = Object.assign (Export._for_cds_dk(), { Export,
+  staticCompletions: () => ({
+    '_':     FILE('cds,json', { dirs: true }),
+    '--to':  DIR(),
+    '--as':  ['csn', 'cdl'],
+    '--for': ['npm', 'mvn'],
+  })
+})