@sap/cds-dk 6.8.2 → 7.0.0

package/bin/activate.js

@@ -12,18 +12,21 @@ module.exports = Object.assign(activate, {
     Activate an extension project.
     By default, the current working directory is used as project directory.
 
-    To facilitate running this multiple times against the same app, refer to the *cds login* command.
+    To facilitate running this multiple times against the same app, refer to the
+    *cds login* command.
 
 
 # OPTIONS
 
     *--to* <url>
 
-        Specify the URL of the extensible SaaS app. By default, it's determined from project settings.
+        Specify the URL of the extensible SaaS app. By default, it's determined
+        from project settings.
 
     *-s* | *--subdomain* <tenant-subdomain>
 
-        Specify your tenant's subdomain. By default, it's determined from project settings.
+        Specify your tenant's subdomain. By default, it's determined from
+        project settings.
 
     *-p* | *--passcode* <passcode>
 
@@ -36,11 +39,13 @@ module.exports = Object.assign(activate, {
 
     *-c* | *--clientid* <clientid>
 
-        Client ID for authentication. This will override the default Client ID from environment.
+        Client ID for authentication. This will override the default Client ID
+        from environment.
 
     *--undeploy*
 
-        Undeploy a previously deployed extension, e.g. to remove a renamed or otherwise obsolete extension.
+        Undeploy a previously deployed extension, e.g. to remove a renamed or
+        otherwise obsolete extension.
 
     *--sync*
 
@@ -48,8 +53,11 @@ module.exports = Object.assign(activate, {
 
 # SEE ALSO
 
-    *cds push* to push an extension to a SaaS app based on current MTX Services (@sap/cds-mtxs).
-    https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on @sap/cds-mtxs.
+    *cds push* to push an extension to a SaaS app based on current MTX Services
+    (@sap/cds-mtxs).
+    
+    https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on
+    @sap/cds-mtxs.
 
 `})
 

package/bin/add.js

@@ -25,41 +25,55 @@ module.exports = Object.assign(add, {
 
     *extensibility* - adds configuration for extensibility
 
-    *mtx*           - adds configuration for multitenancy, feature toggles and extensibility
+    *mtx*           - adds configuration for multitenancy, feature toggles and
+                      extensibility
 
     *approuter*     - adds configuration for the Cloud Foundry approuter
 
-    *mta*           - adds an _mta.yaml_ file for MTA-based SAP Business Technology Platform deployment
+    *mta*           - adds an _mta.yaml_ file for MTA-based SAP Business
+                      Technology Platform deployment
 
-    *cf-manifest*   - adds _manifest.yml_ and _services-manifest.yml_ files for Cloud Foundry native deployment
+    *cf-manifest*   - adds _manifest.yml_ and _services-manifest.yml_ files for
+                      Cloud Foundry native deployment
 
-                    This approach makes use of the 'Create-Service-Push Plugin' that has to be installed
-                    separately using _cf install-plugin Create-Service-Push_.
-                    _cf create-service-push_ creates the service(s) and pushes the application(s) to the
-                    SAP Business Technology Platform.
+                      This approach makes use of the 'Create-Service-Push
+                      Plugin' that has to be installed separately using
+                      _cf install-plugin Create-Service-Push_.
+                      _cf create-service-push_ creates the service(s) and pushes
+                      the application(s) to the SAP Business Technology
+                      Platform.
 
     *pipeline*      - adds files for CI/CD pipeline integration
 
-    *samples*       - adds simple sample files
+    *sample*        - adds sample files including Fiori UI
+
+    *sample-tiny*   - adds minimal sample files
 
     *data*          - adds data content for CSN model entities (as csv files)
 
-    *helm*          - adds helm chart folder that contains the files needed to deploy the application using Kyma.
+    *helm*          - adds helm chart folder that contains the files needed to
+                      deploy the application using Kyma.
 
-    *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm Chart (Kyma Only).
+    *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm
+                      Chart (Kyma Only).
 
 
 # OPTIONS
 
+    *--for* <profile>
+
+      Writes configuration data, if any, under the given profile, like
+      \`"[production]": { "db": "hana" }\`
+
     *--data:for* <entity name or prefix>
 
-      Adds data content for entities matching the given pattern.  If it contains meta characters like
-      '^' or '*', it is treated like a regular expression, otherwise as a prefix.
+      Adds data content for entities matching the given pattern.  If it contains
+      meta characters like '^' or '*', it is treated like a regular expression,
+      otherwise as a prefix.
 
     *-o* | *--out* <target folder>
 
-      Specifies output target folder (applicable for data feature only)
-
+      Specifies output target folder (applicable to data feature only)
 
     *--force*
 
@@ -71,7 +85,7 @@ module.exports = Object.assign(add, {
     *cds add* multitenancy
     *cds add* hana,xsuaa --for production
     *cds add* cf-manifest
-    *cds add* data --for my.namspace.MyEntity
+    *cds add* data --data:for my.namespace.MyEntity
     *cds add* helm
 
 

package/bin/bind.js

@@ -1,18 +1,21 @@
 module.exports = Object.assign(cds_bind, {
-    options: ['--to', '--on', '--profile', '--kind', '--output-file'],
+    options: ['--to', '--for', '--on', '--kind', '--output-file'],
     flags: ['--exec'],
-    shortcuts: ['-2', '-n', '-p', '-k', '-o'],
+    shortcuts: ['-2', '-4', '-n', '-k', '-o'],
     help: `
 # SYNOPSIS
 
     *cds bind* <service> [<options>]
     *cds bind --exec* [--profile <profile>] [--] <command> <args ...>
 
-    Binds the given service to a service instance by storing connection information in *.cdsrc-private.json*
-    in your project directory. Credentials are not stored in the file but rather retrieved dynamically during *cds watch*.
+    Binds the given service to a service instance by storing connection
+    information in *.cdsrc-private.json*
+    in your project directory. Credentials are not stored in the file but rather
+    retrieved dynamically during *cds watch*.
     Use option *--output-file* to specify a different path or file.
 
-    With *--exec* you can execute arbitrary commands with your service bindings. The service bindings are provided
+    With *--exec* you can execute arbitrary commands with your service bindings.
+    The service bindings are provided
     in the *VCAP_SERVICES* env variable to the command.
 
 # OPTIONS
@@ -20,12 +23,13 @@ module.exports = Object.assign(cds_bind, {
     *-2 | --to* <instance>[:<key>] | <service-binding> | <secret>
         bind to a given Cloud Foundry instance, Kubernetes service binding or Kubernetes secret.
 
+    *-4 | --for* <profile>
+        store binding information under <profile> in *.cdsrc-private.json*. Default *hybrid* is used
+        if '--for' is not specified
+
     *-n | --on* cf | k8s
         bind to service on Cloud Foundry or Kubernetes, defaults to Cloud Foundry
 
-    *-p | --profile* <profile>
-        add the given profile, defaults to *hybrid*
-
     *-k | --kind* <kind>
         the kind of service
 
@@ -37,123 +41,62 @@ module.exports = Object.assign(cds_bind, {
 
     cds bind --to my-hdi-container
     cds bind --to my-hdi-container,my-xsuaa
-    cds bind uaa --to my-xsuaa:my-xsuaa-key --kind xsuaa --profile myprofile
+    cds bind uaa --to my-xsuaa:my-xsuaa-key --kind xsuaa --for myprofile
 
     cds bind --to my-hdi-container --output-file .
     cds bind --to my-hdi-container --output-file package.json
 
     cds bind --to my-hdi-container --on k8s
+    cds bind --to my-hdi-container --for my-profile
 `
 });
 
+const os = require('os');
+const IS_WIN = os.platform() === 'win32';
 
-const BindingResolver = require('../lib/bind/bindingResolver')
+const { CliError } = require('../lib/client/helper/errors');
+const { bind, parseProfile } = require('../lib/bind');
 
-const { highlight, bold, info } = require('../lib/util/term');
-
-const { determineKinds, getRequiresNameFromKind, execAndExit, checkIsJavaProject, platformText, bindingText, logger } = require('../lib/bind/bindingUtil');
 
 async function cds_bind(args, options) {
 
-    options.profile = parseProfile(options.profile);
-    setProfile(options.profile);
-
     if (options.exec) {
-        await cds_bind_exec(args, options)
-        return;
-    }
-
-    if (!options.to) {
-        throw new Error(`use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);
-    }
-
-    if (args.length > 1) {
-        throw new Error(`Too many arguments: Please specify only one or no service.`);
+        process.env.CDS_ENV = parseProfile(process.env.CDS_ENV);
+        if (options.for) {
+            console.warn('Parameter --for is not supported in combination with --exec. Its value will be ignored.');
+        }
+        return cds_bind_exec(args)
     }
 
-    const isJavaProject = await checkIsJavaProject(process.cwd());
-
-    let serviceArg = args[0]
-    const targets = options.to.split(/,/g);
-
-    if (targets.length >= 2 && serviceArg) {
-        throw new Error(`Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`);
+    // Check if cds command was bind. Don't abort in case of deploy
+    if (process.env.CDS_ENV && process.argv[2] === 'bind') {
+        throw new CliError('Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.');
     }
+    options.for = options.for ?? 'hybrid';
 
-    if (targets.length >= 2 && options.kind) {
-        throw new Error(`The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`);
+    if (!options.to) {
+        throw new CliError(`Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);
     }
 
-    let on;
-    if (options.on === 'k8s' || options.on === 'kubernetes') {
-        on = 'k8s';
-    } else if (!options.on || options.on === 'cf' || options.on === 'cloudfoundry') {
-        on = 'cf';
-    } else {
-        throw new Error(`Invalid value '${options.on}' for option --on.`);
+    if (args.length > 1) {
+        throw new CliError(`Too many arguments: Please specify only one or no service.`);
     }
 
-    const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
-    logger.log(`Retrieving data from ${onText}...`);
-    let resolvedServices
-
-    try {
-        resolvedServices = await Promise.all(targets.map(async target => {
-            let binding;
-            if (on === 'k8s') {
-                binding = { type: on, name: target };
-            } else if (on === 'cf') {
-                const [instance, key] = target.split(/:/);
-                binding = { type: on, instance, key };
-            } else {
-                throw new Error('Internal Error');
-            }
-            const resolvedService = await BindingResolver.resolveBinding(undefined, binding);
-            resolvedService._target = target;
-            delete resolvedService.credentials;
-            resolvedService.binding.resolved = false;
-            return resolvedService;
-        }));
-    } catch (error) {
-        if (error.name === 'AxiosError') {
-            const errors = error.response?.data?.errors ?? []
-            const responseInfo = errors.map(e => `${e.title}: ${e.detail} (${e.code})`).join('  \n')
-            const requestInfo = error.request?.path
-            throw new Error(`${error.toString()}\nResponse: ${responseInfo}\nRequest:${requestInfo}}`)
-        }
-        throw error
-    }
+    options.serviceArg = args[0]
+    options.targets = options.to.split(/,/g);
 
-    if (options.kind) {
-        resolvedServices.forEach(service => service.kind = options.kind);
-    } else {
-        determineKinds(resolvedServices);
+    if (options.targets.length >= 2 && options.serviceArg) {
+        throw new CliError(`Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`);
     }
 
-    for (const resolvedService of resolvedServices) {
-        if (serviceArg) {
-            resolvedService.name = serviceArg;
-        } else if (resolvedService.kind) {
-            resolvedService.name = getRequiresNameFromKind(resolvedService.binding.instance, resolvedService.kind);
-        }
-
-        let { kind, name, binding } = resolvedService;
-        name = name ?? `custom-service:${binding.instance || binding.secret}`
-        resolvedService.name = resolvedService.name ?? name
-        const kindText = kind ? ` with kind ${highlight(kind)}` : ''
-        const nameText = highlight(name)
-
-        logger.log(`Binding ${nameText} to ${platformText(binding)} ${bindingText(binding, highlight)}${kindText}`);
+    if (options.targets.length >= 2 && options.kind) {
+        throw new CliError(`The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`);
     }
 
-    // prepare for different providers
-    const userCdsrcJsonStorageProvider = require('../lib/bind/userCdsrcJsonStorageProvider');
-
-    await userCdsrcJsonStorageProvider.storeServices(resolvedServices, {
-        ...options
+    await bind({
+        ...options,
+        outputFile: options['output-file']
     });
-
-    logger.log(`${info('TIP:')} Run with cloud bindings: ${bold(runCmd(options, isJavaProject))}`);
 }
 
 async function cds_bind_exec(command) { // eslint-disable-lint
@@ -168,23 +111,13 @@ async function cds_bind_exec(command) { // eslint-disable-lint
     execAndExit({ env: processEnv }, ...command);
 }
 
-function runCmd({ profile }, isJavaProject) {
-    if (isJavaProject) {
-        const p = profile === 'hybrid' ? '' : ` --profile ${profile}`;
-        return `cds bind exec${p} mvn spring-boot:run`;
-    } else {
-        const p = profile === 'development' ? '' : ` --profile ${profile}`;
-        return `cds watch${p}`;
-    }
-}
-
-function setProfile(profile) {
-    profile = parseProfile(profile);
-    if (profile) process.env.CDS_ENV = profile;
-}
-
-function parseProfile(profile) {
-    if (!profile) return 'hybrid';
-    else if (profile === '-') return 'development';
-    else return profile;
+function execAndExit(options, command, ...args) {
+    const { spawnSync } = require('child_process');
+    // use shell with Windows only; without output is not visible and some commands cannot be run
+    const result = spawnSync(command, args, {
+        stdio: 'inherit',
+        shell: IS_WIN,
+        ...options
+    });
+    process.exit(result.status);
 }

package/bin/build.js

@@ -0,0 +1,114 @@
+module.exports = Object.assign(build, {
+    options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model', '--clean'],
+    shortcuts: ['-in', '-s', '-o', '-4'],
+    help: `
+# SYNOPSIS
+
+    *cds build* [<project>] [<options>]
+
+    Builds all modules in the current project by compiling contained CDS
+    sources.
+    The modules are folders in the project root directory. All well known
+    modules (db, srv, app) or those configured by build tasks defined in
+    *package.json* or *.cdsrc.json* are built.
+
+# OPTIONS
+
+     *-4 | --for* hana | java | nodejs | mtx | mtx-sidecar | mtx-extension
+
+        Name of the build task that is applied to the source folder, either
+        explicitly configured in the build task list or generated out of the
+        project setup
+        For example, the 'hana' build task will create SAP HANA artefacts.
+        The module folder can be defined using option '--src', a default is used
+        otherwise.
+
+    *-s | --src* <folder>
+
+        The module folder to build using the build task defined by option
+        '--for'.
+        This option is only supported when building an individual module of the
+        project.
+        The folder is resolved based on '<project>/<cds.env.build.target>'.
+        A default is used based on the type of the build task, for example, the
+        folder 'db' is used for a
+        *hana* build task, 'srv' for *nodejs* or *java* build task.
+
+    *-o | --dest* <folder>
+
+        Output folder of the build task. The type of build task is defined by
+        option '--for'.
+        The folder is resolved based on '<project>/<cds.env.build.target>'.
+        Default - folder defined by option '--src'.
+        Note: <cds.env.build.target> can be configured in *.cdsrc.json* or
+        *package.json*.
+        For Node.js projects the folder 'gen' is used by default. The output is
+        written to '<project>/gen/*<dest>*/*'.
+        For Java projects '.' is used by default. The output is written to
+        '<project>/*<dest>*/*'.
+
+    *--opts* <build task specific options>
+
+        Add a comma-separated list of build task specific options in the format
+        <opt1>=[value1,value2],<opt2>=value.
+        For example, --opts model=[db,srv,schema.cds] loads and compiles the CDS
+        model based on the given sources.
+
+    *--profile* <profile,...>
+
+        Loads the configuration data for the specified profile(s) and executes
+        'cds build' based on this profile settings.
+        E.g. you may want to create the HANA deployment artefacts only if the
+        *production* profile is set.
+        The *development* profile is used by default.
+
+    *--production*
+
+        Shortcut for '--profile production'
+
+    *--log-level* <debug | info | warn | error>
+
+        Choose which level of cds build messages to log, default is *warn*.
+
+    *-in | --project* [<project>]
+
+        Runs 'cds build' for the specified project, default is current working
+        directory.
+
+
+# EXAMPLES
+
+   *cds* build
+   *cds* build --production --log-level info
+   *cds* build --for hana
+   *cds* build --for java --src service1
+   *cds* build --for java --dest ../srv/target --opts model=[db/model,srv,schema]
+`})
+
+async function build([project], options = {}) {
+    const path = require('path')
+    const cds = require('../lib/cds')
+
+    // IMPORTANT: call plugins before subsequent access to cds.env
+    await cds.plugins
+
+    cds.root = path.resolve(process.cwd(), project || options.project || '.')
+    cds.env = cds.env.for('cds', cds.root);
+    delete options.project // avoid that relative project paths are resolved twice
+
+    options.cli = true // avoid that errors are logged twice
+
+    const { CliError } = require('../lib/client/helper/errors')
+    const { build } = require('../lib/build')
+
+    if (options.clean === "false") {
+        throw new CliError("cds build option '--clean' is deprecated - build output folders are always cleaned before build")
+    }
+
+    if (typeof options["options-model"] === "string") {
+        options.opts = "model=[" + options["options-model"].split(",").map((entry) => entry.trim()) + "]"
+        delete options["options-model"]
+    }
+
+    await build(options)
+}

package/bin/cds.js

@@ -17,7 +17,6 @@ const cli = { //NOSONAR
     d: 'deploy',
     l: 'login',
     o: 'logout',
-    x: 'extend', '-a': 'activate',
     t: 'lint',
     v: 'version', '-v':'version', '--version':'version',
     h: 'help', '?':'help', '-?':'help', '--help':'help',
@@ -31,50 +30,90 @@ const cli = { //NOSONAR
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (argv.some(a => this.Shortcuts[a]==='help'))  return this.help (cmd)
 
-    const cds_cli = require (_local('@sap/cds/bin/cds'))
-    DEBUG?.(`[cds] - @sap/cds ${require('../lib/cds').version} loaded: ${require('../lib/cds').home}`)
-
-    const task = this.load (cmd, /*else*/ (f)=> argv.unshift(cmd) && _defaultCompile (argv,f))
-    if (task) {
-      // REVISIT bind: '--' handling for cds bind --exec. Should be moved to cds_cli
-      const endOfOptions = argv.indexOf('--')
-      let appendArgs = []
-      if (endOfOptions>=0) {
-        appendArgs = argv.slice(endOfOptions+1)
-        argv = argv.slice(0, endOfOptions)
-      }
-      try {
-        const args = cds_cli.args(task,argv)
+    const cds = require('../lib/cds')
+    DEBUG?.(`[cds] - @sap/cds ${cds.version} loaded: ${cds.home}`)
+
+    try {
+      const task = this.load(cmd, /*else*/(f) => argv.unshift(cmd) && (cmd = 'compile') && _defaultCompile(argv, f))
+      if (task) {
+        // REVISIT bind: '--' handling for cds bind --exec. Should be moved to cds_cli
+        const endOfOptions = argv.indexOf('--')
+        let appendArgs = []
+        if (endOfOptions >= 0) {
+          appendArgs = argv.slice(endOfOptions + 1)
+          argv = argv.slice(0, endOfOptions)
+        }
+        const args = this.args(task, argv)
         args[0].push(...appendArgs)
-        if (args[1]?.['resolve-bindings']) await _resolveBindings()
+        if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
+        cds.cli = {
+          command: cmd,
+          argv: args[0],
+          options: args[1],
+        }
         return await task.apply(this, args)
-      } catch (e) {
-        process.exitCode = 1
-        if (e.messages) require('../lib/cds')._log (e.messages)
-        else console.error(e)
       }
+    } catch (e) {
+      process.exitCode = 1
+      if (process.argv[1].endsWith('watched'))  throw e // bin/watched.js handles errors
+      cds._log(e.messages?.length ? e.messages : e.message ?? e, { 'log-level': cds.env.log.levels.cli })
     }
   },
 
   load (cmd,_default) {
-    if (cmd === 'build/all') return _require ('./'+cmd) // TODO: remove with CDS 7
+    if (cmd === 'build/all') {
+      console.error(`'cds build/all' is no longer supported, use 'cds build' instead`)
+      return
+    }
+
     return /[\\/.-@]/.test(cmd) && _default && _default(true) // like `cds ./srv` or `cds @capire/bookshop`
     || /cds/i.test(cmd) && _dieForUnknownCommand (cmd)  // cds cds
     || _require ('./'+cmd)  // cds-dk commands
-    || _require ('@sap/cds/bin/'+cmd, {paths:[process.cwd(), __dirname]}) // prefer local cds for the rest
     || _default && _default()
     || _dieForUnknownCommand (cmd)
   },
 
+  // TODO replace w/ common arg parser from node
+  args (task, argv) {
+
+    const { options:o=[], flags:f=[], shortcuts:s=[] } = task
+    const _global = /^--(profile|production|sql|odata|build-.*|cdsc-.*|odata-.*|folders-.*)$/
+    const _flags = { '--production':true }
+    const options = {}, args = []
+    let k,a, env = null
+
+    if (argv.length) for (let i=0; i < argv.length; ++i) {
+      if ((a = argv[i])[0] !== '-') args.push(a)
+      else if ((k = s.indexOf(a)) >= 0) k < o.length ? add(o[k],argv[++i]) : add(f[k-o.length])
+      else if ((k = o.indexOf(a)) >= 0) add(o[k],argv[++i])
+      else if ((k = f.indexOf(a)) >= 0) add(f[k])
+      else if (_global.test(a)) add_global(a, _flags[a] || argv[++i])
+      else throw 'Invalid option: '+ a
+    }
+
+    function add (k,v) { options[k.slice(2)] = v || true }
+    function add_global (k,v='') {
+      if (k === '--production') process.env.CDS_ENV = [...process.env.CDS_ENV?.split(',') ?? [], 'production']
+      if (k === '--profile') process.env.CDS_ENV = [...process.env.CDS_ENV?.split(',') ?? [], ...v.split(',')]
+      if (k === '--odata') v = { flavor:v }
+      let e=env || (env={}), path = k.slice(2).split('-')
+      while (path.length > 1) { let p = path.shift(); e = e[p]||(e[p]={}) }
+      add (k, e[path[0]] = v)
+    }
+
+    if (env) require('../lib/cds').env.add (env)
+    return [ args, options ]
+  },
+
   help (cmd) { return this.exec ('help', cmd) }
 }
 
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
-async function _resolveBindings() {
+async function _resolveBindings(options) {
   const cds = require('../lib/cds')
   const BindingManager = require('../lib/bind/bindingManager')
-  const bindingManager = new BindingManager()
+  const bindingManager = new BindingManager(options)
   const bindingEnv = await bindingManager.bindingEnv()
   Object.assign(process.env, bindingEnv)
   cds.env = cds.env.for('cds') // reload env
@@ -149,6 +188,10 @@ function _require (id,o) {
   return require (resolved)
 }
 
+if (process[Symbol.for('ts-node.register.instance')]) {
+  process.env.CDS_TYPESCRIPT = process.env.CDS_TYPESCRIPT || 'true'
+}
+
 module.exports = Object.assign ((..._) => cli.exec(..._), cli)
 
 if (!module.parent)  module.exports()

package/bin/compile/index.js

@@ -135,7 +135,7 @@ module.exports = Object.assign ( compile, {
 function compile_all (root='.') {
 
   const {exec} = require ('child_process')
-  const cds = require('../../lib/compile') // get the enhanced cds w/ additional compile processors
+  const cds = require('../../lib') // get the enhanced cds w/ additional compile processors
 
   exec(`find ${root} -name *.cds ! -path '*/node_modules/*'`, (_,stdout)=>{
     const all = stdout.split('\n').slice(0,-1)
@@ -157,7 +157,7 @@ function compile (models, options={}) {
   if (options.all)  return compile_all (models[0])
 
   const { inspect } = require('util')
-  const cds = require('../../lib/compile') // get the enhanced cds w/ additional compile processors
+  const cds = require('../../lib') // get the enhanced cds w/ additional compile processors
 
   let model, src, _suffix; //> be filled in below
   if (!options.as && !/,/.test(options.to))  options.as = 'str'