@sap/cds-dk 7.9.4 → 8.0.2

package/bin/add.js

@@ -1,6 +1,7 @@
 const cds = require('../lib/cds'), { fs } = cds.utils
 const DEBUG = cds.debug('add')
 const { join } = require('path')
+const cmd = require('../lib/util/command')
 
 const fromDk = fs.readdirSync(join(__dirname, '../lib/init/template'))
 const fromPlugins = require('../lib/init/add').registered
@@ -17,8 +18,8 @@ for (const plugin of [...fromDk, ...Object.keys(Object.fromEntries(fromPlugins))
 
 const byShortcut = (a, b) => (b.short ? 1 : 0) - (a.short ? 1 : 0)
 
-const options = ['--for', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.key)]
-const shortcuts = ['-4', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.short)]
+const options = ['--for', '--package', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.key), '--java:mvn']
+const shortcuts = ['-4', '-p', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.short)]
 const flags = ['--force', ...Object.values(conf).flatMap(p => p.flags).map(o => o.key)]
 DEBUG?.('cli config ', { options, shortcuts, flags })
 
@@ -36,54 +37,7 @@ module.exports = Object.assign(add, {
 
     Pick any of these:
 
-      *hana*                  - add support for SAP HANA
-
-      *sqlite*                - add support for SQLite
-
-      *postgres*              - add support for PostgreSQL
-
-      *liquibase*             - add support for Liquibase
-
-      *xsuaa*                 - add support for authentication via XSUAA
-
-      *multitenancy*          - add support for multitenancy
-
-      *toggles*               - add support for feature toggles
-
-      *extensibility*         - add support for extensibility
-
-      *approuter*             - add support for application routing
-
-      *local-messaging*       - add support for local messaging
-
-      *file-based-messaging*  - add support for file-based messaging
-
-      *enterprise-messaging*  - add support for SAP Event Mesh
-
-      *redis-messaging*       - add support for Redis messaging
-
-      *kibana*                - add support for Kibana formatting
-
-      *mta*                   - add support for MTA-based deployment
-
-      *cf-manifest*           - add support for CF-native deployment
-
-      *helm*                  - add support for Helm-based Kyma deployment
-
-      *html5-repo*            - add support for the HTML5 repository
-
-      *pipeline*              - add files for CI/CD pipeline integration
-
-      *tiny-sample*           - add minimal sample files
-
-      *sample*                - add sample files including Fiori UI
-
-      *data*                  - add CSV headers for modeled entities
-
-      *typer*                 - add type generation for CDS models
-
-      *lint*                  - add support for CDS Lint
-
+${cds.cli.command !== 'completion' && require('../lib/init').help({ exclude: ['java', 'nodejs'] })}
 
 # OPTIONS
 
@@ -95,6 +49,10 @@ module.exports = Object.assign(add, {
 
       Overwrite all files in case the target files already exist.
 
+    *--package* <name>
+
+      Pull a package from your npm registry.
+
 
 # FEATURE OPTIONS
 
@@ -145,6 +103,14 @@ async function add(args) {
   // await cds.plugins
   const CDSGenerator = require('../lib/init')
   const generator = new CDSGenerator()
-  const features = args.map(f => f.split(/[,\s+]/)).flat()
-  await generator.add(features)
+  const features = args.map(f => f.split(/[,\s]/)).flat()
+  if (cds.cli.options?.package) {
+    console.log(`running with --package, adding dependency ${cds.cli.options.package}`)
+    await cmd.spawnCommand(`npm`, ['add', cds.cli.options.package], { cwd: cds.root })
+    await cmd.spawnCommand(`cds`, ['add', ...features], { cwd: cds.root }) // plugins need to reload
+    // await cds.plugins
+    // await generator.add(features)
+  } else {
+    await generator.add(features)
+  }
 }

package/bin/bind.js

@@ -44,7 +44,7 @@ module.exports = Object.assign(cds_bind, {
         be added to *package.json* or *.cdsrc.json*. If *path* is a directory, the *.cdsrc.json*
         file in that directory is used. Defaults to *.cdsrc-private.json*.
 
-    *-a | --to-app-services <app>* (Beta)
+    *-a | --to-app-services* <app>
 
         Bind to a given application (Cloud Foundry only).
 
@@ -52,7 +52,7 @@ module.exports = Object.assign(cds_bind, {
 
         Skip automatic creation of service keys.
 
-    *-c | --credentials* <JSON|{file path}> (Beta)
+    *-c | --credentials* <JSON|{file path}>
 
         JSON or file path defining custom fields overwriting service credentials.
         Custom credentials are merged with the credentials read from BTP when running your application in hybrid mode.

package/bin/build.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(build, {
     handleCompletion,
-    options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model'],
+    options: ['--project', '--src', '--dest', '--for', '--opts', '--log-level', '--options-model'],
     shortcuts: ['-in', '-s', '-o', '-4'],
     flags: ['--clean', '--no-clean', '--ws', '--ws-pack'], // REVISIT: --clean is deprecated, backward compatibility
     help: `
@@ -69,7 +69,7 @@ module.exports = Object.assign(build, {
         Runs 'cds build' for the specified project, default is current working
         directory.
 
-    *--no-clean* (beta)
+    *--no-clean*
         Skips cleaning the build output folder before running the actual build
         operation. Clients need to clean the output folder upfront to ensure
         consistent build results.
@@ -86,7 +86,7 @@ module.exports = Object.assign(build, {
         Npm workspaces are typically used in mono or multi-repo setups whereas each workspace
         folder represents a microservice CAP project with subfolders _db_, _srv_, _app_.
         With the *ws* option the model scope used in executed build tasks is calculated based on
-        all workspaces. This also applies to the feature toggles. Feature toggles defined cross workspace 
+        all workspaces. This also applies to the feature toggles. Feature toggles defined cross workspace
         are merged. The output is created in the _mtx/sidecar_ for multitenant applications
         or in the 'srv' folder for node.js apps if no sidecar exists.
         HANA native content distributed across the workspaces is copied into the top-level 'db'
@@ -162,7 +162,32 @@ async function build([project], options = {}) {
         }
         delete options["no-clean"]
     }
-
+    // convert opts string to task options object
+    if (options.opts) {
+        options.taskOptions = scanTaskOptionParams(options.opts)
+        delete options.opts
+    }
     const { build } = require('../lib/build')
     await build(options)
 }
+
+function scanTaskOptionParams(optsParams) {
+    // need to create new regex every call since a constant would keep the match state
+    const quoteRegex = /([\w-]+)=([\w/.-]+|\[([\w/,.-]+)\])/g
+
+    // captures a=1             => a:1
+    //          a=[x,y,z]       => a:[x,y,z]
+    //          a=1,b=[x,y,z]   => a:1 b=[x,y,z]
+    let match = quoteRegex.exec(optsParams)
+    const taskOptions = {}
+
+    while (match != null) {
+        const key = match[1]
+        const value = match[3] || match[2]
+        const valueArray = value.split(",")
+        taskOptions[key] = valueArray.length > 1 ? valueArray.map((entry) => entry.trim()) : value
+        match = quoteRegex.exec(optsParams)
+    }
+    return taskOptions
+}
+

package/bin/cds.js

@@ -17,7 +17,7 @@ const cli = {
     d: 'deploy',
     l: 'login',
     o: 'logout',
-    t: 'lint',
+    t: 'test',
     v: 'version', '-v':'version', '--version':'version',
     h: 'help', '?':'help', '-?':'help', '--help':'help',
     r: 'repl', '-r':'repl',
@@ -25,6 +25,9 @@ const cli = {
   },
 
   async exec (cmd = process.argv[2], ...argv) {
+    const path = require('node:path')
+    const fs = require('node:fs')
+
     if (!argv.length) argv = process.argv.slice(3)
     if (!cmd) cmd = process.stdin.isTTY ? 'help' : 'compile'
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
@@ -51,13 +54,6 @@ const cli = {
           appendArgs = argv.slice(endOfOptions + 1)
           argv = argv.slice(0, endOfOptions)
         }
-        // REVISIT: Have to do it here to allow custom flags for plugins!
-        if (cmd === 'add') {
-          await cds.plugins
-          for (const [, Plugin] of cds.add.registered) {
-            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
-          }
-        }
 
         const args = this.args(task, argv)
         args[0].push(...appendArgs)
@@ -66,7 +62,22 @@ const cli = {
           argv: args[0],
           options: args[1],
         }
+
+        // REVISIT: Have to do it here to allow custom flags for plugins!
+        if (cmd === 'add') {
+          await cds.plugins
+          for (const [, Plugin] of cds.add.registered) {
+            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+          }
+        }
         if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
+
+        // cds.root may for some subcommands not point to the correct directory (e.g. cds w where users can pass a project directory)
+        // showing the full detected path should give the user an idea whether this info is relevant for them
+        const tsconfig = path.join(cds.root ?? '.', 'tsconfig.json')
+        if (!process.env.CDS_TYPESCRIPT && fs.existsSync(tsconfig)) {
+          console.info(`Detected ${tsconfig}. If this is a TypeScript project, consider running commands using cds-ts instead of cds.`)
+        }
         return await task.apply(this, args)
       }
     } catch (e) {
@@ -107,7 +118,8 @@ const cli = {
       else throw 'Invalid option: '+ a
     }
     // consistent production setting for NODE_ENV and CDS_ENV
-    if (process.env.NODE_ENV !== 'production') process.env.NODE_ENV = process.env.CDS_ENV?.split(',').find(p => p === 'production') || process.env.NODE_ENV
+    // if (process.env.NODE_ENV !== 'production') process.env.NODE_ENV = process.env.CDS_ENV?.split(',').find(p => p === 'production') || process.env.NODE_ENV
+    if (process.env.NODE_ENV !== 'production') { if (process.env.CDS_ENV?.split(',').includes('production')) process.env.NODE_ENV = 'production' }
     else process.env.CDS_ENV = Array.from(new Set([...process.env.CDS_ENV?.split(',') ?? [], 'production']))
 
     function add (k,v) { options[k.slice(2)] = v || true }
@@ -213,8 +225,8 @@ if (!module.parent)  module.exports()
 
 
 function getCommands() {
-  const fs = require('fs');
-  const path = require('path');
+  const fs = require('node:fs');
+  const path = require('node:path');
 
   const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js'];
 

package/bin/compile/index.js

@@ -1,4 +1,5 @@
-const path = require("path");
+const path = require('path')
+const {colors} = require('../../lib/util/term')
 
 module.exports = Object.assign ( compile, {
   handleCompletion,
@@ -40,8 +41,8 @@ module.exports = Object.assign ( compile, {
 
     - json, yml
     - edm, edmx, edmx-v2, edmx-v4, edmx-w4, edmx-x4
-    - sql, hdbcds, hdbtable
-    - cdl [beta]
+    - sql, hdbcds, hdbtable, hana
+    - cdl
     - xsuaa
     - openapi
     - asyncapi
@@ -159,7 +160,7 @@ async function handleCompletion(currentWord, previousWord, argv, util) {
   switch (previousWord) {
     case '-2':
     case '--to':
-      return ['json', 'yml', 'edm', 'edmx', 'edmx-v2', 'edmx-v4', 'sql', 'hdbcds', 'hdbtable', 'cdl', 'xsuaa', 'openapi', 'asyncapi'];
+      return ['json', 'yml', 'edm', 'edmx', 'edmx-v2', 'edmx-v4', 'sql', 'hdbcds', 'hdbtable', 'hana', 'cdl', 'xsuaa', 'openapi', 'asyncapi'];
     case '-4':
     case '--for':
       return ['odata', 'sql'];
@@ -328,13 +329,13 @@ async function compile (models, options={}) {
   function consoleLog(o) {
     if (typeof o === 'string')  return console.log (o)
     if (process.stdout.isTTY) {
-      o = inspect(o,{colors: true, depth: 111, compact:false}).replace(/\[Object: null prototype\] /g, '')
+      o = inspect(o,{colors, depth: 111, compact:false}).replace(/\[Object: null prototype\] /g, '')
     } else
       o = JSON.stringify(o, null, 2)
     return console.log (o)
   }
 
-  function suffix4 (x) { return x && x !== 'hdbtable' && ({
+  function suffix4 (x) { return x && x !== 'hdbtable' && x !== 'hana' && ({
     edmx: '.xml',
     "edmx-v2": '.xml',
     "edmx-v4": '.xml',

package/bin/completion/index.js

@@ -3,7 +3,7 @@ const path = require('node:path');
 const cds = require('../../bin/cds');
 const { bold } = require('../../lib/util/term');
 
-const SUPPORTED_SHELLS = ['bash', 'gitbash', 'zsh', 'ps']
+
 
 module.exports = Object.assign(completion, {
     handleCompletion,
@@ -13,20 +13,20 @@ module.exports = Object.assign(completion, {
     help: `
 # SYNOPSIS
 
-    -- beta feature --
-
     *cds completion* <options>
 
     Adds or removes shell completion for cds commands. Currently supported shells:
-        bash, Git Bash, zsh, and PowerShell.
+        Bash, fish, Git Bash, Zsh, and PowerShell.
 
     Depending on the operating system and the shell type, the following files will be changed:
         Linux, WSL
-            bash: ~/.bashrc
-            zsh: ~/.zshrc
+            Bash: ~/.bashrc
+            fish: ~/.config/fish/config.fish
+            Zsh: ~/.zshrc
         macOS
-            bash: ~/.bash_profile
-            zsh: ~/.zshrc
+            Bash: ~/.bash_profile
+            fish: ~/.config/fish/config.fish
+            Zsh: ~/.zshrc
         Windows
             PowerShell: $PROFILE
             Git Bash: ~/.bash_profile
@@ -41,9 +41,10 @@ module.exports = Object.assign(completion, {
     *--remove*
         Remove shell completion for cds commands (see examples).
 
-    *--shell* <bash | gitbash | ps | zsh>
+    *--shell* <bash | fish | gitbash | ps | zsh>
         Force the shell completion code to be added to the correct shell profile file.
             bash: macOS, Linux, WSL
+            fish: macOS, Linux, WSL
             zsh: macOS, Linux, WSL
             gitbash: Git Bash for Windows
             ps: PowerShell
@@ -52,12 +53,12 @@ module.exports = Object.assign(completion, {
 
    *cds* completion --add                   # Add shell completion for cds commands
    *cds* completion --remove                # Remove shell completion for cds commands
-   *cds* completion --add --shell bash      # Add shell completion for cds commands and enforce using bash shell
+   *cds* completion --add --shell bash      # Add shell completion for cds commands and enforce using Bash shell
 
 # ALIASES
 
    *cds* add completion                     # Add shell completion for cds commands
-   *cds* add completion --shell bash        # Add shell completion for cds commands and enforce using bash shell
+   *cds* add completion --shell bash        # Add shell completion for cds commands and enforce using Bash shell
 
 `});
 
@@ -65,17 +66,21 @@ function getScriptFile(shell) {
     switch (shell) {
         case 'bash':
         case 'gitbash':
-            return 'cds-bash.sh'
+            return 'cds-bash.sh';
+        case 'fish':
+            return 'cds-fish.fish';
         case 'ps':
-            return 'cds-ps.ps1'
+            return 'cds-ps.ps1';
         case 'zsh':
-            return 'cds-zsh.sh'
+            return 'cds-zsh.sh';
         case '':
         case undefined:
         case null:
             throw 'Internal error: option --shell is missing';
-        default:
-            throw `Internal error: unsupported shell: ${shell}`;
+        default: {
+            const completionSetup = require('../../lib/init/template/completion/completionSetup');
+            throw `Internal error: unsupported shell: ${shell}, supported shells are ${completionSetup.supportedShells.join(', ')}`;
+        }
     }
 }
 
@@ -85,8 +90,8 @@ async function completion(_argv, options) {
         return console.log(path.join(__dirname, 'scripts', scriptFile));
     }
 
+    const completionSetup = require('../../lib/init/template/completion/completionSetup');
     if (options.add || options.remove) {
-        const completionSetup = require('../../lib/init/template/completion/completionSetup');
         await completionSetup.setup(options.add, options);
         return;
     }
@@ -104,21 +109,17 @@ async function completion(_argv, options) {
     }
 
     const shell = localOptions.shell;
-    if (!SUPPORTED_SHELLS.includes(shell)) {
-        throw `internal Error: no completion handler found for type: ${shell}`;
+    if (!completionSetup.supportedShells.includes(shell)) {
+        throw `internal Error: no completion handler found for shell type: ${shell}, supported shells are ${completionSetup.supportedShells.join(', ')}`;
     }
 
-    const currentWord = localOptions.curr;
-    const previousWord = localOptions.prev;
-    const line = localOptions.line;
+    const currentWord = localOptions.curr?.trim().replace(/^'|'$/g, '');
+    const previousWord = localOptions.prev?.trim().replace(/^'|'$/g, '');
+    const line = localOptions.line?.trim().replace(/^'|'$/g, '');
     const segments = getSegments(line);
     const cdsCmd = segments[1] || '';
 
-    let completions = await getCompletions(cdsCmd, previousWord, currentWord, segments);
-    if (currentWord && shell === 'ps') {
-        completions = completions.filter(v => v?.startsWith(currentWord));
-    }
-
+    const completions = await getCompletions(cdsCmd, previousWord, currentWord, segments);
     reply(completions);
 }
 
@@ -131,7 +132,8 @@ async function handleCompletion(currentWord, previousWord, argv, _util) {
     }
 
     if (previousWord === '--shell') {
-        return ['bash', 'gitbash', 'ps', 'zsh'];
+        const { supportedShells } = require('../../lib/init/template/completion/completionSetup');
+        return supportedShells;
     }
 
     return allOptionsFlags;
@@ -184,29 +186,51 @@ function getUtil() {
 }
 
 async function getCompletions(cdsCmd, previousWord, currentWord, segments) {
-    if (cdsCmd === currentWord) {
-        return cds.cmds;
+    const _filter = (completions, currentWord) => {
+        return completions.filter(token => token?.startsWith(currentWord));
     }
 
-    try {
-        const cdsCmdObj = getCdsCmd(cdsCmd);
-        if (typeof cdsCmdObj.handleCompletion === 'function') {
-            return await cdsCmdObj.handleCompletion(currentWord, previousWord, segments, getUtil());
+    const _getCompletions = async () => {
+        if (previousWord === 'cds') {
+            if (!currentWord) {
+                return cds.cmds;
+            } else {
+                const completions = _filter(cds.cmds, currentWord);
+                if (completions.length > 0) {
+                    return completions;
+                }
+                cdsCmd = 'compile';
+                previousWord = 'compile';
+            }
         }
 
-        if (currentWord?.startsWith('-')) {
-            return getAllOptions(cdsCmdObj, segments);
-        }
-
-        const completionFs = require('./completionFs');
-        const all = await completionFs.readdir(currentWord);
-        if (!(cdsCmdObj.options?.includes(previousWord) || cdsCmdObj.shortcuts?.includes(previousWord))) {
-            const allOptions = getAllOptions(cdsCmdObj, segments);
-            all.push(...allOptions);
+        try {
+            const cdsCmdObj = getCdsCmd(cdsCmd);
+            if (typeof cdsCmdObj.handleCompletion === 'function') {
+                return await cdsCmdObj.handleCompletion(currentWord, previousWord, segments, getUtil());
+            }
+
+            if (currentWord?.startsWith('-')) {
+                return getAllOptions(cdsCmdObj, segments);
+            }
+
+            const completionFs = require('./completionFs');
+            const all = await completionFs.readdir(currentWord);
+            if (!(cdsCmdObj.options?.includes(previousWord) || cdsCmdObj.shortcuts?.includes(previousWord))) {
+                const allOptions = getAllOptions(cdsCmdObj, segments);
+                all.push(...allOptions);
+            }
+
+            return all;
+        } catch (err) {
+            return [];
         }
+    }
 
-        return all;
-    } catch (err) {
-        return [];
+    let completions = await _getCompletions();
+    if (currentWord) {
+        completions = _filter(completions, currentWord);
     }
+
+    return completions;
 }

package/bin/completion/scripts/cds-bash.sh

@@ -8,7 +8,10 @@ _completeCds()
     COMPREPLY=()
     current="${COMP_WORDS[COMP_CWORD]}"
     previous="${COMP_WORDS[COMP_CWORD - 1]}"
-    options=$($CDS_COMMAND completion --shell bash --prev "$previous" --curr "$current" --line "${COMP_WORDS[*]}")
+
+    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
+    options=$($CDS_COMMAND completion --shell bash --prev "'$previous'" --curr "'$current'" --line "'${COMP_WORDS[*]}'")
+
     COMPREPLY=( $(compgen -W "${options}" -- ${current}) )
     compopt -o nosort -o nospace
     return 0

package/bin/completion/scripts/cds-fish.fish

@@ -0,0 +1,13 @@
+#!/bin/fish
+
+set CDS_COMMAND "cds"
+function _completeCds
+    set -l line (commandline -cp)
+    set -l words (string split " " -- $line)
+
+    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
+    echo ($CDS_COMMAND completion --shell fish --prev "'$words[-2]'" --curr "'$words[-1]'" --line "'$line'")
+end
+
+# split into string array so result is not interpreted as single string
+complete -c $CDS_COMMAND --no-files --keep-order --arguments "(_completeCds | string split ' ')"

package/bin/completion/scripts/cds-ps.ps1

@@ -11,7 +11,8 @@ Register-ArgumentCompleter -Native -CommandName $COMMAND -ScriptBlock {
         $previousWord = $cmdSegments[$cmdSegments.Count - 1].Extent.Text
     }
 
-    $options = & $COMMAND completion --shell ps --prev "$previousWord" --curr "$wordToComplete" --line "$commandAst"
+    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
+    $options = & $COMMAND completion --shell ps --prev "'$previousWord'" --curr "'$wordToComplete'" --line "'$commandAst'"
     foreach ($option in $options) {
         [System.Management.Automation.CompletionResult]::new($option, $option, 'ParameterValue', $option)
     }

package/bin/completion/scripts/cds-zsh.sh

@@ -6,7 +6,8 @@
 CDS_COMMAND="cds"
 
 _completeCds() {
-    compadd -S '' -V 'force no sort' -- `${CDS_COMMAND} completion --shell zsh --prev "${words[CURRENT-1]}" --curr "${words[CURRENT]}" --line "${words}"`
+    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
+    compadd -S '' -V 'force no sort' -- `${CDS_COMMAND} completion --shell zsh --prev "'${words[CURRENT-1]}'" --curr "'${words[CURRENT]}'" --line "'${words}'"`
 }
 
 compdef _completeCds ${CDS_COMMAND}

package/bin/deploy/index.js

@@ -29,8 +29,9 @@ module.exports = Object.assign(deploy, {
 
     *--profile* <profile,...>
 
-      Loads the configuration data for the specified profile(s). 'cds build' is executed based on this profile settings.
-      The *development* profile is used by default.
+      Loads the configuration data for the specified profile(s). 'cds build' is executed based on these profile settings,
+      additionally binding information is resolved based on these profile settings. If a corresponding binding exists its service
+      name and service key will be used. The *development* profile is used by default.
 
     *--dry*
 
@@ -44,16 +45,16 @@ module.exports = Object.assign(deploy, {
 
       Deprecated. The package.json file is no longer modified.
 
-    *--auto-undeploy* (beta feature)
+    *--auto-undeploy*
 
       Tell HDI deployer to automatically undeploy deleted resources.
 
-    *--tunnel-address* (beta feature)
+    *--tunnel-address*
 
       Deploy through the given address (host:port) rather than the original
       database address.  The tunnel must have been opened before, e.g. using 'cf ssh'.
 
-    *--vcap-file* (beta feature)
+    *--vcap-file*
 
       Use credentials from the given file when deploying to *SAP HANA*, instead of
       creating new credentials. File must be in *default-env.json* format, with a root

package/bin/deploy/to-sqlite.js

@@ -5,12 +5,12 @@ exports.deploy = function deploy_to_sqlite (_model, _db, options) {
     const cds = require('../../lib/cds')
     const conf = cds.env.requires.db ?? {}
     const fts = cds.env.requires.toggles && cds.env.features.folders
-    const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
+    const model = _model || cds.resolve(!fts ? '*' : ['*',fts], false)
     let file = 'db'
     if (options.to) {
         file = 'sqlite:'+ _database4 (_db, options.to, conf)
         // current 'sqlite' default is bad, as we want to default to 'plain', so ignore it
-        const env_dialect = cds.env.sql.dialect !== 'sqlite' ? cds.env.sql.dialect : 'plain'
+        const env_dialect = cds.env.sql.dialect || 'plain'
         const to_dialect = options.to && options.to.match(/^(\w+)/) && RegExp.$1
         if (to_dialect)  options.dialect = (to_dialect === 'sql')
             ? conf.dialect ?? env_dialect