@sap/cds-dk 10.0.5 → 10.0.7

package/node_modules/@sap/cds-mtxs/srv/jobs-service.js

@@ -7,14 +7,6 @@ const Jobs = 'cds.xt.Jobs', Tasks = 'cds.xt.Tasks'
 
 const { t0_ } = require('../lib/utils')
 
-const {
-  queueSize = 100, clusterSize = 3, workerSize = 4, poolSize = 1
-} = {
-  ...(cds.env.requires.multitenancy?.jobs ?? {}),
-  ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
-  ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
-}
-
 const RUNNING = 'RUNNING', FINISHED = 'FINISHED', FAILED = 'FAILED', QUEUED = 'QUEUED', TIMEOUT = 'TIMEOUT'
 
 // A queue, implemented as a circular buffer for O(1) insert + delete
@@ -41,12 +33,15 @@ class Queue {
     return value
   }
 }
-const jobQueue = new Queue(queueSize)
-let runningJobs = new Map()
 
 module.exports = class JobsService extends cds.ApplicationService {
 
   async init() {
+
+    this._conf = this._config()
+    this.jobQueue = new Queue(this._conf.queueSize)
+    this.runningJobs = new Map()
+
     if (cds.requires.multitenancy?.diagnostics) _diagnostics4(this)
     cds.on('listening', () => _scheduled(this))
 
@@ -57,16 +52,16 @@ module.exports = class JobsService extends cds.ApplicationService {
       return jobs.map(job => ({ ...job, tasks: job.tasks.sort((a, b) => a.tenant.localeCompare(b.tenant))}))
     })
     this.on('config', () => {
-      const conf = main.requires.extensibility, es = main.requires['cds.xt.ExtensibilityService']
+      const conf = main.requires['cds.xt.ExtensibilityService'], ext = main.requires.extensibility
       const allowlist = 'extension-allowlist', blocklist = 'namespace-blocklist'
       return {
         pool: main.requires.db.pool,
         poolMtx: cds.requires.db.pool,
         jobs: cds.requires.multitenancy.jobs,
         extensibility: {
-          tenantCheckInterval: conf?.tenantCheckInterval,
-          [allowlist]: conf?.[allowlist] ?? es?.[allowlist],
-          [blocklist]: conf?.[blocklist] ?? es?.[blocklist]
+          tenantCheckInterval: conf?.tenantCheckInterval ?? ext?.tenantCheckInterval,
+          [allowlist]: conf?.[allowlist] ?? ext?.[allowlist],
+          [blocklist]: conf?.[blocklist] ?? ext?.[blocklist]
         }
       }
     })
@@ -74,6 +69,17 @@ module.exports = class JobsService extends cds.ApplicationService {
     return super.init()
   }
 
+  _config() {
+    const {
+      queueSize = 100, clusterSize = 3, workerSize = 4, poolSize = 1
+    } = {
+      ...(cds.env.requires.multitenancy?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
+    }
+    return { queueSize, clusterSize, workerSize, poolSize }
+  }
+
   async enqueue(service, op, clusters, args, onJobDone) {
     const _inspect = obj => obj && Object.values(obj).filter(Boolean).length > 0 ? inspect(obj, { depth: 5, colors: cds.utils.colors.enabled }) : []
     const inspected = Object.entries(args).reduce((acc, [k, v]) => {
@@ -112,9 +118,9 @@ module.exports = class JobsService extends cds.ApplicationService {
     if (tasks.length) {
       if (cds.services[service]) {
         const fn = task => cds.services[service].tx({ tenant: task.tenant }, tx => tx[op](task.tenant, ...Object.values(args)))
-        jobQueue.enqueue({ job_ID, clusters: clustered, fn, onJobDone })
+        this.jobQueue.enqueue({ job_ID, clusters: clustered, fn, onJobDone })
       } else {
-        jobQueue.enqueue({ job_ID, clusters: clustered, fn: () => {
+        this.jobQueue.enqueue({ job_ID, clusters: clustered, fn: () => {
           LOG.warn('service', service, 'is not available, skipping job')
         }, onJobDone })
       }
@@ -186,16 +192,16 @@ module.exports = class JobsService extends cds.ApplicationService {
   }
 
   async pickJob() {
-    if (jobQueue.size === 0) return
+    if (this.jobQueue.size === 0) return
 
-    const next = new Set(jobQueue.peek().clusters.flat().map(t => t.tenant).flat())
-    const running = [...runningJobs.values()].flatMap(j => j.clusters.flat().map(t => t.tenant))
+    const next = new Set(this.jobQueue.peek().clusters.flat().map(t => t.tenant).flat())
+    const running = [...this.runningJobs.values()].flatMap(j => j.clusters.flat().map(t => t.tenant))
     if (running.some(t => next.has(t))) return
 
-    const job = jobQueue.dequeue()
+    const job = this.jobQueue.dequeue()
     const { job_ID, clusters, fn, onJobDone } = job
     try {
-      runningJobs.set(job_ID, job)
+      this.runningJobs.set(job_ID, job)
       await t0_(async () => {
         await UPDATE(Jobs, { ID: job_ID }).with({ status: RUNNING })
         await this.emit('jobUpdate', { job: { ID: job_ID, status: RUNNING }})
@@ -207,16 +213,16 @@ module.exports = class JobsService extends cds.ApplicationService {
         await this.emit('jobUpdate', { job: { ID: job_ID, status: FAILED, error: _errorMessage(e) }})
       })
     } finally {
-      runningJobs.delete(job_ID)
+      this.runningJobs.delete(job_ID)
     }
     setImmediate(() => this.pickJob())
   }
 
   async _nextJob(clusters, fn, onJobDone) {
     if (clusters.length > 1) {
-      await this.limiter(clusterSize, clusters, cluster => this.limiter(workerSize ?? poolSize, Array.from(cluster), fn, true))
+      await this.limiter(this._conf.clusterSize, clusters, cluster => this.limiter(this._conf.workerSize ?? this._conf.poolSize, Array.from(cluster), fn, true))
     } else {
-      await this.limiter(workerSize ?? poolSize, Array.from(clusters[0]), fn, true)
+      await this.limiter(this._conf.workerSize ?? this._conf.poolSize, Array.from(clusters[0]), fn, true)
     }
 
     const { job_ID } = clusters[0][0] // all tasks have the same job ID -> just take the first

package/node_modules/@sap/cds-mtxs/srv/model-provider.js

@@ -334,7 +334,7 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
     async function _getETag(tenant, activated = true) {
       if (!main.requires.extensibility || main.requires.multitenancy && !tenant) return BASE_MODEL_ETAG
       try {
-        const query = SELECT('max(timestamp) as TS').from('cds_xt_Extensions')
+        const query = SELECT('max(timestamp) as TS').from('cds.xt.Extensions')
         if (activated) query.where('activated=', 'database')
         const exts = await cds.db.run(query)
         if (!exts.length || !exts[0].TS) return BASE_MODEL_ETAG
@@ -377,7 +377,7 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
     }
 
     async function getExtCsvs(req) {
-      if (cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-csv']) return {}
+      if (cds.env.requires['cds.xt.ExtensibilityService']?.activate?.['skip-csv'] ?? main.env.requires.extensibility?.activate?.['skip-csv']) return {}
 
       const tenant = req.data.tenant || req.tenant
       if (tenant) cds.context = { tenant }

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/ctnr-mgr-base.js

@@ -68,7 +68,7 @@ class AbstractContainerManagerClient {
     conf.baseURL ??= url.startsWith('http') ? '' : this.sm_url + '/v1/'
 
     const { retries, maxRetryAfter } = cds.requires?.multitenancy?.serviceManager ?? cds.requires?.multitenancy?.containerManager ?? {}
-    return fetchResiliently(conf.baseURL + url, conf, { retries: retries ?? 10, maxRetryAfter: maxRetryAfter ?? 5000, retryUntil, failures })
+    return fetchResiliently(conf.baseURL + url, conf, { retriesLeft: retries ?? 10, maxRetryAfter: maxRetryAfter ?? 5000, retryUntil, failures })
   }
 
   _poll = async (location, conf = {}) => {
@@ -89,9 +89,12 @@ class AbstractContainerManagerClient {
     return new Promise(_next)
   }
 
+  // base implementation used by srv-mgr
   _succeeded = (response) => response.data?.state === 'succeeded'
   _failed = (response) => response.data?.state === 'failed'
-  _pollError = (response) => response.data.errors[0] ?? response.data.errors
+  _pollError = (response) =>
+    response.data?.errors?.[0] ?? response.data.errors
+    ?? { error: 'Unknown Error', description: `Polling failed with state ${response.data?.state ?? 'unknown'}. Last operation ${response.data?.id}` }
 
   static _errorMessage = (e, action, tenant) => {
     const msg = `Error ${action} tenant ${tenant}: ${e.response?.data?.error ?? e.code ?? e.message ?? 'unknown error'}`

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/hdi.js

@@ -13,7 +13,7 @@ exports._logDirectory = async () => {
     await mkdirp(defaultDir)
     return defaultDir
   } catch (e) {
-    if (e.code !== 'EACCES') throw e
+    if (e.code !== 'EACCES' && e.code !== 'EROFS' && e.code !== 'ENOENT') throw e
     LOG?.(`using temporary directory ${TEMP_DIR} for deployment logs`)
     return join(TEMP_DIR, 'logs')
   }
@@ -86,9 +86,10 @@ exports.deploy = async (hana, tenant, cwd, options, deployEnv) => {
  */
 exports._hdi_env4 = async (t,container,options,deployEnv)=>{
 
+  let vcapFromFile
   if (process.env.VCAP_SERVICES_FILE_PATH) {
     try {
-      process.env.VCAP_SERVICES = await fs.read(process.env.VCAP_SERVICES_FILE_PATH, 'utf-8')
+      vcapFromFile = await fs.read(process.env.VCAP_SERVICES_FILE_PATH, 'utf-8')
     } catch (e) {
       LOG.warn(`Could not read or parse VCAP_SERVICES_FILE_PATH at ${process.env.VCAP_SERVICES_FILE_PATH}: ${e.message}`)
     }
@@ -104,7 +105,8 @@ exports._hdi_env4 = async (t,container,options,deployEnv)=>{
     ...deployEnv // Although VCAP is in here, it will be overwritten
   }
 
-  const { hana=[], 'user-provided':up=[] } = _parse_env (process.env, 'VCAP_SERVICES')
+  const vcapEnv = vcapFromFile ? { VCAP_SERVICES: vcapFromFile } : process.env
+  const { hana=[], 'user-provided':up=[] } = _parse_env (vcapEnv, 'VCAP_SERVICES')
   const { hana: customEnvHana=[], 'user-provided':customEnvUp=[] } = _parse_env(deployEnv ?? {}, 'VCAP_SERVICES')
 
   const vcapFromEnv = {

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/srv-mgr.js

@@ -126,6 +126,7 @@ class ServiceManagerClient extends AbstractContainerManagerClient {
 
   get = async (tenant, options = {}) => {
     const { invalidCredentials, retryUntil } = options
+    if (invalidCredentials && cacheBindings) delete this._bindingsCache[tenant]
     try {
       const previousFailures = this.failures.has(tenant) ? this.failures.get(tenant).count : 0
       const [binding] = await this._bindings4([tenant], { ...options, tenant, failures: previousFailures, retryUntil })
@@ -292,9 +293,9 @@ class ServiceManagerClient extends AbstractContainerManagerClient {
       }
       fetched.push(...directMatches)
     }
-    const cacheMisses = Object.fromEntries(fetched.filter(b => b.labels?.tenant_id).map(b => [b.labels.tenant_id[0], b]))
-    Object.assign(this._bindingsCache, cacheMisses)
     if (useCache) {
+      const cacheMisses = Object.fromEntries(fetched.filter(b => b.labels?.tenant_id).map(b => [b.labels.tenant_id[0], b]))
+      Object.assign(this._bindingsCache, cacheMisses)
       return tenants.map(t => this._bindingsCache[t])
     }
     return fetched

package/node_modules/@sap/cds-mtxs/srv/plugins/hana/tms.js

@@ -17,6 +17,23 @@ class TMSClient extends AbstractContainerManagerClient {
     this.tmsHost = credentials.baseurl
 
     this.credentialCache = {}
+
+    // clusterSize > 1 not supported yet for TMS
+    const {
+      clusterSize
+    } = {
+      ...(cds.env.requires.multitenancy?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SaasProvisioningService']?.jobs ?? {}),
+      ...(cds.env.requires['cds.xt.SmsProvisioningService']?.jobs ?? {})
+    }
+
+    if (clusterSize && clusterSize > 1) {
+      LOG.warn(`Cluster size of ${clusterSize} is not supported for TMS. Defaulting to 1.`)
+    }
+
+    cds.utils.merge(cds.env.requires, { multitenancy: { jobs: { clusterSize: 1 } } })
+    cds.utils.merge(cds.env.requires, { 'cds.xt.SaasProvisioningService': { jobs: { clusterSize: 1 } } })
+    cds.utils.merge(cds.env.requires, { 'cds.xt.SmsProvisioningService': { jobs: { clusterSize: 1 } } })
   }
 
   static defaultInstance() {

package/node_modules/@sap/cds-mtxs/srv/plugins/hana.js

@@ -15,8 +15,6 @@ const resources = new Map()
 
 const { deepMerge } = require('../../lib/utils')
 
-const migration = require('../../lib/migration/migration')
-
 if (db?.kind === 'hana') {
   if (!db.credentials?.sm_url && !db.credentials?.baseurl) cds.error('No Service Manager credentials found. Make sure the application is bound to a BTP Service Manager instance.')
 
@@ -89,20 +87,24 @@ if (db?.kind === 'hana') {
       })
       ds.on ('tenantsByDb', async req => {
         const tenantsInT0 = await ds.getTenants()
-        const mtxTenants = await migration.getMissingMtxTenants(tenantsInT0)
-        const tenants = req.data.tenants ?? [...tenantsInT0, ...mtxTenants]
+        const tenants = req.data.tenants ?? [...tenantsInT0]
         const hana = require('./hana/hdi-ctnr-mgr').defaultInstance() // TODO tms more generic handling -> new functions hana.toTenantId + hana.toDbId
         const toTenantId = t => t.tenant_id ?? t.labels.tenant_id[0]
         const smTenants = (await hana.getAll(tenants.length > 0 ? tenants : '*')).filter(Boolean).filter(t => toTenantId(t) !== t0)
+        const byDb = {}
         if (tenants.length !== smTenants.length) {
           const smSet = new Set(smTenants.map(toTenantId))
           const inconsistent = tenants.filter(t => !smSet.has(t))
           if (!inconsistent.length)
             LOG.warn('Tenants', smTenants.map(toTenantId).join(', '), 'are subscribed in Service Manager but not in t0. Make sure to re-subscribe the tenants.')
-          else if (inconsistent.length === 1)
+          else if (inconsistent.length === 1) {
             LOG.warn('Warning: Tenant', inconsistent[0], 'does not exist in Service Manager any more and is therefore ignored. Make sure to unsubscribe the tenant.')
-          else
+            byDb['no-db'] = inconsistent
+          }
+          else {
             LOG.warn('Warning: Tenants', inconsistent.join(', '), 'do not exist in Service Manager any more and are therefore ignored. Make sure to unsubscribe the tenants.')
+            byDb['no-db'] = inconsistent
+          }
         }
         const tenantToDbUrl = smTenants.reduce((res, t) => {
           const id = toTenantId(t)
@@ -110,7 +112,7 @@ if (db?.kind === 'hana') {
           return { ...res, [id]: `${t.credentials.host}:${t.credentials.port}` }
         }
         , {})
-        const byDb = {}
+
         for (const tenant of Object.keys(tenantToDbUrl)) {
           const dbUrl = tenantToDbUrl[tenant]
           if (!byDb[dbUrl]) byDb[dbUrl] = new Set
@@ -129,11 +131,6 @@ if (db?.kind === 'hana') {
         }
         return byDb
       })
-
-      // check migration before upgrade
-      ds.before('upgrade', async (req) => {
-        await migration.checkMigration(req)
-      })
     })
   })
 
@@ -178,7 +175,11 @@ async function resources4(out) {
       throw error
     }
   }
-  if (cache) resources.set(out, _resources4(out).catch(e => { resources.delete(out); throw e }))
+  if (cache) {
+    const p = _resources4(out).catch(e => { resources.delete(out); throw e })
+    resources.set(out, p)
+    return p
+  }
   return _resources4(out)
 }
 module.exports.resources4 = resources4 // required in abstract provisioning service to prepare shared deployment directory

package/node_modules/media-typer/README.md

@@ -1,18 +1,18 @@
 # media-typer
 
-[![NPM Version][npm-version-image]][npm-url]
-[![NPM Downloads][npm-downloads-image]][npm-url]
+[![NPM Version][npm-image]][npm-url]
+[![NPM Downloads][downloads-image]][downloads-url]
 [![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
+[![Build Status][ci-image]][ci-url]
 [![Test Coverage][coveralls-image]][coveralls-url]
 
 Simple RFC 6838 media type parser.
 
-This module will parse a given media type into it's component parts, like type,
+This module will parse a given media type into its component parts, like type,
 subtype, and suffix. A formatter is also provided to put them back together and
 the two can be combined to normalize media types into a canonical form.
 
-If you are looking to parse the string that represents a media type and it's
+If you are looking to parse the string that represents a media type and its
 parameters in HTTP (for example, the `Content-Type` header), use the
 [content-type module](https://www.npmjs.com/package/content-type).
 
@@ -75,19 +75,20 @@ If any of the given object values are invalid, then a `TypeError` is thrown.
 var valid = typer.test('image/svg+xml')
 ```
 
-Validate a media type string. This will return `true` is the string is a well-
+Validate a media type string. This will return `true` if the string is a well-
 formatted media type, or `false` otherwise.
 
 ## License
 
 [MIT](LICENSE)
 
-[coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/media-typer/master
-[coveralls-url]: https://coveralls.io/r/jshttp/media-typer?branch=master
-[node-version-image]: https://badgen.net/npm/node/media-typer
-[node-version-url]: https://nodejs.org/en/download
-[npm-downloads-image]: https://badgen.net/npm/dm/media-typer
+[ci-image]: https://img.shields.io/github/workflow/status/jshttp/media-typer/ci/master?label=ci
+[ci-url]: https://github.com/jshttp/media-typer/actions/workflows/ci.yml
+[npm-image]: https://img.shields.io/npm/v/media-typer.svg
 [npm-url]: https://npmjs.org/package/media-typer
-[npm-version-image]: https://badgen.net/npm/v/media-typer
-[travis-image]: https://badgen.net/travis/jshttp/media-typer/master
-[travis-url]: https://travis-ci.org/jshttp/media-typer
+[node-version-image]: https://img.shields.io/node/v/media-typer.svg
+[node-version-url]: https://nodejs.org/en/
+[coveralls-image]: https://img.shields.io/coveralls/jshttp/media-typer/master.svg
+[coveralls-url]: https://coveralls.io/r/jshttp/media-typer?branch=master
+[downloads-image]: https://img.shields.io/npm/dm/media-typer.svg
+[downloads-url]: https://npmjs.org/package/media-typer

package/node_modules/media-typer/index.js

@@ -83,10 +83,6 @@ function format (obj) {
  */
 
 function test (string) {
-  if (!string) {
-    throw new TypeError('argument string is required')
-  }
-
   if (typeof string !== 'string') {
     throw new TypeError('argument string is required to be a string')
   }
@@ -103,10 +99,6 @@ function test (string) {
  */
 
 function parse (string) {
-  if (!string) {
-    throw new TypeError('argument string is required')
-  }
-
   if (typeof string !== 'string') {
     throw new TypeError('argument string is required to be a string')
   }

package/node_modules/media-typer/package.json

@@ -1,20 +1,24 @@
 {
   "name": "media-typer",
   "description": "Simple RFC 6838 media type parser and formatter",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
   "license": "MIT",
   "repository": "jshttp/media-typer",
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/express"
+  },
   "devDependencies": {
-    "eslint": "5.16.0",
-    "eslint-config-standard": "12.0.0",
-    "eslint-plugin-import": "2.17.2",
-    "eslint-plugin-markdown": "1.0.0",
-    "eslint-plugin-node": "8.0.1",
-    "eslint-plugin-promise": "4.1.1",
-    "eslint-plugin-standard": "4.0.0",
-    "mocha": "6.1.4",
-    "nyc": "14.0.0"
+    "eslint": "7.23.0",
+    "eslint-config-standard": "14.1.1",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-markdown": "1.0.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.3.1",
+    "eslint-plugin-standard": "4.1.0",
+    "mocha": "9.2.0",
+    "nyc": "15.1.0"
   },
   "files": [
     "LICENSE",
@@ -27,7 +31,7 @@
   "scripts": {
     "lint": "eslint --plugin markdown --ext js,md .",
     "test": "mocha --reporter spec --check-leaks --bail test/",
-    "test-cov": "nyc --reporter=html --reporter=text npm test",
-    "test-travis": "nyc --reporter=text npm test"
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
   }
 }

package/node_modules/sax/lib/sax.js

@@ -381,8 +381,8 @@
 
   // this really needs to be replaced with character classes.
   // XML allows all manner of ridiculous numbers and digits.
-  var CDATA = '[CDATA['
-  var DOCTYPE = 'DOCTYPE'
+  var CDATAre = /^\[CDATA\[$/i
+  var DOCTYPEre = /^DOCTYPE$/i
   var XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
   var XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/'
   var rootNS = { xml: XML_NAMESPACE, xmlns: XMLNS_NAMESPACE }
@@ -464,15 +464,15 @@
     SCRIPT_ENDING: S++, // <script> ... <
   }
 
-  sax.XML_ENTITIES = {
+  sax.XML_ENTITIES = Object.assign(Object.create(null), {
     amp: '&',
     gt: '>',
     lt: '<',
     quot: '"',
     apos: "'",
-  }
+  })
 
-  sax.ENTITIES = {
+  sax.ENTITIES = Object.assign(Object.create(null), {
     amp: '&',
     gt: '>',
     lt: '<',
@@ -726,7 +726,7 @@
     clubs: 9827,
     hearts: 9829,
     diams: 9830,
-  }
+  })
 
   Object.keys(sax.ENTITIES).forEach(function (key) {
     var e = sax.ENTITIES[key]
@@ -1137,7 +1137,8 @@
       isNaN(num) ||
       numStr.toLowerCase() !== entity ||
       num < 0 ||
-      num > 0x10ffff
+      num > 0x10ffff ||
+      !isXmlChar(num)
     ) {
       strictFail(parser, 'Invalid character entity')
       return '&' + parser.entity + ';'
@@ -1146,6 +1147,23 @@
     return String.fromCodePoint(num)
   }
 
+  // Returns true if `num` is a code point that matches the XML `Char`
+  // production, false otherwise. Character references that resolve to a
+  // character outside this range (e.g. surrogates or restricted control
+  // characters) are not well-formed.
+  // https://www.w3.org/TR/REC-xml/#NT-Char
+  // https://www.w3.org/TR/REC-xml/#wf-Legalchar
+  function isXmlChar(num) {
+    return (
+      num === 0x9 ||
+      num === 0xa ||
+      num === 0xd ||
+      (num >= 0x20 && num <= 0xd7ff) ||
+      (num >= 0xe000 && num <= 0xfffd) ||
+      (num >= 0x10000 && num <= 0x10ffff)
+    )
+  }
+
   function beginWhiteSpace(parser, c) {
     if (c === '<') {
       parser.state = S.OPEN_WAKA
@@ -1317,12 +1335,12 @@
             parser.state = S.DOCTYPE_DTD
             parser.doctype += '<!' + parser.sgmlDecl + c
             parser.sgmlDecl = ''
-          } else if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
+          } else if (CDATAre.test(parser.sgmlDecl + c)) {
             emitNode(parser, 'onopencdata')
             parser.state = S.CDATA
             parser.sgmlDecl = ''
             parser.cdata = ''
-          } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
+          } else if (DOCTYPEre.test(parser.sgmlDecl + c)) {
             parser.state = S.DOCTYPE
             if (parser.doctype || parser.sawRoot) {
               strictFail(

package/node_modules/sax/package.json

@@ -2,7 +2,7 @@
   "name": "sax",
   "description": "An evented streaming XML parser in JavaScript",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "lib/sax.js",
   "license": "BlueOak-1.0.0",
   "scripts": {

package/node_modules/ws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws",
-  "version": "8.21.1",
+  "version": "8.21.2",
   "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
   "keywords": [
     "HyBi",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "10.0.5",
+  "version": "10.0.7",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -20,10 +20,10 @@
     "@cap-js/asyncapi": "^1.0.0",
     "@cap-js/openapi": "^1.0.0",
     "@cap-js/sqlite": "^3",
-    "@sap/cds": ">=9",
-    "@sap/cds-mtxs": ">=3",
+    "@sap/cds": "^10",
+    "@sap/cds-mtxs": "^4",
     "@sap/hdi-deploy": "^5",
-    "express": "^4.22.1 || ^5",
+    "express": "^5",
     "hdb": "^2.0.0",
     "livereload-js": "^4.0.1",
     "mustache": "^4.0.1",

package/lib/init/template/nodejs/files/.gitignore.hbs

@@ -1,34 +0,0 @@
-# CAP {{ projectName }}
-_out
-*.db
-*.sqlite
-connection.properties
-default-*.json
-.cdsrc-private.json
-gen/
-node_modules/
-target/
-
-# Web IDE, App Studio
-.che/
-.gen/
-
-# MTA
-*_mta_build_tmp
-*.mtar
-mta_archives/
-
-# Other
-.DS_Store
-*.orig
-*.log
-
-*.iml
-*.flattened-pom.xml
-
-# IDEs
-# .vscode
-# .idea
-
-# @cap-js/cds-typer
-@cds-models