@sap/cds 6.0.4 → 6.1.2

package/lib/env/{index.js → cds-env.js}

@@ -1,4 +1,4 @@
-const { isfile, fs, path } = require('../utils')
+const { isfile, fs, path } = require('../utils/cds-utils')
 const DEFAULTS = require('./defaults'), defaults = require.resolve ('./defaults')
 const compat = require('./compat')
 const presets = require('./presets')
@@ -130,22 +130,6 @@ class Config {
     return option.split('.').reduce ((p,n)=> p && p[n], this)
   }
 
-  /**
-   * This is `this.requires` plus additional entries for all cds.required.<name>.service
-   * @returns {import('./requires')}
-   */
-  get required_services_or_defs() {
-    const dict = Object.create (this.requires)
-    for (let [name,e] of Object.entries (this.requires)) if (e.service) {
-      if (e.service in dict && !e.override && e.service !== name) {
-        console.error (`Datasource name '${e.service}' conflicts with 'service' definition referred to in 'cds.requires.${name}':`, e)
-        throw new Error (`Datasource name '${e.service}' conflicts with service definition`)
-      }
-      else dict[e.service] = { ...e, name }
-    }
-    return super.required_services_or_defs = dict
-  }
-
   get profiles() {
     return super.profiles = Array.from (this._profiles)
   }

package/lib/env/{requires.js → cds-requires.js}

@@ -11,6 +11,23 @@ exports = module.exports = {
     '[production]': { kind: 'jwt-auth' }
   },
 
+
+  /**
+   * This is the implementation for `cds.requires` which is `cds.env.requires`
+   * plus additional entries for all cds.required.<name>.service
+   * @returns {import('./cds-requires')}
+   */
+   _resolved() {
+    const dict = Object.create (this)
+    for (let [name,e] of Object.entries (this)) if (e.service) {
+      if (e.service in dict && !e.override && e.service !== name) {
+        console.error (`Datasource name '${e.service}' conflicts with 'service' definition referred to in 'cds.requires.${name}':`, e) // eslint-disable-line no-console
+        throw new Error (`Datasource name '${e.service}' conflicts with service definition`)
+      }
+      else dict[e.service] = { ...e, name }
+    }
+    return dict
+  }
 }
 
 
@@ -85,6 +102,10 @@ const _databases = {
     '[development]': { kind: 'sqlite', credentials: { url: ':memory:' } },
     '[production]': { kind: 'hana' },
   },
+  "sql-mt": {
+    '[development]': { kind: 'sqlite' },
+    '[production]': { kind: 'hana-mt' },
+  },
   "sqlite": _compat_to_use({
     credentials: { url: 'sqlite.db' },
     impl: `${_runtime}/sqlite/Service.js`,
@@ -208,11 +229,11 @@ const _mtx_services = {
     model: "@sap/cds/srv/extensions",
   },
   "extensibility": {
-    model: [ "@sap/cds/srv/mtx", "@sap/cds/srv/extensions" ]
+    model: [ "@sap/cds/srv/mtx", "@sap/cds/srv/extensions" ],
+    tenantCheckInterval: 10000
   },
   "cds.xt.ExtensibilityService": {
-    model: "@sap/cds/srv/extensibility-service",
-    tenantCheckInterval: 10000
+    model: "@sap/cds/srv/extensibility-service"    
   },
   "uiflex": "extensibility", // REVISIT: temporary for compatibility with cds-mtxs tests -> eliminate "uiflex" later
 

package/lib/env/defaults.js

@@ -1,9 +1,15 @@
+const path = require('path')
 const [,major,minor] = /v(\d+)\.(\d+)/.exec(process.version)
 const production = process.env.NODE_ENV === 'production'
 
 module.exports = {
 
-  requires: require('./requires'),
+  requires: require('./cds-requires'),
+
+  schemas: {
+    'cds-rc.json': path.join(__dirname, 'schemas/cds-rc.json'),
+    'cds-package.json': path.join(__dirname, 'schemas/cds-package.json'),
+  },
 
   features: {
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released

package/lib/env/schemas/cds-package.json

@@ -0,0 +1,11 @@
+{
+  "title": "JSON schema for CDS configuration in package.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "This is a JSON schema representation of the CDS project configuration inside a project root level package.json",
+  "type": "object",
+  "properties": {
+    "cds": {
+      "$ref": "cdsJsonSchema://schemas/cds-rc.json"
+    }
+  }
+}