@sap/cds-dk 6.6.2 → 6.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.6.2",
+  "version": "6.7.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -16,14 +16,14 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@sap/cds": "^6.6.0",
+    "@sap/cds": "^6.7.0",
     "@sap/cds-foss": "^4",
-    "@sap/cds-mtxs": "^1.6.0",
+    "@sap/cds-mtxs": "^1.7.0",
     "@sap/eslint-plugin-cds": "^2.6.0",
     "axios": ">=0.21",
     "eslint": "^8",
     "express": "^4.17.1",
-    "livereload-js": "^4.0.0",
+    "livereload-js": "^4.0.1",
     "md5": "^2.3.0",
     "mustache": "^4.0.1",
     "node-watch": ">=0.7",

package/readme.md

@@ -4,7 +4,7 @@ The command line client and development toolkit for the [SAP Cloud Application P
 
 See the [documentation](https://cap.cloud.sap/docs/get-started/) for more details.
 
-## How to Obtain Support**
+## How to Obtain Support
 
 In case you find a bug, please report an [incident](https://cap.cloud.sap/docs/resources/#reporting-incidents) on SAP Support Portal.
 

package/lib/client/subscription.js

@@ -1,84 +0,0 @@
-let cds;
-const BaseCommand = require('./base_command');
-const { CliError } = require('./helper/errors');
-const { ParamCollection } = require('./params');
-const AuthManager = require('./auth_manager');
-const { capitalize } = require('./helper/string_helper');
-const { debug } = require('./helper/logging');
-
-module.exports = class ToggleSubscription extends BaseCommand {
-
-    /**
-     * @param on {boolean} whether to switch subscription on
-     */
-    constructor(on) {
-        super();
-        const prefix = on ? '' : 'un';
-        this.command = prefix + 'subscribe';
-        this.gerund = prefix + 'subscribing';
-        this.noun = prefix + 'subscription';
-        this.preposition = on ? 'to' : 'from';
-    }
-
-    async run(paramValues, { tenant, local } = {}) {
-        cds = require('../cds');
-        let params = new ParamCollection(paramValues);
-        params.set('skipToken', true); // Token would have insufficient scopes for this command.
-        if (local) {
-            // Connect to locally-served MTXS
-            await this.runWithServer(params, tenant);
-        } else {
-            // Connect to running MTXS server
-            params = await AuthManager.login(params.toEntries());
-            if (!params.has('username')) {
-                throw new CliError('Username is required if app URL is given.', { command: this.command });
-            }
-            await this.runClientOnly(params, tenant);
-        }
-        console.log(`${capitalize(this.noun)} successful.`);
-    }
-
-    async runClientOnly(params, tenant) {
-        console.log(capitalize(this.gerund), { tenant }, this.preposition, { url: params.get('appUrl') });
-        const url = `${params.get('appUrl')}/-/cds/deployment/${this.command}`;
-        debug(`Sending request to ${url}`);
-        try {
-            await require('axios').post(url, { tenant }, params.get('reqAuth'));
-        } catch (error) {
-            BaseCommand.handleHttpError(error, params, { url });
-        }
-    }
-
-    async runWithServer(params, tenant) {
-        if (!this.hasMtEnv()) {
-            throw new CliError('Local multitenant application environment with @sap/cds-mtxs module not found.', { command: this.command });
-        }
-
-        console.log(capitalize(this.gerund), { tenant });
-        const { 'cds.xt.DeploymentService': deploymentService } = await cds.serve([
-            '@sap/cds-mtxs/srv/deployment-service',
-            '@sap/cds-mtxs/srv/model-provider'
-        ]);
-        cds.emit('served');
-        if (this.command === 'unsubscribe') {
-            // MTXS doesn't connect automatically because unsubscribe requires no schema changes
-            await cds.connect.to('db');
-        }
-
-        await deploymentService[this.command](tenant);
-
-        if (cds.db) {
-            await cds.disconnect(cds.env.requires.multitenancy?.t0 ?? 't0'); // REVISIT: Ideally not necessary
-        }
-    }
-
-    /**
-     * Check for application environment.
-     * Fails for edge cases (ignored for now):
-     * - @sap/cds-mtx application with missing modules (no npm install)
-     * - dev scenario with both @sap/cds-mtx and @sap/cds-mtxs installed
-     */
-    hasMtEnv() {
-        return cds.requires.multitenancy && !cds.mtx;
-    }
-}

package/lib/init/template/approuter/files/chart.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: web-application
-    alias: approuter
-    version: 0.1.0

package/lib/init/template/auditlog/files/auditlog.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: auditlog
-    version: 0.1.0

package/lib/init/template/destinations/files/destination.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: destination
-    version: 0.1.0

package/lib/init/template/enterprise-messaging/files/event-mesh.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: event-mesh
-    version: 0.1.0

package/lib/init/template/hana/files/hana-deployer.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: content-deployment
-    alias: hana-deployer
-    version: 0.1.0

package/lib/init/template/hana/files/hana.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: hana
-    version: 0.1.0

package/lib/init/template/html5-repo/files/html5-apps-deployer.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: content-deployment
-    alias: html5-apps-deployer
-    version: 0.1.0

package/lib/init/template/html5-repo/files/html5-apps-repo-host.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: html5-apps-repo-host
-    version: 0.1.0

package/lib/init/template/multitenancy/files/cds.package.json

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "multitenancy": true
-    }
-  }
-}

package/lib/init/template/multitenancy/files/cds.package.json.hbs

@@ -1,9 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "multitenancy": true
-      }
-    }
-  }
-}

package/lib/init/template/multitenancy/files/dependencies.package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@sap/cds-mtxs": "^1"
-  }
-}

package/lib/init/template/multitenancy/files/java/.cdsrc.json

@@ -1,22 +0,0 @@
-{
-  "build": {
-    "target": ".",
-    "tasks": [
-      {
-        "for": "java"
-      },
-      {
-        "for": "mtx-sidecar"
-      },
-      {
-        "for": "hana",
-        "options": {
-          "deploy-format": "hdbtable"
-        }
-      }
-    ]
-  },
-  "requires": {
-    "multitenancy": true
-  }
-}

package/lib/init/template/multitenancy/files/java/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "cap-mtx-sidecar",
-  "dependencies": {
-    "@sap/cds": "^6",
-    "@sap/cds-mtxs": "^1",
-    "@sap/xssec": "^3",
-    "express": "^4",
-    "hdb": "^0",
-    "passport": "^0.6.0"
-  },
-  "devDependencies": {
-    "sqlite3": "^5"
-  },
-  "scripts": {
-    "start": "cds run",
-    "build": "npm ci && npx -p @sap/cds-dk@^6 cds build ../.. --for mtx-sidecar --production && cd gen && npm ci"
-  },
-  "cds": {
-    "requires": {
-      "[production]": {
-        "db": "hana-mt",
-        "auth": "xsuaa"
-      },
-      "[development]": {
-        "db": "sqlite",
-        "auth": "dummy"
-      },
-      "cds.xt.ModelProviderService": "in-sidecar",
-      "cds.xt.DeploymentService": true,
-      "cds.xt.SaasProvisioningService": true
-    }
-  }
-}

package/lib/init/template/multitenancy/files/saas-registry.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: saas-registry
-    version: 0.1.0

package/lib/init/template/multitenancy/files/service-manager.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: service-manager
-    version: 0.1.0

package/lib/init/template/multitenancy/files/sidecar.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: web-application
-    alias: sidecar
-    version: 0.1.0

package/lib/init/template/xsuaa/files/xsuaa.yaml

@@ -1,4 +0,0 @@
-dependencies:
-  - name: service-instance
-    alias: xsuaa
-    version: 0.1.0