@sap/cds 6.3.1 → 6.4.0

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

@@ -8,9 +8,6 @@ const fs = require('fs').promises;
 const { BuildTaskEngine, BuildTaskFactory } = require('../../build');
 const buildConstants = require('../../build/constants');
 
-const cds = require('../../../lib');
-const LOG = cds.log ? cds.log('deploy') : console;
-
 const cfUtil = require('./cfUtil');
 const hdiDeployUtil = require('./hdiDeployUtil');
 const gitUtil = require('./gitUtil');
@@ -29,41 +26,53 @@ class HanaDeployer {
     this.spawnSync = cp.spawnSync;
   }
 
+  getFromEnv(...varNames) {
+    const result = {}
+    for (const varName of varNames) {
+      if (process.env[varName]) {
+        try {
+          result[varName] = JSON.parse(process.env[varName]);
+        } catch (err) {
+          throw new Error(`Error parsing environment variable ${varName}`);
+        }
+      }
+    }
+    return result;
+  }
 
-  async deploy(model, serviceName, noSave, tunnelAddress, buildTaskOptions, vcapFile, undeployWhitelist, hdiOptions, bindCallback, logger = LOG) { // NOSONAR
+  async deploy(model, serviceName, noSave, tunnelAddress, buildTaskOptions, vcapFile, undeployWhitelist, hdiOptions, bindCallback) { // NOSONAR
     hdiOptions = hdiOptions || {}
-    this.logger = logger;
 
-    this.logger.log(`${bold('Starting deploy to SAP HANA ...')}`);
+    console.log(`${bold('Starting deploy to SAP HANA ...')}`);
     if (vcapFile) {
-      this.logger.log();
-      this.logger.log(`Using VCAP_SERVICES from file ${vcapFile} (beta feature).`);
+      console.log(`Using VCAP_SERVICES from file ${vcapFile} (beta feature).`);
       bindCallback = null // credentials are given - no cds bind then
+    } else if (bindCallback) {
+      console.log('Using cds bind');
     }
-    else if (bindCallback) {
-      this.logger.log('Using cds bind');
-    }
-    this.logger.log();
 
     const projectPath = path.resolve(process.env._TEST_CWD || process.cwd());
 
-    const { buildResults } = await this._build(buildTaskOptions, model);
+    const { buildResults } = await this._build(model, buildTaskOptions);
 
-    let vcapFileEnv;
-    if (vcapFile) {
-      vcapFileEnv = await this._loadDefaultEnv(vcapFile);
+    let globalVcapEnv = vcapFile ? await this._loadEnvFile(vcapFile) : {};
+    globalVcapEnv = { ...globalVcapEnv, ...this.getFromEnv('VCAP_SERVICES', 'SERVICE_REPLACEMENTS') };
+    if (process.env.TARGET_CONTAINER) {
+      globalVcapEnv.TARGET_CONTAINER = process.env.TARGET_CONTAINER;
     }
 
     for (const buildResult of buildResults) {
+      let vcapEnv = globalVcapEnv;
       let serviceKeyName;
       const currentModelFolder = buildResult.result.dest;
 
       if (undeployWhitelist) {
-        this.logger.log('Writing undeploy.json');
+        console.log('Writing undeploy.json');
         await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
       }
 
-      if (vcapFile) {
+      const isEmpty = !Object.keys(vcapEnv).length;
+      if (!isEmpty) {
         await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
@@ -71,7 +80,7 @@ class HanaDeployer {
         serviceKeyName = cfServiceInstanceKeyName;
         serviceName = serviceName || cfServiceInstanceName;
 
-        vcapFileEnv = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
+        vcapEnv = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
 
         if (!noSave && !bindCallback) {
           await this._addInstanceToDefaultEnvJson([currentModelFolder, projectPath], cfServiceInstanceName, serviceKey);
@@ -81,7 +90,7 @@ class HanaDeployer {
       // Check if deployer is already installed, otherwise only install this one, not the rest of dependencies.
       if (!await hdiDeployUtil.findHdiDeployLib(currentModelFolder)) {
         const { deployerName, deployerVersionSpec } = hdiDeployUtil;
-        this.logger.log(`Installing ${deployerName}`);
+        console.log(`Installing ${deployerName}`);
 
         // spawn has not callback and cannot be promisified, using sync instead
         this.spawnSync(`npm`, [`install`, `${deployerName}@${deployerVersionSpec}`, (noSave ? '--no-save' : '--save-dev')], {
@@ -95,12 +104,12 @@ class HanaDeployer {
         });
       }
 
-      await hdiDeployUtil.deploy(currentModelFolder, vcapFileEnv, hdiOptions);
+      await hdiDeployUtil.deploy(currentModelFolder, vcapEnv, hdiOptions);
 
       if (bindCallback) {
         const args = [path.relative(projectPath, buildResult.task.src)];
         const options = { to: `${serviceName}:${serviceKeyName}`, kind: buildResult.task.for }
-        await bindCallback(args, options, LOG);
+        await bindCallback(args, options);
       }
     }
 
@@ -108,8 +117,8 @@ class HanaDeployer {
       await gitUtil.ensureFileIsGitignored('default-env.json', projectPath);
     }
 
-    this.logger.log(`If not already done, use ${info('cds add hana')} to configure the project for SAP HANA.\n`);
-    this.logger.log(`Done.`);
+    console.log(`If not already done, use ${info('cds add hana')} to configure the project for SAP HANA.\n`);
+    console.log(`Done.`);
 
     return { buildResults };
   }
@@ -124,14 +133,14 @@ class HanaDeployer {
     if (serviceName) {
       cfServiceInstanceName = serviceName;
     } else {
-      const cfServiceDescriptor = await mtaUtil.getHanaDbModuleDescriptor(projectPath, modelName, this.logger);
+      const cfServiceDescriptor = await mtaUtil.getHanaDbModuleDescriptor(projectPath, modelName);
       cfServiceInstanceName = cfServiceDescriptor.hdiServiceName;
       cfServiceInstanceMta = cfServiceDescriptor.hdiService
     }
 
-    this.logger.log();
+    console.log();
     this._validateServiceInstanceName(cfServiceInstanceName);
-    this.logger.log(`Using container ${bold(cfServiceInstanceName)}`);
+    console.log(`Using container ${bold(cfServiceInstanceName)}`);
 
     let cfConfig = cfServiceInstanceMta && cfServiceInstanceMta.parameters && cfServiceInstanceMta.parameters.config;
     const serviceInstance = await this.createHanaService(cfServiceInstanceName, cfConfig);
@@ -141,7 +150,7 @@ class HanaDeployer {
     this._validateServiceKey(serviceKey, cfServiceInstanceKeyName);
 
     if (tunnelAddress) {
-      this.logger.log(`Using tunnel address ${bold(tunnelAddress)} (beta feature)`);
+      console.log(`Using tunnel address ${bold(tunnelAddress)} (beta feature)`);
       serviceKey = this._injectTunnelAddress(serviceKey, tunnelAddress)
     }
 
@@ -155,11 +164,11 @@ class HanaDeployer {
       return await cfUtil.getOrCreateService('hana', 'hdi-shared', instanceName, cfConfig);
     } catch (error) {
       if (error.command && /offering .* not found/i.test(error.command.stderr)) {
-        this.logger.log(`Falling back to 'hanatrial'`);
+        console.log(`Falling back to 'hanatrial'`);
         return await cfUtil.getOrCreateService('hanatrial', 'hdi-shared', instanceName, cfConfig);
       }
       else if (error.command && /no database/i.test(error.command.stderr)) {
-        this.logger.log(`No database connected to 'hana' service. Falling back to 'hanatrial'`);
+        console.log(`No database connected to 'hana' service. Falling back to 'hanatrial'`);
         return await cfUtil.getOrCreateService('hanatrial', 'hdi-shared', instanceName, cfConfig);
       }
       throw error;
@@ -181,7 +190,7 @@ class HanaDeployer {
   }
 
 
-  async _build(buildTaskOptions, model) {
+  async _build(model, buildTaskOptions) {
     buildTaskOptions = buildTaskOptions || {
       root: process.env._TEST_CWD || process.cwd(),
       cli: true,
@@ -193,18 +202,16 @@ class HanaDeployer {
     if (typeof model === 'string') {
       model = [model];
     }
-
-    this.logger.log(`Creating build tasks`);
-    const buildTaskFactory = new BuildTaskFactory(null, cds);
+    console.log(`Creating build tasks`);
+    const buildTaskFactory = new BuildTaskFactory();
     const hanaTasks = await buildTaskFactory.getTasks(buildTaskOptions);
-    this.logger.log(`Running build`);
+    console.log(`Running build`);
 
     const buildResults = await new BuildTaskEngine().processTasks(hanaTasks, buildTaskOptions);
     return { buildResults, hanaTasks }
   }
 
-
-  async _loadDefaultEnv(defaultEnvFile) {
+  async _loadEnvFile(defaultEnvFile) {
     try {
       const content = await fs.readFile(defaultEnvFile);
       return JSON.parse(content);
@@ -235,7 +242,7 @@ class HanaDeployer {
       const hanaEntry = this._getVCAPServicesEntry(serviceInstanceName, serviceKey)
       Object.assign(defaultEnvJson, hanaEntry);
 
-      this.logger.log(`Writing ${defaultEnvJsonPath}`);
+      console.log(`Writing ${defaultEnvJsonPath}`);
       await fs.mkdir(path.dirname(defaultEnvJsonPath), { recursive: true })
       await fs.writeFile(defaultEnvJsonPath, JSON.stringify(defaultEnvJson, null, 2));
     }

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

@@ -16,16 +16,15 @@ class HdiDeployUtil {
         this.deployerVersionSpec = '^4'
     }
 
-    async deployTenant(dbDir, env, logger) {
-        await this._executeDeploy(dbDir, env, logger);
+    async deployTenant(dbDir, env) {
+        await this._executeDeploy(dbDir, env);
     }
 
     async deploy(dbDir, vcapEnv, options) {
         vcapEnv = vcapEnv || {}; // handles null and undefined
         options = options || {};
 
-        LOG.log();
-        LOG.log(`Deploying to HANA from ${dbDir}`);
+        console.log(`Deploying to HANA from ${dbDir}`);
 
         const hdiDeployLib = await this._getHdiDeployLib(dbDir);
 
@@ -48,7 +47,7 @@ class HdiDeployUtil {
         }
 
         if (options.autoUndeploy) {
-            LOG.log(`Hdi deployer automatically undeploys deleted resources using --auto-undeploy.`);
+            console.log(`Hdi deployer automatically undeploys deleted resources using --auto-undeploy.`);
             hdiDeployOptions.auto_undeploy = true;
         }
 
@@ -90,7 +89,7 @@ class HdiDeployUtil {
 Add it either as a devDependency using 'npm install -D ${this.deployerName}' or install it globally using 'npm install -g ${this.deployerName}'.`);
         }
 
-        LOG.log(`Using HDI deployer from ${libPath}`)
+        console.log(`Using HDI deployer from ${libPath}`)
 
         // let any error go through and abort deploy
         return require(libPath);
@@ -104,14 +103,14 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
     }
 
 
-    async _executeDeploy(dbDir, env, logger) {
+    async _executeDeploy(dbDir, env) {
         const hdiDeployLib = await this._getHdiDeployLib(dbDir);
         return new Promise((resolve, reject) => {
             const callbacks = {
-                stderrCB: error => (logger || LOG).error(error.toString())
+                stderrCB: error => console.error(error.toString())
             }
             if (LOG.level !== SILENT) {
-                callbacks.stdoutCB = (data) => (logger || LOG).log(data.toString());
+                callbacks.stdoutCB = (data) => console.log(data.toString());
             }
 
             hdiDeployLib.deploy(dbDir, env, (error, response) => {

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

@@ -8,11 +8,11 @@ const UTF_8 = 'utf-8'
 const MTA_YAML = 'mta.yaml'
 const LOG = cds.log ? cds.log('deploy') : console;
 
-async function getHanaDbModuleDescriptor(projectPath, moduleName, logger = LOG) {
+async function getHanaDbModuleDescriptor(projectPath, moduleName) {
     // mta might be null if mta.yaml does not exist
-    const mta = await _getMta(projectPath, logger)
-    const projectInfo = await _getProjectInfo(projectPath, mta, logger)
-    const hdiService = _findHdiResource(mta, moduleName, logger)
+    const mta = await _getMta(projectPath)
+    const projectInfo = await _getProjectInfo(projectPath, mta)
+    const hdiService = _findHdiResource(mta, moduleName)
     const appName = _getApplicationName(mta, moduleName, 'hdb')
 
     return {
@@ -23,10 +23,10 @@ async function getHanaDbModuleDescriptor(projectPath, moduleName, logger = LOG)
     }
 }
 
-async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, logger = LOG) {
+async function getServiceModuleDescriptor(projectPath, moduleName, moduleType) {
     // mta might be null if mta.yaml does not exist
-    const mta = await _getMta(projectPath, logger)
-    const projectInfo = await _getProjectInfo(projectPath, mta, logger)
+    const mta = await _getMta(projectPath)
+    const projectInfo = await _getProjectInfo(projectPath, mta)
     const appName = _getApplicationName(mta, moduleName, moduleType)
 
     return {
@@ -35,7 +35,7 @@ async function getServiceModuleDescriptor(projectPath, moduleName, moduleType, l
     }
 }
 
-async function _getProjectInfo(projectPath, mta, logger) {
+async function _getProjectInfo(projectPath, mta) {
     const details = {
     }
     // 1. use mta data
@@ -76,8 +76,7 @@ async function _getProjectInfo(projectPath, mta, logger) {
                 }
             }
         } catch (e) {
-            logger.error(`Failed to load ${packageJsonPath} - skip application data`)
-            logger.error(e)
+            console.error(`Failed to load ${packageJsonPath} - skip application data`, e)
         }
     }
     // 3. use project name and static default values
@@ -97,13 +96,13 @@ async function _getProjectInfo(projectPath, mta, logger) {
     return details
 }
 
-async function _getMta(projectPath, logger) {
+async function _getMta(projectPath) {
     // yaml.parse  oesn't like null
     const mtaFilePath = path.join(projectPath, MTA_YAML)
 
     const existsMtaYaml = existsSync(mtaFilePath)
     if (!existsMtaYaml) {
-        logger.debug('mta.yaml not existing')
+        LOG.debug('mta.yaml not existing')
         return null
     }
 
@@ -140,7 +139,7 @@ function _findModule(mta, moduleName, moduleType) {
     return null
 }
 
-function _findHdiResource(mta, moduleName, logger) {
+function _findHdiResource(mta, moduleName) {
     if (mta && Array.isArray(mta.resources)) {
         const hdiResources = mta.resources.filter(resource => HDI_CONTAINER_TYPES.includes(resource.type))
 
@@ -156,7 +155,7 @@ function _findHdiResource(mta, moduleName, logger) {
                 }
             }
 
-            logger.warn(`No matching hdi resource found for ${moduleName}. Using ${hdiResources[0].name}.`)
+            console.warn(`No matching hdi resource found for ${moduleName}. Using ${hdiResources[0].name}.`)
             return hdiResources[0]
         }
     }

package/bin/mtx/in-cds.js

@@ -1,6 +1,8 @@
 const cds = require('../build/cds')
+const { _oldMtx } = cds.utils
+
 const _is_streamlined_mtx = ()=>{
-  if (process.env.OLD_MTX) return false
+  if (_oldMtx()) return false
   try { return !!require.resolve('@sap/cds-mtxs/srv/deployment-service') }
   catch {/* ignored */}
 }

package/bin/serve.js

@@ -238,7 +238,7 @@ async function _local_server_js() {
 
 function _prepare_logging () { // NOSONAR
 
-  const LOG = cds.log('serve|server',{label:'cds'}); if (!LOG._info) return; else log = LOG.info
+  const LOG = cds.log('cds.serve|server',{label:'cds'}); if (!LOG._info) return; else log = LOG.info
   const _timer = `[cds] - launched at ${new Date().toLocaleString()}, version: ${cds.version}, in`
   console.time (_timer)
 

package/bin/version.js

@@ -58,6 +58,7 @@ function info(o) {
   const { npmGlobalModules } = require('./utils/modules');
   const main = _findPackage (require.main.filename)
   return {
+    // REVISIT: Why do we need all these different hard-coded ways, including proliferation of arguments?
     ..._versions4(main, {}, true),  // usually sap/cds-dk or sap/cds
     ..._versions4('@sap/cds-dk', {}, null, o),  // make sure cds-dk is there, cds-maven-plugin uses it
     ..._versions4('@sap/cds-dk', {}, null, {...o, label: '@sap/cds-dk (global)', pkg: join(npmGlobalModules(), '@sap/cds-dk')}),
@@ -84,7 +85,7 @@ function _versions4 (pkg_name, info, parent, o={}) {
     const pkg = require(path)
     info[o.label || pkg.name] = pkg.version
     if (!parent || o.all) for (let d in pkg.dependencies) { // recurse sap packages in dependencies...
-      if (!(d in info) && d.startsWith('@sap/')) _versions4(d, info, pkg.name, o)
+      if (!(d in info) && (d.startsWith('@sap/') || d.startsWith('@cap-js/'))) _versions4(d, info, pkg.name, o)
     }
   } catch (e) {
     if (e.code !== 'MODULE_NOT_FOUND') info[pkg_name] = MISSING  // unknown error

package/lib/compile/cds-compile.js

@@ -12,6 +12,7 @@ const compile = module.exports = Object.assign (cds_compile, {
     java: require('./for/java'),
     nodejs: require('./for/nodejs'),
     drafts: require('./for/drafts'),
+    lean_drafts: require('./for/lean_drafts'),
     odata: require('./for/odata'),
     sql: require('./for/sql'),
   }),

package/lib/compile/cdsc.js

@@ -124,6 +124,7 @@ module.exports = exports = {__proto__:compile, _options,
     }),
     hdbcds: (csn,o) => compile.to.hdbcds (csn, _options.for.hana(o) ),
     sql: (csn,o) => compile.to.sql (csn, _options.for.sql(o) ),
+    deltaSql: (csn, o, beforeCsn) => compile.to.sql.migration(csn, o, beforeCsn), // or like hdi.migration
     cdl: (csn,o) => compile.to.cdl (csn, _options4(o||{}) ),
   },
 }

package/lib/compile/etc/_localized.js

@@ -17,7 +17,7 @@ const _been_here = Symbol('is _localized')
  */
 function unfold_ddl (ddl, csn, o={}) { // NOSONAR
 	const _locales = _locales_4sql[o.dialect]; if (!_locales)  return ddl
-	const localized_views = ddl.filter (each => each.startsWith('CREATE VIEW localized_'))
+	const localized_views = ddl.filter (each => each.startsWith('CREATE VIEW localized_') || each.startsWith('DROP VIEW localized_'))
 	for (const localized_view of localized_views) {
 		for (const locale of _locales) ddl.push (localized_view
 			.replace (/localized_/g, `localized_${locale}_`)
@@ -45,7 +45,7 @@ function unfold_csn (m) { // NOSONAR
 	const pass2 = []
 
 	const _conf = env.requires.db || env.requires.sql || env.requires.kinds && env.requires.kinds.sql
-	const _on_sqlite = _conf.kind === 'sqlite' || _conf.dialect === 'sqlite'
+	const _on_sqlite = _conf.kind === 'sqlite' || _conf.kind === 'better-sqlite' || _conf.dialect === 'sqlite'
 	const _locales = _on_sqlite && _locales_4sql.sqlite
 
 	// Pass 1 - add localized.<locale> entities and views

package/lib/compile/for/lean_drafts.js

@@ -0,0 +1,83 @@
+const cds = require ('../../index')
+module.exports = function cds_compile_for_lean_drafts(csn, o) {
+  const DRAFT_ELEMENTS = new Set([
+    'IsActiveEntity',
+    'HasDraftEntity',
+    'HasActiveEntity',
+    'DraftAdministrativeData',
+    'DraftAdministrativeData_DraftUUID',
+    'SiblingEntity'
+  ])
+  function _redirect(assoc, target, keys) {
+    assoc.target = target.name
+    assoc._target = target
+    if (keys) assoc.on = _onCondition(assoc.name, keys)
+  }
+
+  function _onCondition(left, keys, right) {
+    const on = []
+    for (let k in keys)
+      DRAFT_ELEMENTS.has(k) || on.push({ ref: [left, k] }, '=', { ref: right ? [right, k] : [k] }, 'and')
+    on.pop()
+    return on
+  }
+
+  const { Draft } = cds.linked(`
+  entity ActiveEntity { key ID: UUID; }
+  entity Draft {
+    virtual IsActiveEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
+    virtual HasDraftEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
+    HasActiveEntity                   : Boolean; // This should be written !!!
+    DraftAdministrativeData           : Association to DRAFT.DraftAdministrativeData;
+    DraftAdministrativeData_DraftUUID : UUID;
+    // SiblingEntity                  : Association to ActiveEntity; // REVISIT: Why didn't we use a managed assoc here?
+  }
+  entity DRAFT.DraftAdministrativeData {
+    key DraftUUID         : UUID;
+    LastChangedByUser     : String(256);  LastChangeDateTime : Timestamp;
+    CreatedByUser         : String(256);  CreationDateTime   : Timestamp;
+    InProcessByUser       : String(256);
+    DraftIsCreatedByMe    : Boolean; // REVISIT: these are calculated fields, aren't they?
+    DraftIsProcessedByMe  : Boolean; // REVISIT: these are calculated fields, aren't they?
+  }
+`).definitions
+  function draftEntity(active, model) {
+    const _draftEntity = active.name + '.drafts'
+    const d = model.definitions[_draftEntity]
+    if (d) return d
+    // We need to construct a fake draft entity definition
+    const draft = { __proto__: active, name: _draftEntity, elements: { ...active.elements, ...Draft.elements } }
+    Object.defineProperty(model.definitions, _draftEntity, { value: draft })
+    Object.defineProperty(active, 'drafts', { value: draft })
+    draft['@cds.persistence.table'] = _draftEntity
+    // Recursively add drafts for compositions
+    for (const each in draft.elements) {
+      const e = draft.elements[each]
+      const newEl = Object.create(e)
+      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || e._isBacklink) {
+        _redirect(newEl, draftEntity(e._target, model))
+      }
+      newEl.parent = draft
+      draft.elements[each] = newEl
+    }
+    // TODO: Redirect associations to localized
+    return draft
+  }
+  for (const name in csn.definitions) {
+    const def = csn.definitions[name]
+    if (!def._isDraftEnabled || def.name.endsWith('.DraftAdministrativeData'))
+      continue
+      // so that database ignores them
+    ;[
+      'IsActiveEntity',
+      'HasDraftEntity',
+      'HasActiveEntity',
+      'DraftAdministrativeData_DraftUUID',
+      'DraftAdministrativeData'
+    ].forEach(s => {
+      def.elements[s].virtual = true
+    })
+    // will insert drafts entities, so that others can use `.drafts` even without incoming draft requests
+    draftEntity(def, csn, Draft)
+  }
+}

package/lib/compile/for/nodejs.js

@@ -6,6 +6,7 @@ module.exports = function cds_compile_for_nodejs (csn,o) {
   dsn = cds.compile.for.drafts (csn,o) //> creates a partial copy -> avoid any cds.linked() before
   dsn = cds.compile._localized.unfold_csn (dsn)
   dsn = cds.linked (dsn)
+  if (cds.env.features.lean_draft) cds.compile.for.lean_drafts(dsn, o)
   Object.defineProperty (csn, '_4nodejs', {value:dsn})
   Object.defineProperty (dsn, '_4nodejs', {value:dsn})
   return dsn

package/lib/compile/minify.js

@@ -3,7 +3,7 @@ const cds = require('../index')
 module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds.env.features.skip_unused as default for _roots here, as that will break VSCode's IntelliSense
   const roots = _roots !== undefined ? _roots : cds.env.features.skip_unused
   if (roots === false) return csn
-  if (csn[_minified]) return csn; else Object.defineProperty (csn,_minified,{value:true})
+  if (csn[_minified]) return csn
   const all = csn.definitions, reached = new Set
   if (roots === 'services') {
     for (let n in all) if (all[n].kind === 'service') _visit_service(n)
@@ -58,6 +58,7 @@ module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds
   const minified = Object.create (csn.__proto__, Object.getOwnPropertyDescriptors(csn))
   const less = minified.definitions = {}
   for (let n in all) if (reached.has(all[n])) less[n] = all[n]
+  Object.defineProperty (minified,_minified,{value:true})
   return minified
 }
 

package/lib/compile/parse.js

@@ -16,7 +16,8 @@ const parse = module.exports = Object.assign (cds_parse, {
   }},
   path: (x,...values) => {
     if (x && x.raw) return tagged (parse.path,x,...values)
-    if (/^[A-Za-z_$][A-Za-z_0-9.$]*$/.test(x)) return {ref:[x]}
+    if (/^[A-Za-z_0-9.$]*$/.test(x)) return {ref:[x]}
+    if ((cds.context?.model || cds.model)?.definitions[x]) return {ref:[x]}
     let {SELECT} = parse.cql('SELECT from '+x)
     return SELECT.from
   },

package/lib/compile/to/gql.js

@@ -1,6 +1,6 @@
 const cds = require ('../..')
 // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
-const { SchemaGenerator } = require('@sap/cds-graphql/lib/schema')
+const { SchemaGenerator } = require('@cap-js/graphql/lib/schema')
 
 function cds_compile_to_gql (csn) {
   const m = cds.linked(csn)

package/lib/compile/to/sql.js

@@ -17,6 +17,15 @@ function cds_compile_to_hdbtable (csn,o) {
   return _2many(all)
 }
 
+function cds_compile_to_deltaSql (csn, o, beforeCsn) {
+  const options = cdsc._options.for.sql(o);
+  const { afterImage, drops, createsAndAlters } = cdsc.to.deltaSql (csn, options, beforeCsn || {definitions: {}, $version: '2.0'} ); // FIXME: As default value in compiler API?
+  return { 
+    afterImage, 
+    drops: cds.compile._localized.unfold_ddl(drops.map (each => each.replace(/^-- .+\n/,'')), csn, options), 
+    createsAndAlters: cds.compile._localized.unfold_ddl(createsAndAlters.map (each => each.replace(/^-- .+\n/,'')), csn, options) 
+  };
+}
 
 function cds_compile_to_hdbcds (csn,o) {
   const all = cdsc.to.hdbcds (cds.minify(csn),o)
@@ -38,7 +47,8 @@ function* _2many (all,_file=f=>f) {
 module.exports = Object.assign (cds_compile_to_sql, {
   hdbcds: cds_compile_to_hdbcds,
   hdbtable: cds_compile_to_hdbtable,
-  sqlite: { keywords }
+  delta: cds_compile_to_deltaSql,
+  sqlite: { keywords },
 })
 
 

package/lib/core/entities.js

@@ -13,7 +13,7 @@ class entity extends struct   {
   }
   get drafts() {
     return this.own('_drafts') || this.set('_drafts',
-      this.elements.HasDraftEntity && { name: this.name + '_drafts', keys: this.keys }
+      this.elements?.HasDraftEntity && { name: this.name + '_drafts', keys: this.keys }
     )
   }
   _elements (filter) {

package/lib/core/index.js

@@ -35,13 +35,12 @@ const roots = _roots ({
  function _roots (defs) {
 	const linked = { any: classes.any.prototype }
 	for (const t in defs) {
-		if (t in classes) {
-			linked[t] = classes[t].prototype
-			continue
+		if (t in classes) linked[t] = classes[t].prototype
+		else {
+			const c = class extends classes[defs[t].type || 'any'] {}
+			classes[t] = Object.defineProperty (c, 'name', {value:t})
+			linked[t] = Object.defineProperty (c.prototype, 'name', {value:t})
 		}
-		const c = class extends classes[defs[t].type || 'any'] {}
-		linked[t] = Object.defineProperty (c.prototype, 'name', {value:t})
-		classes[t] = Object.defineProperty (c, 'name', {value:t})
 	}
 	return linked
 }
@@ -56,9 +55,9 @@ const types = _common ({ __proto__: roots,
 		Int16: {type:'Integer'},
 		Int32: {type:'Integer'},
 		Int64: {type:'Integer'},
-		Integer16: {type:'Integer'},
-		Integer32: {type:'Integer'},
-		Integer64: {type:'Integer'},
+		Integer16: {type:'Int16'},
+		Integer32: {type:'Int32'},
+		Integer64: {type:'Int64'},
 	Decimal: {type:'number'},
 	DecimalFloat: {type:'number'},
 	Float: {type:'number'},

package/lib/core/infer.js

@@ -5,6 +5,7 @@ module.exports = (q,defs) => {
   if (!q._target || q._target.kind !== 'entity') Object.defineProperty (q, '_target', {value:(
     q.SELECT ? _resolve (q.SELECT.from, defs) :
     q.INSERT ? _resolve (q.INSERT.into, defs) :
+    q.UPSERT ? _resolve (q.UPSERT.into, defs) :
     q.UPDATE ? _resolve (q.UPDATE.entity, defs) :
     q.DELETE ? _resolve (q.DELETE.from, defs) :
     _resolve (undefined)