@sap/cds-dk 7.3.2 → 7.4.1

package/bin/build.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(build, {
     options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model'],
     shortcuts: ['-in', '-s', '-o', '-4'],
-    flags: ['--ws', '--clean'],
+    flags: ['--clean', '--no-clean', '--ws'], // REVISIT: --clean is deprecated, backward compatibility
     help: `
 # SYNOPSIS
 
@@ -16,7 +16,6 @@ module.exports = Object.assign(build, {
 # 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
@@ -25,7 +24,6 @@ module.exports = Object.assign(build, {
         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
@@ -36,7 +34,6 @@ module.exports = Object.assign(build, {
         *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>'.
@@ -49,14 +46,12 @@ module.exports = Object.assign(build, {
         '<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
@@ -64,18 +59,28 @@ module.exports = Object.assign(build, {
         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.
-
+        
+    *--no-clean* (beta)
+        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.
+
+    *--ws* (beta)
+        Enable tarball based packaging of npm workspace dependencies - typically defined for
+        Node.js mono or multi-repo setups.
+        For each workspace dependency of your project using '*' as version identifier,
+        a tarball will be created in folder 'gen/srv'. Dependencies in package.json
+        will be adapted to point to the correct tarball file URL.
+        Contents is packaged based on the rules of the 'npm pack' command.
+        See 'npm workspaces' and 'npm pack' for further details.
 
 # EXAMPLES
 
@@ -105,13 +110,17 @@ async function build([project], options = {}) {
     if (Number(major) < 6) {
         throw "This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6."
     }
-    if (options.clean === "false") {
-        throw "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"]
     }
+    if (options["no-clean"]) {
+        // mapping to the existing 'clean' option
+        if (options["no-clean"] === "true" || options["no-clean"] === true) {
+            options.clean = false
+        }
+        delete options["no-clean"]
+    }
 
     await build(options)
 }

package/bin/cds.js

@@ -93,8 +93,8 @@ const cli = { //NOSONAR
 
     function add (k,v) { options[k.slice(2)] = v || true }
     function add_global (k,v='') {
-      if (k === '--production') return process.env.CDS_ENV = [...process.env.CDS_ENV?.split(',') ?? [], 'production']
-      if (k === '--profile') return process.env.CDS_ENV = [...process.env.CDS_ENV?.split(',') ?? [], ...v.split(',')]
+      if (k === '--production') return process.env.CDS_ENV = Array.from(new Set([...process.env.CDS_ENV?.split(',') ?? [], 'production']))
+      if (k === '--profile')    return process.env.CDS_ENV = Array.from(new Set([...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]={}) }
@@ -103,7 +103,7 @@ const cli = { //NOSONAR
 
     // if (env) require('../lib/cds').env.add (env) //> avoid loading env
     // unless it has already explicitly been set by the user
-    process.env.CDS_CONFIG ??= JSON.stringify(env)
+    if (env) process.env.CDS_CONFIG ??= JSON.stringify(env)
     return [ args, options ]
   },
 

package/bin/migrate.js

@@ -43,11 +43,11 @@ module.exports = Object.assign(migrate, {
         Skip verification step. Does not check for potential deployment
         differences.
 
-    *--cleanup* (beta)
+    *--cleanup*
 
         Removes all metadata containers created by @sap/cds-mtx.
 
-    *--resolve-bindings* (beta)
+    *--resolve-bindings*
 
         Resolve remote service bindings configured via *cds bind*.
 

package/bin/push.js

@@ -1,5 +1,5 @@
 module.exports = Object.assign(push, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--to', '--sync'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--to', '--async', '--sync'],
     flags: [],
     shortcuts: ['-s', '-p', '-u', '-c', '-2'],
     help: `
@@ -48,9 +48,9 @@ module.exports = Object.assign(push, {
 
         Client ID and optionally Client Secret for authentication.
 
-    *--sync*
+    *--async*
 
-        Use the synchronous server API to upload extensions.
+        Use the asynchronous server API to upload extensions.
 
 
 # SEE ALSO

package/bin/repl.js

@@ -17,8 +17,6 @@ async function repl (_, options={}) {
   const cds = require('../lib/cds')
   console.log('\x1b[32m\x1b[1m'+'Welcome to cds repl v', cds.version, '\x1b[0m')
 
-  await cds.plugins
-
   const { inspect } = require('util')
   inspect.defaultOptions.colors = true
   inspect.defaultOptions.depth = 11

package/bin/subscribe.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(subscribe, {
     init: cmd => new (require('../lib/client/tenant_action'))(cmd),
     options: ['--to', '--user'],
-    flags: ['--local'],
-    shortcuts: ['-2', '-u', '-l'],
+    flags: ['--local', '--resolve-bindings'],
+    shortcuts: ['-2', '-u', '-l', '-b'],
     help: `
 # SYNOPSIS
 
@@ -24,10 +24,10 @@ module.exports = Object.assign(subscribe, {
 
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
-        
+
         Only relevant if <url> is given. May be omitted in case of dummy
         authentication.
-        
+
         Tokens saved with *cds login* are not used for this command.
 
     *-l* | *--local*
@@ -35,11 +35,15 @@ module.exports = Object.assign(subscribe, {
         Run a locally-installed @sap/cds-mtxs and connect to it instead of a
         URL. Ignore settings saved with *cds login*.
 
+    *-b* | *--resolve-bindings*
+
+        Resolve remote service bindings configured via *cds bind*.
+
 
 # SEE ALSO
 
     *cds login* for more information on authentication options.
-    
+
     *cds login* to save project settings and Basic-Auth data, simplifying multiple runs of this command.
 
 `});
@@ -63,6 +67,7 @@ async function subscribe([tenant], options = {}) {
     }
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
+    delete options['resolve-bindings'];
 
     await subscribe.init('subscribe').run({
         ...options,

package/bin/unsubscribe.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(unsubscribe, {
     init: cmd => new (require('../lib/client/tenant_action'))(cmd),
     options: ['--from', '--user'],
-    flags: ['--local'],
-    shortcuts: ['-f', '-u', '-l'],
+    flags: ['--local', '--resolve-bindings'],
+    shortcuts: ['-f', '-u', '-l', '-b'],
     help: `
 # SYNOPSIS
 
@@ -25,10 +25,10 @@ module.exports = Object.assign(unsubscribe, {
 
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
-        
+
         Only relevant if <url> is given. May be omitted in case of dummy
         authentication.
-        
+
         Tokens saved with *cds login* are not used for this command.
 
     *-l* | *--local*
@@ -36,11 +36,15 @@ module.exports = Object.assign(unsubscribe, {
         Run a locally-installed @sap/cds-mtxs and connect to it instead of a
         URL. Ignore settings saved with *cds login*.
 
+    *-b* | *--resolve-bindings*
+
+        Resolve remote service bindings configured via *cds bind*.
+
 
 # SEE ALSO
 
     *cds login* for more information on authentication options.
-    
+
     *cds login* to save project settings and Basic-Auth data, simplifying multiple runs of this command.
 
 `});
@@ -64,6 +68,7 @@ async function unsubscribe([tenant], options = {}) {
     }
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
+    delete options['resolve-bindings'];
 
     await unsubscribe.init('unsubscribe').run({
         ...options,

package/bin/upgrade.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(upgrade, {
     init: cmd => new (require('../lib/client/tenant_action'))(cmd),
     options: ['--at', '--user'],
-    flags: ['--local'],
-    shortcuts: ['-a', '-u', '-l'],
+    flags: ['--local', '--resolve-bindings'],
+    shortcuts: ['-a', '-u', '-l', '-b'],
     help: `
 # SYNOPSIS
 
@@ -25,10 +25,10 @@ module.exports = Object.assign(upgrade, {
 
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
-        
+
         Only relevant if <url> is given. May be omitted in case of dummy
         authentication.
-        
+
         Tokens saved with *cds login* are not used for this command.
 
     *-l* | *--local*
@@ -36,11 +36,15 @@ module.exports = Object.assign(upgrade, {
         Run a locally-installed @sap/cds-mtxs and connect to it instead of a
         URL. Ignore settings saved with *cds login*.
 
+    *-b* | *--resolve-bindings*
+
+        Resolve remote service bindings configured via *cds bind*.
+
 
 # SEE ALSO
 
     *cds login* for more information on authentication options.
-    
+
     *cds login* to save project settings and Basic-Auth data, simplifying multiple runs of this command.
 
 `});
@@ -64,6 +68,7 @@ async function upgrade([tenant], options = {}) {
     }
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
+    delete options['resolve-bindings'];
 
     await upgrade.init('upgrade').run({
         ...options,

package/bin/watch.js

@@ -37,6 +37,11 @@ module.exports = Object.assign ( watch, {
     Open the given URL (suffix) in the browser after starting.
     If none is given, the default application URL will be opened.
 
+  *--profile* <profile,...>
+
+    Specify from which profile(s) the binding information is taken.
+    *Example:* cds w --profile hybrid,production
+
 # SEE ALSO
 
   *cds serve --help* for the different start options.

package/bin/watched.js

@@ -7,8 +7,8 @@
 
   // run through cli in order to use its error handling
   const args = JSON.parse(process.env._args)
+  const cds = require('../lib/cds'); cds.watched = true
   const bootstrap = require('./cds')(...args)
-  const {cds} = global; cds.watched = true
 
   cds.once('listening', ({server}) => {
     process.send ({ code:'listening', port: server.address().port })

package/lib/bind/bindingUtil.js

@@ -1,6 +1,7 @@
 
 const KindToRequiresNameMap = {
-    xsuaa: 'auth',
+    xsuaa: 'auth', // REVISIT: remove with ^8
+    'xsuaa-auth': 'auth',
     'ias-auth': 'auth',
     'hana-cloud': 'db',
     hana: 'db',
@@ -17,7 +18,8 @@ const KindToRequiresNameMap = {
 
 const PreferredKinds = [
     'hana-cloud',
-    'xsuaa'
+    'xsuaa', // REVISIT: remove with ^8
+    'xsuaa-auth'
 ];
 
 const PLATFORM_TYPES = {

package/lib/build/buildTaskFactory.js

@@ -230,7 +230,7 @@ class BuildTaskFactory {
 
     static _scanTaskOptionParams(optsParams) {
         // need to create new regex every call since a constant would keep the match state
-        const quoteRegex = /([\w-]+)=([\w/.]+|\[([\w/,.]+)\])/g
+        const quoteRegex = /([\w-]+)=([\w/.-]+|\[([\w/,.-]+)\])/g
 
         // captures a=1             => a:1
         //          a=[x,y,z]       => a:[x,y,z]

package/lib/build/constants.js

@@ -34,6 +34,7 @@ exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_mod
 exports.CONTENT_ENV = "contentEnv"                              // copy .env file if existing into deployment folder - DISABLED by default
 exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file if existing into deployment folder - DISABLED by default
 
+exports.CSV_FILE_TARGET = "csvFileTarget"                       // target folder when copying CSV files to the deployment target folder ./db/src/gen/*, default is 'data'
 exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
 exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default
 exports.MTX_SIDECAR_DB_VALIDATION = "mtxSidecarDbValidation"    // validate consistency of app and sidecar db configuration - ENABLED by default

package/lib/build/provider/hana/2migration.js

@@ -13,8 +13,7 @@ module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
     logger = options.logger
   }
 
-  const journalFileNames = _getJournalFileNames(model)
-  const { definitions, deletions, migrations, afterImage } = _toHdiMigration(model, lastDevVersion, journalFileNames, options)
+  const { definitions, deletions, migrations, afterImage, journalFileNames } = _toHdiMigration(model, lastDevVersion, options)
   const definitionResult = []
 
   for (const { name, suffix, sql } of definitions) {
@@ -33,8 +32,9 @@ module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
   return { definitions: definitionResult, deletions, afterImage: _filterJournalArtifacts(afterImage) }
 }
 
-function _toHdiMigration(model, lastDevVersion, journalFileNames, options) {
+function _toHdiMigration(model, lastDevVersion, options) {
   const result = cdsc.to.hdi.migration(cds.minify(model), options, lastDevVersion);
+  const journalFileNames = _getJournalFileNames(result.afterImage);
   if (logger._debug) {
     logger.debug('cdsc.to.hdi.migration returned')
     for (const { name, suffix, sql } of result.definitions) {
@@ -50,7 +50,7 @@ ${migration ? migration.changeset.map(change => change.sql).join('\n') : 'Empty
       }
     }
   }
-  return result
+  return { ...result, journalFileNames };
 }
 
 /**

package/lib/build/provider/hana/index.js

@@ -6,7 +6,7 @@ const InternalBuildPlugin = require('../internalBuildPlugin')
 const { BuildError, relativePaths, BuildMessage } = require('../../util')
 
 const { OUTPUT_MODE_NONE, OUTPUT_MODE, CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION,
-    CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES } = require('../../constants')
+    CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES, CSV_FILE_TARGET } = require('../../constants')
 const { WARNING } = InternalBuildPlugin
 
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
@@ -90,18 +90,28 @@ class HanaBuildPlugin extends InternalBuildPlugin {
      */
     async _copyResourcesExt(src, dest, model) {
         const resources = Object.keys(await cds.deploy.resources(model)).reverse() // reverse to get reuse resources first and app resources last
-        const csvPath = path.join(src, "data")
-        // determine subfolder name used by the application for backward compatibility
-        const csvFolder = resources.some(res => res && res.startsWith(csvPath)) ? "data" : "csv"
+        const dbSrc = path.join(src, 'src')
 
         // 1. copy csv files into 'src/gen/data' or 'src/gen/csv' subfolder
-        const dbSrc = path.join(src, 'src')
+        if (resources.length) {
+            // determine the CSV folder from the location of the CSVs defined in this build task db folder, use subfolder data by default
+            const dbCSVs = resources.filter(res => res.startsWith(src) && !res.startsWith(dbSrc))
+            let csvFolder = this.getBuildOption(CSV_FILE_TARGET)
+            if (csvFolder && !["data", "csv"].includes(csvFolder)) {
+                throw new BuildError("Invalid value for option 'csvFileTarget'. Valid values are 'data' or 'csv'.")
+            }
+            if (!csvFolder) {
+                const csvPath = path.join(src, "data")
+                // determine subfolder name used by the application for backward compatibility
+                csvFolder = !dbCSVs.length || dbCSVs.some(res => res && res.startsWith(csvPath)) ? "data" : "csv"
+            }
 
-        // await each copy as order is important - reuse resources first and app resources last
-        for (const res of resources) {
-            // do not duplicate resources that are already contained in db/src/**
-            if (res && /\.csv$/.test(res) && !res.startsWith(dbSrc)) {
-                await this.copy(res).to(path.join(this.task.options.compileDest, csvFolder, path.basename(res)))
+            // await each copy as order is important - reuse resources first and app resources last
+            for (const res of resources) {
+                // do not duplicate resources that are already contained in db/src/**
+                if (res && /\.csv$/.test(res) && !res.startsWith(dbSrc)) {
+                    await this.copy(res).to(path.join(this.task.options.compileDest, csvFolder, path.basename(res)))
+                }
             }
         }
 

package/lib/build/provider/java/index.js

@@ -24,12 +24,12 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
             // generate edmx files containing all features
-            // localized edmx for backward compatibility
+            // REVISIT: localized edmx for backward compatibility
             if (!this.hasBuildOption(CONTENT_LOCALIZED_EDMX, false)) {
                 await this.compileToEdmx(odata, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
             }
             // non-localized edmx
-            await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: false })
+            await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) })
         }
 
         if (!this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, false)) {

package/lib/build/provider/mtx-extension/index.js

@@ -37,12 +37,14 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
                 extModel.requires.length = 0
             }
 
-            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            // perform all model operations before the linter is called as the linter 
+            // IMPORTANT NOTE: perform all model operations before the linter is called as the linter
             // will modify the model causing the creation of 'unresolved' associations
             await this.compileToJson(extModel, path.join(destExt, 'extension.csn'))
             await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
 
+            // perform SQL backend validation to prevent extension deployment problems later on
+            cds.compile.to.sql(model)
+
             const files = Object.keys(await cds.deploy.resources(model))
             if (files.length > 0) {
                 const dataDest = path.join(destExt, 'data')
@@ -54,6 +56,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
                         })
                 )
             }
+
             if (!this.hasBuildOption(EXTENSION_POINT_VALIDATION, false)) {
                 try {
                     // throws error in case of linting errors

package/lib/build/provider/nodejs/index.js

@@ -1,6 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
+const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
@@ -61,59 +62,6 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         return this._result
     }
 
-    // REVISIT: fix for simple mono repos using npm workspaces
-    // Support for HANA native artifacts defined in sub-modules required
-    async _addWorkspaceDependencies(dest) {
-        try {
-            const workspaceRoot = path.resolve(cds.root, this.getBuildOption("workspaceRoot") ?? '.')
-            if (workspaceRoot !== cds.root && !fs.existsSync(workspaceRoot)) {
-                throw new BuildError(`The given workspaceRoot path ${workspaceRoot} does not exist`)
-            }
-            const packageJson = require(path.join(dest, 'package.json'))
-            const workspaces = workspaceRoot === cds.root ? packageJson.workspaces : require(path.join(workspaceRoot, 'package.json')).workspaces
-            if (workspaces?.length) {
-                this.logger._debug && this.logger.debug(`Existing npm workspace configuration '${JSON.stringify(workspaces, ' ')}'`)
-                const { tar } = require('../../../../lib').utils
-                const { dependencies } = packageJson
-                const folders = fs.readdirSync(workspaceRoot).filter(res => {
-                    try {
-                        return fs.lstatSync(path.join(workspaceRoot, res)).isDirectory()
-                    } catch (e) {
-                        return false
-                    }
-                })
-                this.logger._debug && this.logger.debug(`Existing workspace subfolders '${JSON.stringify(folders, ' ')}'`)
-
-                const workspaceNames = new Set()
-                let changed
-                for (const workspace of workspaces) {
-                    //REVISIT: workspaces must only use simple glob like 'foo*', nested folders are not supported
-                    const regex = new RegExp('^' + workspace.split('/').pop().replace(/\*/g, '.*') + '$')
-                    for (const folder of folders) {
-                        if (!workspaceNames.has(folder) && folder.match(regex)) {
-                            workspaceNames.add(folder)
-                            const plugin = require(require.resolve(path.join(workspaceRoot, folder, 'package.json')))
-                            const tarFile = `${plugin.name.replace(/\//g, '-').replace(/@/, '')}-${plugin.version}.tgz`
-                            if (dependencies[plugin.name] === '*') {
-                                const tarFilePath = path.join(dest, tarFile)
-                                dependencies[plugin.name] = `file:${tarFile}`
-                                await tar.czfd(tarFilePath, path.join(workspaceRoot, folder))
-                                this.pushFile(tarFilePath)
-                                changed = true
-                            }
-                        }
-                    }
-                }
-                if (changed) {
-                    return this.write(JSON.stringify(packageJson, null, '  ')).to(path.join(dest, 'package.json'))
-                }
-            }
-        } catch (e) {
-            this.pushMessage(`Failed to add npm workspace dependencies: ${e.message}`)
-            this.logger.debug(e)
-        }
-    }
-
     async clean() {
         // staging build content is deleted by BuildTaskEngine
         if (cds.env.build.target === '.') {
@@ -209,6 +157,83 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
             return srvAllowList.test(entry) && (!filter || filter.call(this, entry))
         })
     }
+
+    async _addWorkspaceDependencies(dest) {
+        const wsRoot = this._findWorkspaceRoot(cds.root)
+        const appPkg = require(path.join(dest, 'package.json'))
+        let workspaces
+        if (this.task.options?.workspaces) {
+            workspaces = Array.isArray(this.task.options.workspaces) ? this.task.options.workspaces : [this.task.options.workspaces]
+        }
+        if (!workspaces) {
+            workspaces = []
+            for (const name in appPkg.dependencies) {
+                if (appPkg.dependencies[name] === '*') {
+                    try {
+                        const pkg = require.resolve(path.join(name, 'package.json'), { paths: [wsRoot] })
+                        workspaces.push(path.dirname(path.relative(wsRoot, pkg)))
+                    } catch(e) {
+                        if (e.code === 'MODULE_NOT_FOUND') {
+                            throw new BuildError(`Workspace packaging failed - module '${name}' not found. Make sure that configured npm workspaces are installed.`)
+                        }
+                        throw e
+                    }
+                }
+            }
+        }
+        if (workspaces.length) {
+            let pkgDescriptors
+            try {
+                pkgDescriptors = await this._execNpmPack(dest, wsRoot, workspaces)
+            } catch (e) {
+                this.logger.debug(e)
+                throw new BuildError(`Failed to package npm workspace dependencies\n${e.message}`)
+            }
+            if (pkgDescriptors?.length) {
+                let changed
+                for (const pkgDescriptor of pkgDescriptors) {
+                    const {name, filename: fileName} = pkgDescriptor
+                    const filePath = path.join(dest, fileName)                        
+                    if (appPkg.dependencies?.[name] === '*') {
+                        appPkg.dependencies[name] = `file:${fileName}`
+                        this.pushFile(filePath)
+                        changed |= true
+                    }
+                }
+                if (changed) {
+                    await this.write(JSON.stringify(appPkg, 0, 2)).to(path.join(dest, 'package.json'))
+                } else {
+                    throw new BuildError('No matching workspaces found!')
+                }
+            }
+        }
+    }
+
+    _findWorkspaceRoot(dir) {
+        try {
+            if(require(path.join(dir, 'package.json')).workspaces) {
+              return dir
+            }
+        } catch(err) {
+            // ignore
+        }
+        if(fs.existsSync(path.join(dir, '.gitmodules')) || fs.existsSync(path.join(dir, 'node_modules'))) {
+            return // project root reached
+        }
+        if (path.dirname(dir) !== dir) {
+            return this._findWorkspaceRoot(path.dirname(dir))
+        }
+    }
+    
+    async _execNpmPack(dest, wsRoot, workspaces) {
+        const args = ['pack', '-ws', '--json', `--pack-destination=${dest}`]
+        workspaces.forEach(w => args.push(`-w=${w}`))
+
+        this.logger._debug && this.logger.debug(`execute command: npm ${args}`)
+        const result = await cmd.spawnCommand( 'npm', args, { cwd: wsRoot }, true, !!this.logger._debug)
+        this.logger._debug && this.logger.debug(result)
+        return JSON.parse(result)
+    }
 }
 
 module.exports = NodejsBuildPlugin

package/lib/client/auth_manager.js

@@ -66,7 +66,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
         let response;
         for (const { method, url, data } of reqParams(params)) {
             try {
-                DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${(params.obfuscateQueryParams(url))}`);
+                DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${params.obfuscateQueryParams(url)}`);
                 response = await axios[method](url, data);
             } catch (error) {
                 if (error.status === 404) { // may represent 405 in case of wrong method

package/lib/client/params.js

@@ -216,6 +216,7 @@ class AllParams extends BasicParams {
         this.undeploy               = new Param('undeploy',               false);
         this.wsdl                   = new Param('wsdl',                   false);
         this.sync                   = new Param('sync',                   false);
+        this.async                   = new Param('async',                 false);
 
         // `login` PARAMS
         this.skipToken              = new Param('skipToken',              false, { internal: true });

package/lib/client/pull.js

@@ -49,6 +49,14 @@ module.exports = class Pull extends BaseCommand {
             .catch(error => this.handleHttpError(error, params, { url: pullUrl }));
     }
 
+    static getPackageJsonIndentation(packageContents) {
+        return /^ +/m.exec(packageContents)?.[0].length ?? 2;
+    }
+
+    static formatPackageJson(newObj, oldContents) {
+        return JSON.stringify(newObj, undefined, this.getPackageJsonIndentation(oldContents));
+    }
+
     static amendPackageJson(projectFolder, env) {
         if ('extends' in env) {
             return;
@@ -61,7 +69,7 @@ module.exports = class Pull extends BaseCommand {
         } catch (error) {
             throw getMessage('package.json missing or unreadable', { error });
         }
-        fs.writeFileSync(packageJson, JSON.stringify({
+        fs.writeFileSync(packageJson, this.formatPackageJson({
             ...packageContents,
             cds: {
                 ...(packageContents.cds ?? {}),

package/lib/client/push.js

@@ -35,7 +35,7 @@ module.exports = class Push extends BaseCommand {
 
         console.log(`\nPushing extension '${extensionName}' from`, { src }, 'to', target);
         const push = await this.pushTgz(params, content, extensionName);
-        const async = !params.get('sync');
+        const async = params.get('async');
         if (async) {
             await this.pollUntilFinished(push.headers.location, params)
         }
@@ -72,7 +72,7 @@ module.exports = class Push extends BaseCommand {
     static async pushTgz(params, tgz, extensionName) {
         const pushUrl = `${params.get('appUrl')}/-/cds/extensibility/push`;
         const options = { ...params.get('reqAuth') };
-        const async = !params.get('sync');
+        const async = params.get('async');
         if (async) {
             options.headers = { prefer: 'respond-async', ...options.headers }
         }

package/lib/compile/asyncapi/components/schemas/annotations.js

@@ -1,3 +1,17 @@
+
+const odmAnnotationsMapping = Object.freeze({
+    '@ODM.entityName': 'x-sap-odm-entity-name',
+    '@ODM.oid': 'x-sap-odm-oid'
+});
+
+function addOdmExtensions(definition, object) {
+    for (const [annotation, asyncApiExtension] of Object.entries(odmAnnotationsMapping)) {
+        if (definition[annotation]) {
+            object[asyncApiExtension] = definition[annotation];
+        }
+    }
+}
+
 module.exports = function addAnnotations(definition, object) {
     if (typeof (definition['@title']) === 'string') {
         object.title = definition['@title'];
@@ -9,5 +23,11 @@ module.exports = function addAnnotations(definition, object) {
         object.description = definition.doc.replace(/\n/g, ' ');
     }
 
+    if (definition['@ODM.root']) {
+        object['x-sap-root-entity'] = definition['@ODM.root']
+    }
+
+    addOdmExtensions(definition, object);
+
     return object;
 }

package/lib/compile/openapi/csdl2openapi.js

@@ -479,7 +479,7 @@ module.exports.csdl2openapi = function (
             if (description) tag.description = description;
             tags.push(tag);
         })
-        return tags.sort(function(pre, next){return pre.name.localeCompare(next.name)});
+        return tags.sort(function (pre, next) { return pre.name.localeCompare(next.name) });
     }
 
     /**
@@ -655,7 +655,7 @@ module.exports.csdl2openapi = function (
                             schema: ref(element.$Type, SUFFIX.create),
                         }
                     }
-                },              
+                },
                 responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses, !countRestrictions),
             };
             if (insertRestrictions.LongDescription) pathItem.post.description = insertRestrictions.LongDescription;
@@ -1620,7 +1620,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         r[code] = {
             description: description
         };
-        let CountPropertyObj = {[csdl.$Version > '4.0' ? '@count' : '@odata.count'] : ref('count')} ;
+        let CountPropertyObj = { [csdl.$Version > '4.0' ? '@count' : '@odata.count']: ref('count') };
         if (code != 204) {
             const s = getSchema(type);
             r[code].content = {

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

@@ -48,7 +48,9 @@ class HanaDeployer {
     let { model, serviceName, tunnelAddress, vcapFile, undeployWhitelist, hdiOptions, dry } = options;
 
     if (model) {
-      throw 'Specifying a model for hana deployment is not supported.';
+      throw `Specifying a CDS model for HANA deployment is not supported.
+'cds deploy --to hana' performs 'cds build --for hana' which in turn uses the configured HANA build task.
+Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     }
 
     if (dry) {

package/lib/index.js

@@ -19,13 +19,15 @@ if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
   cds.compile.to.xsuaa = require('./compile/to-xsuaa')
 }
 
-cds.schema = cds.schema || {} // backward compatibility
-cds.extend (cds.schema) .with ( {
+// add overlay4 method to cds.schema to retrieve schema with cds-dk features
+// schema is cds version specific; add cds-dk parts not present in cds, e.g. build
+// failsafe for legacy cds without schema.constructor
+cds.extend(cds.schema?.constructor || {}).with(class {
   get overlay4() { return super.overlay4 = require('./env/schema') }
 })
 
 // set build API, potentially removing the old API facade from sap/cds 7
-delete cds.__proto__?.build
+// delete cds.__proto__?.build //> not required, as its overriden below anyways
 cds.extend (cds.constructor) .with (class {
   get build() { return super.build = require('./build') }
 })

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.3.0',
+    MAVEN_ARCHETYPE_VERSION: '2.4.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -45,8 +45,6 @@ module.exports = {
         NOTIFICATIONS: 'notifications'
     }),
 
-    PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),
-
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,
     // copied from mbt error message
     REGEX_JAVA_VERSION: /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,

package/lib/init/index.js

@@ -6,7 +6,7 @@ const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./
 const {
     NODEJS, JAVA,
     HANA, APPROUTER, XSUAA, KIBANA, ENTERPRISE_MESSAGING,
-    MTA, HELM, MULTITENANCY, PIPELINE,
+    MTA, MULTITENANCY, PIPELINE,
     TINY_SAMPLE, SAMPLE
  } = OPTIONS
 
@@ -23,7 +23,7 @@ module.exports = class CDSGenerator {
             default: '',
             target: 'projectName',
             validate: async (value) => {
-                try {    
+                try {
                     cds.root = path.resolve(this.cwd, value || '.');
 
                     await this._validateProjectName(value);
@@ -74,7 +74,7 @@ module.exports = class CDSGenerator {
             default: '',
             choices: [
                 { name: 'Cloud Foundry: MTA Deployment', value: MTA },
-                { name: 'Kyma: Helm Deployment', value: HELM },
+                // { name: 'Kyma: Helm Deployment', value: HELM },
                 { name: 'Multitenancy', value: MULTITENANCY },
                 { name: 'CI/CD Pipeline Integration', value: PIPELINE },
             ],
@@ -182,7 +182,11 @@ module.exports = class CDSGenerator {
 
         if (cds.cli.command === COMMAND_INIT) {
             const relativeProjectPath = path.relative(this.cwd, cds.root)
-            console.log(`\nSuccessfully created project. Continue with '${term.bold('cd '+relativeProjectPath)}'.\n`)
+            let message = 'Successfully created project.'
+            if (relativeProjectPath) {
+                message = message + ` Continue with '${term.bold('cd ' + relativeProjectPath)}'.`
+            }
+            console.log('\n' + message)
         } else {
             console.log(`\nSuccessfully added features to your project.`)
         }
@@ -219,6 +223,7 @@ module.exports = class CDSGenerator {
             // Compat
             if (facet === 'sample-tiny') facet = 'tiny-sample'
             if (facet === 'kibana-logging') facet = 'kibana'
+            if (facet === 'postgresql') facet = 'postgres'
 
             if (!templates.has(facet)) {
                 const template = await this._createTemplate(facet)

package/lib/init/template/approuter/files/package.json

@@ -4,7 +4,7 @@
     "@sap/approuter": "^14.0.0"
   },
   "engines": {
-    "node": "^18.0.0"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

package/lib/init/template/hana/files/db/package.json

@@ -4,7 +4,7 @@
     "@sap/hdi-deploy": "^4"
   },
   "engines": {
-    "node": "^16 || ^18"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js",

package/lib/init/template/multitenancy/index.js

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { exists, read, write } = cds.utils
+const { read, write } = cds.utils
 const { APPROUTER, HANA, KIBANA } = require('../../constants').OPTIONS
 const mvn = require('../../util/mvn')
 const { readProject } = require('../../util/projectReader')
@@ -17,11 +17,9 @@ const {
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
   static hasFacet(env) {
-    // REVISIT: Check if this can be simplified
     const { options } = cds.cli.options
-    return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
-           !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
-           exists(join('mtx', 'sidecar')) || false
+    // REVISIT: Check if this can be simplified
+    return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
   getRelatedFacets() {

package/lib/init/template/postgres/index.js

@@ -3,13 +3,13 @@ const cds = require('../../../cds')
 const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
+const mvn = require('../../util/mvn')
 const { srvNode4, srvJava4, postgres, postgresDeployer } = require('../_merging/registry-mta')
 
 module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava } = await readProject(this.options)
-    if (isJava)             throw `'cds add postgres' is not available for Java yet`
+    const { hasMta, hasHelm } = await readProject(this.options)
     if (hasHelm && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
     return true
   }
@@ -20,9 +20,10 @@ module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async run() {
     const project = await readProject(this.options)
-    const { configFile } = project
+    const { configFile, isJava } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    if (isJava) await mvn.add('postgresql')
     await this.runDependentMerging()
   }
 

package/lib/init/template/templateBase.js

@@ -1,6 +1,4 @@
 const cds = require('../../cds')
-const { exists } = require('../../cds').utils
-const { PROJECT_TYPE } = require('../constants')
 
 module.exports = class TemplateBase {
 
@@ -99,15 +97,4 @@ module.exports = class TemplateBase {
      */
     async finalize() {
     }
-
-    /**
-     * Returns the project type
-     * @see PROJECT_TYPE
-     * @returns PROJECT_TYPE for current project
-     */
-    getProjectType() {
-        if (exists('pom.xml')) return PROJECT_TYPE.java;
-        if (exists('package.json')) return PROJECT_TYPE.nodejs;
-        return PROJECT_TYPE.unknown;
-    }
 }

package/lib/init/util/projectReader.js

@@ -83,7 +83,7 @@ module.exports = new class ProjectReader {
             get appPath()        { return env.folders.app ?? 'app' },
             get appVersion()     { return appVersion },
             get appName()        { return appName },
-            get cleanedAppName() { return appName.replace('_', '-') }, // Required when _ isn't allowed in the namespace
+            get cleanedAppName() { return appName.replaceAll('_', '-') }, // Required when _ isn't allowed in the namespace
             get appId()          { return appId },
             get appDescription() { return appDescription },
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.3.2",
+  "version": "7.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.3.2",
+      "version": "7.4.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -60,7 +60,7 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -81,7 +81,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.52.0",
+      "version": "8.54.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -152,14 +152,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "license": "MIT",
@@ -211,12 +203,12 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.3.1",
+      "version": "7.4.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^4",
         "@sap/cds-fiori": "^1",
-        "@sap/cds-foss": "^4"
+        "@sap/cds-foss": "^5.0.0"
       },
       "bin": {
         "cds-deploy": "lib/dbs/cds-deploy.js",
@@ -227,7 +219,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.3.2",
+      "version": "4.4.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -242,7 +234,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.1.0",
+      "version": "1.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7",
@@ -263,7 +255,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.12.1",
+      "version": "1.13.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -274,29 +266,15 @@
         "cds-mtx-migrate": "bin/cds-mtx-migrate.js"
       }
     },
-    "node_modules/@sap/cds/node_modules/@sap/cds-foss": {
-      "version": "4.0.2",
-      "license": "See LICENSE in LICENSE",
-      "dependencies": {
-        "big.js": "^6.1.1",
-        "generic-pool": "^3.8.2",
-        "uuid": "^9.0.0",
-        "xmlbuilder": "^15.1.1",
-        "yaml": "^2.2.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "2.6.3",
+      "version": "2.6.4",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=5.6.0",
         "semver": "^7.3.4"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "peerDependencies": {
         "eslint": ">=7"
@@ -615,7 +593,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.10.0",
+      "version": "8.11.2",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -736,7 +714,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.5.1",
+      "version": "1.6.2",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.0",
@@ -1131,13 +1109,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.52.0",
+      "version": "8.54.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.54.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1396,7 +1374,7 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.1",
+      "version": "3.2.0",
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
@@ -1404,7 +1382,7 @@
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flatted": {
@@ -1691,7 +1669,7 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.4",
+      "version": "5.3.0",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -2410,7 +2388,7 @@
       "license": "MIT"
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
+      "version": "2.3.1",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -2951,17 +2929,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/uuid": {
-      "version": "9.0.1",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "license": "MIT",
@@ -3045,7 +3012,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.3.3",
+      "version": "2.3.4",
       "license": "ISC",
       "engines": {
         "node": ">= 14"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.3.2",
+  "version": "7.4.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -40,5 +40,14 @@
     "npm-shrinkwrap.json",
     "LICENSE"
   ],
+  "overrides": {
+    "sqlite3": {
+      "@mapbox/node-pre-gyp": {
+        "make-dir": {
+          "semver": "^7"
+        }
+      }
+    }
+  },
   "_hasShrinkwrap": true
 }