@sap/cds-dk 10.1.2 → 10.2.0

package/bin/completion/scripts/cds.zsh

@@ -1,8 +1,6 @@
 #!/bin/zsh
-# This file was generated from bin/completion/templates/cds-tmpl.zsh by
-# 'cds completion --generate' and is written to bin/completion/scripts/cds.zsh.
 #
-# Do not edit directly — modify the template and regenerate.
+# THIS FILE IS GENERATED. DO NOT EDIT.
 #
 # Completion strategy (fastest-first):
 #   1. Shortcuts    — single-character aliases resolved before any other logic.
@@ -49,7 +47,7 @@ _completeCds() {
     # Step 2: top-level — offer all known subcommands when no subcommand has been
     # typed yet ($words is 1-based; ≤ 2 means "cds <cursor>").
     if [[ "${#words[@]}" -le 2 ]]; then
-        compadd -S '' -- "add" "bind" "build" "compile" "completion" "debug" "deploy" "env" "eval" "export" "gen" "help" "import" "init" "inspect" "lint" "login" "logout" "minify" "mock" "parse" "pull" "push" "repl" "run" "serve" "subscribe" "test" "unsubscribe" "up" "upgrade" "upgrade-tenant" "version" "watch"
+        compadd -S '' -- "add" "bind" "bindings" "build" "compile" "completion" "debug" "deploy" "env" "eval" "export" "gen" "help" "import" "init" "inspect" "lint" "login" "logout" "minify" "mock" "parse" "pull" "push" "repl" "run" "serve" "subscribe" "test" "unsubscribe" "up" "upgrade" "upgrade-tenant" "version" "watch"
         return
     fi
 
@@ -57,20 +55,22 @@ _completeCds() {
     # 'case ... esac && return' exits the function when a case arm matched.
     if [[ "$current" == -* ]]; then
         case "$cmd" in
-        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" ;;
+        add) compadd -S '' -- "--base" "--cdm" "--cloudevents" "--composition-records" "--content-type" "--data:for" "--dry" "--filter" "--for" "--for-app" "--force" "--into" "--java:mvn" "--js" "--keys-only" "--out" "--package" "--plan" "--records" "--sap" "--shell" "--ts" "--unified-runtime" "--with-telemetry" "--workspace" "--y" ;;
         bind) compadd -S '' -- "--credentials" "--exec" "--for" "--kind" "--no-create-service-key" "--on" "--out" "--output-file" "--to" "--to-app-services" ;;
+        bindings) compadd -S '' -- "--as" ;;
         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" ;;
-        completion) compadd -S '' -- "--add" "--curr" "--generate" "--line" "--prev" "--profile" "--remove" "--shell" ;;
+        completion) compadd -S '' -- "--add" "--curr" "--line" "--prev" "--profile" "--remove" "--shell" ;;
         debug) compadd -S '' -- "--cf" "--force" "--host" "--k8s" "--no-devtools" "--port" ;;
         deploy) compadd -S '' -- "--auto-undeploy" "--delta-from" "--dry" "--for" "--model-only" "--no-build" "--no-save" "--on" "--out" "--resolve-bindings" "--script" "--store-credentials" "--to" "--tunnel-address" "--vcap-file" "--with-auto-schema-evolution" "--with-mocks" "--xdry" ;;
         env) compadd -S '' -- "--for" "--json" "--keys" "--list" "--mocked" "--process-env" "--properties" "--raw" "--resolve-bindings" "--sources" ;;
+        eval) compadd -S '' -- "--quiet" "--silent" ;;
         export) compadd -S '' -- "--artifact" "--as" "--cleanse" "--data" "--debug" "--dry" "--for" "--from" "--inspect" "--keep" "--mvn" "--plugin" "--reuse" "--services" "--skip" "--texts" "--to" ;;
         import) compadd -S '' -- "--as" "--asyncapi" "--config" "--data-product" "--dependencies" "--destination" "--dry" "--edmx" "--for" "--force" "--from" "--group" "--include-namespaces" "--into-namespace" "--keep-namespace" "--name" "--no-copy" "--no-save" "--odata" "--odata-v2-annotations" "--openapi" "--out" "--resolve-bindings" "--rfc" "--services" ;;
         init) compadd -S '' -- "--add" "--base" "--force" "--java" "--java:mvn" "--java:package" "--lint:custom" "--lint:custom:example" "--no-db" "--nodejs" "--verbose" ;;
         inspect) compadd -S '' -- "--kind" "--list" "--stats" ;;
         lint) compadd -S '' -- "--cache" "--cache-file" "--cache-location" "--cache-strategy" "--color" "--concurrency" "--config" "--debug" "--env-info" "--exit-on-fatal-error" "--ext" "--fix" "--fix-dry-run" "--fix-type" "--flag" "--format" "--global" "--help" "--ignore-pattern" "--init" "--inspect-config" "--max-warnings" "--mcp" "--no-color" "--no-config-lookup" "--no-error-on-unmatched-pattern" "--no-ignore" "--no-inline-config" "--no-warn-ignored" "--output-file" "--parser" "--parser-options" "--pass-on-no-patterns" "--pass-on-unpruned-suppressions" "--plugin" "--print-config" "--prune-suppressions" "--quiet" "--report-unused-disable-directives" "--report-unused-disable-directives-severity" "--report-unused-inline-configs" "--rule" "--stats" "--stdin" "--stdin-filename" "--suppress-all" "--suppress-rule" "--suppressions-location" "--version" ;;
-        login) compadd -S '' -- "--client" "--mtls" "--passcode" "--plain" "--save-refresh-token" "--subdomain" "--user" ;;
+        login) compadd -S '' -- "--app-tid" "--client" "--mtls" "--no-browser" "--passcode" "--plain" "--port" "--save-refresh-token" "--subdomain" "--user" ;;
         logout) compadd -S '' -- "--clear-invalid" "--delete-settings" "--subdomain" "--url" ;;
         minify) compadd -S '' -- "--cleanse" "--debug" "--dry" "--inspect" "--keep" "--skip" ;;
         mock) compadd -S '' -- "--at" "--from" "--in-memory" "--in-memory?" "--mocked" "--port" "--project" "--projects" "--resolve-bindings" "--service" "--to" "--watch" "--with" "--with-bindings" "--with-mocks" "--with-mtx" "--workers" ;;
@@ -97,11 +97,13 @@ _completeCds() {
             case "$previous" in
             --on) compadd -S '' -- "cf" "k8s" ; 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 ;;
+        bindings)
+            case "$previous" in
+            --as) compadd -S '' -- "json" "yaml" ; return ;;
             esac ;;
         build)
             case "$previous" in
@@ -110,9 +112,11 @@ _completeCds() {
             --project) compstate[nomatches]='' ; _files -/ ; return ;;
             --dest) compstate[nomatches]='' ; _files -/ ; return ;;
             --src) compstate[nomatches]='' ; _files -/ ; return ;;
+            --options-model) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; return ;;
             esac ;;
         compile)
             case "$previous" in
+            --from) compadd -S '' -- "cdl" "json" "yaml" ; return ;;
             --to) compadd -S '' -- "asyncapi" "cdl" "edm" "edmx" "edmx-v2" "edmx-v4" "hana" "hdbtable" "json" "openapi" "sql" "xsuaa" "yml" ; return ;;
             --for) compadd -S '' -- "odata" "sql" ; return ;;
             --dialect) compadd -S '' -- "h2" "hana" "postgres" "sqlite" ; return ;;
@@ -134,27 +138,29 @@ _completeCds() {
             --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 ;;
+            --out) compstate[nomatches]='' ; _path_files ; 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 ;;
+            --services) compadd -S '' -- "all" ; return ;;
+            --from) compstate[nomatches]='' ; _path_files -g '*.cds *.json' -/ ; 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 ;;
+            --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
             --out) compstate[nomatches]='' ; _files -/ ; return ;;
-            -o) compstate[nomatches]='' ; _files -/ ; return ;;
+            --dependencies) compstate[nomatches]='' ; _path_files ; return ;;
             esac ;;
         init)
             case "$previous" in
@@ -165,10 +171,10 @@ _completeCds() {
             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
+            --from) compadd -S '' -- "cdl" "json" "yaml" ; return ;;
             --to) compadd -S '' -- "asyncapi" "cdl" "edm" "edmx" "edmx-v2" "edmx-v4" "hana" "hdbtable" "json" "openapi" "sql" "xsuaa" "yml" ; return ;;
             --for) compadd -S '' -- "odata" "sql" ; return ;;
             --dialect) compadd -S '' -- "h2" "hana" "postgres" "sqlite" ; return ;;
@@ -184,27 +190,24 @@ _completeCds() {
         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 ;;
+            --service) compadd -S '' -- "all" ; 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 ;;
+            --service) compadd -S '' -- "all" ; 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
@@ -281,7 +284,7 @@ _completeCds() {
 
     # Step 4.6: string positionals (e.g. cds help <tab>) — return after matching.
     case "$cmd" in
-        help) compadd -S '' -- "add" "bind" "build" "compile" "completion" "debug" "deploy" "env" "eval" "export" "gen" "help" "import" "init" "inspect" "lint" "login" "logout" "minify" "mock" "parse" "pull" "push" "repl" "run" "serve" "subscribe" "test" "unsubscribe" "up" "upgrade" "upgrade-tenant" "version" "watch" ; return ;;
+        help) compadd -S '' -- "add" "bind" "bindings" "build" "compile" "completion" "debug" "deploy" "env" "eval" "export" "gen" "help" "import" "init" "inspect" "lint" "login" "logout" "minify" "mock" "parse" "pull" "push" "repl" "run" "serve" "subscribe" "test" "unsubscribe" "up" "upgrade" "upgrade-tenant" "version" "watch" ; return ;;
     esac && return
 
     # Step 5: dynamic fallback — calls 'cds completion' for subcommands whose arguments

package/bin/deploy/index.js

@@ -6,7 +6,7 @@ module.exports = Object.assign(deploy, {
       '--to':         ['sqlite', 'hana'],
       '--on':         ['cf', 'k8s'],
       '--for':        ['development', 'production', 'hybrid'],
-      '-4':           ['development', 'production', 'hybrid'],
+      '--out':        FILE(),
       '--vcap-file':  FILE('json'),
       '--delta-from': FILE('json'),
       '_':            FILE('cds,json', { dirs: true }),

package/bin/deploy/to-hana/hana.js

@@ -145,7 +145,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
 
     let bindOptions
-    let usesExistingK8sBinding = false
+    let usesExistingBinding = false
 
     const { readProject } = require('../../../lib/init/projectReader')
     const { hasKyma, hasMta } = readProject()
@@ -158,12 +158,12 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
         const envVars = await bindingEnv({ env: cds.env, silent: true })
         if (envVars?.VCAP_SERVICES) {
           vcapEnv.VCAP_SERVICES = JSON.parse(envVars.VCAP_SERVICES)
-          usesExistingK8sBinding = true
+          usesExistingBinding = true
           console.log(`using existing Kubernetes binding ${bold(existing.name || existing.secret)}`)
         }
       }
 
-      if (!usesExistingK8sBinding) {
+      if (!usesExistingBinding) {
         const baseName = pServiceName ?? path.basename(cds.root)
         const instanceName = baseName.endsWith('-db') ? baseName : `${baseName}-db`
         const bindingName = `${instanceName}-binding`
@@ -225,6 +225,7 @@ spec:
       if (!serviceName && instance) {
         serviceName = instance;
         serviceKeyName = key;
+        usesExistingBinding = true;
       }
 
       if (!serviceName && hasVCAPEnv) {
@@ -255,7 +256,7 @@ spec:
     DEBUG?.({ dest, vcapEnv, hdiOptions })
     await hdi.deploy(dest, vcapEnv, hdiOptions);
 
-    if (!hasVCAPEnv && !usesExistingK8sBinding) {
+    if (!hasVCAPEnv && !usesExistingBinding) {
       const services = await bind(bindOptions)
       await storeBindings(services, bindOptions)
     }

package/bin/env.js

@@ -1,7 +1,6 @@
 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'],

package/bin/eval.js

@@ -1,4 +1,6 @@
-module.exports = Object.assign ( run, { help: `
+module.exports = Object.assign ( run, {
+flags: ['--quiet', '--silent'],
+help: `
 # SYNOPSIS
 
     *cds eval* <code snippet>
@@ -18,13 +20,15 @@ module.exports = Object.assign ( run, { help: `
 `})
 
 // support the like of cds -e "<...>" as in node.js --> pretty helpful for quick test setups
-function run ([code]) {
+async function run ([code], { silent, quiet = silent }={}) {
   if (!code)  return console.error (`Please specify the code to execute, like\n\n  cds -e "cds.compile('my-model').to.json()"\n`)
   // eslint-disable-next-line no-unused-vars
-  const cds = require('../lib/cds')
+  const { log, info } = console
+  if (quiet) console.log = console.info = () => {}
+  require('../lib/cds')
   if (code[0] === '.')  code = 'cds' + code
-  const outcome = eval(code)
-  console.log (outcome)
+  let outcome = await eval (code)
+  log (outcome)
 }
 
 process.on('uncaughtException', console.error)

package/bin/export.js

@@ -281,9 +281,11 @@ const { DIMMED, RESET } = cds.utils.colors
 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'],
+    '_':          FILE('cds,json', { dirs: true }),
+    '--from':     FILE('cds,json', { dirs: true }),
+    '--to':       DIR(),
+    '--as':       ['csn', 'cdl'],
+    '--for':      ['npm', 'mvn'],
+    '--services': ['all'],
   })
 })

package/bin/help/export.md

@@ -4,6 +4,10 @@
    *cds export* [ --services ] <patterns> --from <sources> [ ...options ]
    *cds export* [ <sources> ] [ ...options ]
 
+   The *cds export* command is used to export CDS models and related
+   artifacts from specified service definitions.
+
+
 # OPTIONS
 
    *-s | --services* <patterns>
@@ -12,21 +16,41 @@
    *-a | --as* <csn|cdl>
    *-4 | --for* <npm|mvn>
 
-   *--mvn* <groupId:artifactId>   Export for Maven (implies --for mvn)
-
    *-c | --cleanse* <properties>
    *-k | --keep* <kinds>
    *-x | --skip* <kinds>
-   *-p | --plugin*
    *-d | --data*
    *-t | --texts*
+   *-p | --plugin*
 
    *-y | --dry*
    *-i | --inspect*
    *-f | --force*
    *-h | --help*
 
-   Run with *--debug* to list all options with their defaults.
+   Add *--mvn* <groupId:artifactId> for exporting to a Maven project.
+
+
+# DETAILS
+
+   Add the following options to export additional artifacts in addition
+   to the CDS interface models:
+
+   *-d | --data*    includes *.csv* test data in the export.
+   *-t | --texts*   includes *i18n* text bundles in the export.
+   *-p | --plugin*  adds *cds.requires* entries to the *package.json* for
+                    plug & play convenience on the import side.
+
+   Use the following options in combination to fine-tune what gets
+   included in the export:
+
+   *--cleanse* controls which properties to remove from the export.
+   *--keep*    controls which kinds of data to retain, and also allows
+               to override individual entries from the cleanse list.
+   *--skip*    controls which kinds of data to exclude.
+
+   Run *cds export* with *--debug* to see default/effective configurations.
+
 
 # EXAMPLES
 

package/bin/import.js

@@ -2,11 +2,12 @@ const { FILE, DIR } = require('./completion')
 module.exports = Object.assign(_import, {
     _name: 'import',
     staticCompletions: () => ({
-        '--from': ['asyncapi', 'edmx', 'openapi'],
-        '--as':   ['cds', 'csn', 'json'],
-        '--out':  DIR(),
-        '-o':     DIR(),
-        '_':      FILE('json,xml,edmx'),
+        '--from':         ['asyncapi', 'edmx', 'openapi'],
+        '--as':           ['cds', 'csn', 'json'],
+        '--for':          ['development', 'production', 'hybrid'],
+        '--out':          DIR(),
+        '--dependencies': FILE(),
+        '_':              FILE('json,xml,edmx'),
     }),
     options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--into-namespace' ],
     shortcuts: [ '-s',            '-4',    '-o',  '-as',     '-n',                  '-ns',             '-d',undefined,       '-c',       undefined, undefined,                '-2',        '-', '-f', '-b'],

package/bin/inspect.js

@@ -10,7 +10,6 @@ module.exports = Object.assign (inspect, {
     staticCompletions: () => ({
         '--kind': ['entity', 'aspect', 'type', 'service'],
         '--list': ['names', 'elements', 'keys', 'associations', 'compositions', 'ids', 'sources', 'all'],
-        '-l':     ['names', 'elements', 'keys', 'associations', 'compositions', 'ids', 'sources', 'all'],
         '_':      FILE('cds,json', { dirs: true }),
     }),
     options: [ '--stats', '--list', '--kind' ],

package/bin/login.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(login, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls', '--port', '--app-tid'],
     shortcuts: ['-s', '-p', '-u', '-c', '-m'],
-    flags: ['--plain', '--save-refresh-token'],
+    flags: ['--plain', '--save-refresh-token', '--no-browser'],
     get help() {
         const config = require('../lib/mtx/settings_manager').SettingsManager.config
         return `
@@ -64,6 +64,12 @@ module.exports = Object.assign(login, {
         settings. If no such setting is saved, the CF client is invoked to
         determine the respective subdomain.
 
+    *--app-tid* <application-tenant-id>
+
+        For SAP Cloud Identity Services (IAS): the application tenant id
+        (app_tid) of the tenant to log in to. Use this to select the tenant
+        directly instead of resolving it from <tenant-subdomain>.
+
     *-p* | *--passcode* <passcode>
 
         Tenant-specific passcode for authentication.
@@ -121,6 +127,21 @@ module.exports = Object.assign(login, {
         Also store the Refresh Token (if provided) for automatic renewal of the
         Access Token upon expiration.
 
+    *--no-browser*
+
+        For single sign-on with SAP Cloud Identity Services (IAS), do not open a
+        browser automatically. Instead, the login URL is printed so it can be
+        opened manually, e.g. in headless or remote environments. The
+        authorization code is still received on a local loopback address, so the
+        browser must be able to reach this machine's localhost.
+
+    *--port* <port>
+
+        For single sign-on with SAP Cloud Identity Services (IAS), use this fixed
+        local port for the loopback redirect (http://localhost:<port>/callback).
+        The redirect URI must be registered in the IAS application. If omitted, a
+        default port is chosen; register the corresponding redirect URI in IAS.
+
     *--plain*
 
         Instead of saving authentication data for this login to the desktop
@@ -174,10 +195,14 @@ async function login ([url], options = {}) {
         tokenStorage: options.plain ? 'plain' : 'keyring',
         renewLogin: true,
         saveData: true,
-        saveRefreshToken: options['save-refresh-token'] ?? false
+        saveRefreshToken: options['save-refresh-token'] ?? false,
+        noBrowser: options['no-browser'] ?? false,
+        appTid: options['app-tid']
     });
     delete options.plain;
     delete options['save-refresh-token'];
+    delete options['no-browser'];
+    delete options['app-tid'];
 
     await require('../lib/mtx/auth_manager').login(options);
 }

package/bin/repl.js

@@ -1,14 +1,13 @@
 const { DIR } = require('./completion');
 module.exports = Object.assign (repl, {
-  options: [ '--run', '--use' ],
-  flags: [ '--ql' ],
-  shortcuts: ['-r', '-u'],
+  options: [ '--use' ],
+  flags: [ '--run', '--ql' ],
+  shortcuts: [ '-u', '-r', ],
   staticCompletions: () => ({
     '_':     DIR(),
     '--run': DIR(),
     '-r':    DIR(),
     '--use': ['xl', 'ql', 'entities', 'services'],
-    '-u':    ['xl', 'ql', 'entities', 'services'],
   }),
   help: `
 # SYNOPSIS
@@ -51,22 +50,34 @@ module.exports = Object.assign (repl, {
 
 async function repl ([project], options={}) {
 
-  const isTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  // same fallback as cds watch: if @sap/cds is not installed locally, inject
+  // cds-dk's node_modules so user code can require/import @sap/cds, sqlite, etc.
+  // Unlike watch (which forks), repl is in-process: set NODE_PATH then call
+  // _initPaths() to apply it to the live CJS resolver, and register the ESM
+  // hook directly (NODE_PATH is ignored by the ESM loader by spec).
+  const { createRequire, _initPaths } = require('node:module')
+  const requireFromProject = createRequire(process.cwd() + '/')
+  try { requireFromProject.resolve('@sap/cds') }
+  catch(e) {
+    if (e.code !== 'MODULE_NOT_FOUND') throw e
+    const { delimiter } = require('node:path')
+    process.env.NODE_PATH = [..._paths(process.cwd()), ..._paths(__dirname)].join(delimiter)
+    _initPaths()
+    require('./watch/esm-resolve-registration')
+  }
+
   const cds = require('../lib/cds')
   const { GREEN, PINK, BLUE, CYAN, YELLOW, GRAY, BOLD, RESET } = cds.utils.colors
   console.log(`${GREEN}${BOLD}Welcome to cds repl v${cds.version}${RESET}`)
+  cds.repl = true
 
   const { inspect } = require('util')
   inspect.defaultOptions.colors = true
   inspect.defaultOptions.depth = 11
 
-  Object.defineProperty (cds,'repl',{value:true})
   let context={}, repl = { context, displayPrompt(){} }
-  if ((options.run ??= project)) await _run (options.run)
   if (options.use) _export (...options.use.split(','))
-
-  if (options.ql) _ql()
-  else _js()
+  if (project) await _run (project); else cds_connect_with_bindings()
 
   process.on('uncaughtException', console.error)
   process.on('unhandledRejection', console.error)
@@ -74,6 +85,25 @@ async function repl ([project], options={}) {
   // Ugly hack to prevent "[ERR_INVALID_REPL_INPUT]: Listeners for `uncaughtException` cannot be used in the REPL" errors caused by winston when connecting to remote services
   process.on = (event, listener) => event !== 'uncaughtException' && event !== 'unhandledRejection' && process.addListener(event, listener)
 
+  const isTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  if (options.ql) _ql()
+  else _js()
+
+  // Hide internal properties inherited from EventEmitter
+  Object.defineProperties (cds, {
+    _events: { enumerable: false },
+    _eventsCount: { enumerable: false },
+    _maxListeners: { enumerable: false },
+  })
+
+  // Cover our own tracks
+  delete cds.connect
+  delete cds.extend
+  delete cds.utils
+  delete cds.env
+  delete cds.log
+  delete cds.debug
+
 
   function _js() {
     repl = require('repl').start ({
@@ -89,7 +119,7 @@ async function repl ([project], options={}) {
       }
     })
 
-    _initHistory(repl, '.cds-repl-history')
+    _initHistory(repl)
     repl.on('exit', () => options.context = repl.context)
     repl.on('exit', () => { if (!transition.started) cds.shutdown() })
 
@@ -116,11 +146,21 @@ async function repl ([project], options={}) {
     repl.displayPrompt()
   }
 
+
+  function cds_connect_with_bindings() {
+    const $super = cds.connect.to
+    cds.connect.to = async (...args) => {
+      $super.bindings ??= await cds.service.bindings
+      return $super(...args)
+    }
+    delete cds.connect
+  }
+
   async function _run (project) {
-    await require('../bin/serve') ([project], { project, port: 0, 
-      'with-bindings': true, 
+    await require('../bin/serve') ([project], { project, port: 0,
+      'with-bindings': true,
       'with-mocks': true,
-      'in-memory?': true, 
+      'in-memory?': true,
     })
     _export ('entities', 'services')
   }
@@ -168,13 +208,14 @@ async function repl ([project], options={}) {
     repl.displayPrompt()
   }
 
-  function _initHistory(repl, file) {
-    repl.history = []
-    const home = process.env.HOME || process.env.USERPROFILE
-    const history = require('path').join(home,file)
-    const fs = require('fs')
-    fs.readFile(history, 'utf-8', (e, txt) => e || Object.assign(repl.history, txt.split('\n')))
-    repl.on('exit', () => fs.writeFile(history, repl.history.join('\n'), () => {}))
+  function _initHistory(repl, filename = '.cds/repl-history') {
+    const path = require('path'), fs = require('fs'), $ = process.env
+    const file = path.resolve ($.HOME || $.USERPROFILE, filename)
+    fs.readFile (file, 'utf-8', (e,txt) => repl.history = txt?.split('\n') || [])
+    repl.on ('exit', () => {
+      fs.mkdirSync (path.dirname(file), { recursive: true })
+      fs.writeFile (file, Array.from(new Set(repl.history)).join('\n'), () => {})
+    })
   }
 
   function transition(start) {
@@ -216,7 +257,7 @@ async function repl ([project], options={}) {
       },
     })
 
-    _initHistory(repl, '.cds-repl-ql-history')
+    _initHistory(repl, '.cds/repl-history-ql')
     repl.on('exit', () => { if (!transition.started) cds.shutdown() })
 
     repl.defineCommand ('target', { action: _target,
@@ -258,15 +299,17 @@ async function repl ([project], options={}) {
   }
 
   function _target(args) {
+    const { service = cds.db } = repl.context
     if (!args) return console.info(
-`Specify a service. Available services: ${Object.keys(cds.services).join(', ')}
+`Available services: ${Object.keys(cds.services).join(', ')}
+Currently targeted service is ${service?.name ?? 'none'}
 Examples:
   .target db
   .target AdminService --roles admin`)
     const [s] = args.split(' ')
-    const service = cds.services[s]
-    if (!service) throw new Error(`No service with name ${s}. Available services: ${Object.keys(cds.services).join(', ')}`)
-    repl.context.service = service
+    const target = cds.services[s]
+    if (!target) throw new Error(`No service with name ${s}. Available services: ${Object.keys(cds.services).join(', ')}`)
+    repl.context.service = target
 
     const roles = args.match(/(-r|--roles) ([^\s]+)/)?.[2]?.split(',')
     repl.context.user = roles? {roles} : undefined
@@ -277,6 +320,19 @@ Examples:
   }
 }
 
+function _paths(dir) {
+  const { resolve, sep } = require('node:path')
+  const fs = require('node:fs')
+  const parts = resolve(dir).split(sep)
+  const n = parts.length
+  const nm = sep + 'node_modules'
+  // resolve all node_modules in ancestor directories
+  return parts.map((_,i,a) => a
+    .slice(0, n-i)
+    .join(sep) + nm
+  ).filter(p => fs.existsSync(p))
+}
+
 function createHighlighter(cds, colors) {
   const { compiler } = cds
 

package/bin/run.js

@@ -3,13 +3,12 @@ const serve = require ('./serve')
 module.exports = Object.assign (
     cds_run, serve, {
     staticCompletions: () => ({
-        '_':       DIR(),
-        '--from':  DIR(),
-        '-f':      DIR(),
-        '--with':  DIR(),
-        '-w':      DIR(),
-        '--to':    ['odata', 'fiori', 'rest'],
-        '-2':      ['odata', 'fiori', 'rest'],
+        '_':         DIR(),
+        '--from':    DIR(),
+        '-f':        DIR(),
+        '--with':    DIR(),
+        '--to':      ['odata', 'fiori', 'rest'],
+        '--service': ['all'],
     }),
     help: `
 # SYNOPSIS