@sap/cds-dk 6.0.2 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.0.2",
+  "version": "6.1.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -16,13 +16,14 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@sap/cds": "^6.0.2",
+    "@sap/cds": "^6.1.0",
     "@sap/cds-foss": "^4",
-    "@sap/eslint-plugin-cds": "^2.3.3",
+    "@sap/eslint-plugin-cds": "^2.5.0",
     "axios": ">=0.21",
     "connect-livereload": "^0.6.1",
     "eslint": "^8",
     "express": "^4.17.1",
+    "glob": "^8.0.3",
     "htmlparser2": "^8.0.0",
     "livereload-js": "^3.3.1",
     "md5": "^2.3.0",
@@ -33,7 +34,7 @@
     "xml-js": "^1.6.11"
   },
   "optionalDependencies": {
-    "sqlite3": "^5.0.4"
+    "sqlite3": "5.0.11"
   },
   "files": [
     "bin/",

package/lib/init/template/_merging/existences.js

@@ -1,297 +0,0 @@
-// This file describes so-called "modules" and "resources" commonly
-// found in mta.yaml files.
-// The following matchers contain the *required* constraints to
-// identify a YAML node as a semantic equivalent of the matcher.
-
-const srvNode = {
-    ref: "srv",
-    keyPath: ["modules"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "nodejs"
-    }],
-}
-
-const srvJava = {
-    ref: "srv",
-    keyPath: ["modules"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "java"
-    }],
-}
-
-const approuter = {
-    ref: "approuter",
-    keyPath: ["modules"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "approuter.nodejs"
-    }]
-}
-
-const xsuaa = {
-    ref: "uaa-resource",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "org.cloudfoundry.managed-service",
-    }, {
-        comparisonKeyPath: ["parameters", "service"],
-        value: "xsuaa",
-    }, {
-        comparisonKeyPath: ["parameters", "service-plan"],
-        value: "application"
-    }]
-}
-
-const auditlog = {
-    ref: "auditlog-resource",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "org.cloudfoundry.managed-service",
-    }, {
-        comparisonKeyPath: ["parameters", "service"],
-        value: "auditlog-api",
-    }]
-}
-
-const kibanaLogging = {
-    ref: "cf-logging",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "org.cloudfoundry.managed-service",
-    }, {
-        comparisonKeyPath: ["parameters", "service"],
-        value: "application-logs",
-    }, {
-        comparisonKeyPath: ["parameters", "service-plan"],
-        value: "lite",
-    }]
-}
-
-const hdbDeployer = {
-    ref: "deployer",
-    keyPath: ["modules"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "hdb"
-    }]
-}
-
-const hdiContainer = {
-    ref: "hdi-container-resource",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "com.sap.xs.hdi-container",
-    }]
-}
-
-const serviceManager = {
-    ref: "service-manager-resource",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "org.cloudfoundry.managed-service",
-    }, {
-        comparisonKeyPath: ["parameters", "service"],
-        value: "service-manager",
-    }, {
-        comparisonKeyPath: ["parameters", "service-plan"],
-        value: "container"
-    }]
-}
-
-const saasRegistry = {
-    ref: "registry-resource",
-    keyPath: ["resources"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: "org.cloudfoundry.managed-service",
-    }, {
-        comparisonKeyPath: ["parameters", "service"],
-        value: "saas-registry",
-    }, {
-        comparisonKeyPath: ["parameters", "service-plan"],
-        value: "application"
-    }]
-}
-
-const srvAPI = {
-    ref: "srvAPI",
-    keyPath: ["provides"],
-    constraints: [{
-        comparisonKeyPath: ["name"],
-        value: "srv-api"
-    }, {
-        comparisonKeyPath: ["properties", "srv-url"],
-        value: "${default-url}"
-    }]
-}
-
-const mtxSidecar = {
-    ref: "sidecar",
-    keyPath: ["modules"],
-    constraints: [{
-        comparisonKeyPath: ["type"],
-        value: `nodejs`
-    }]
-}
-
-const providedMtxAPI = {
-    ref: "provided-mtx-api",
-    keyPath: ["provides"],
-    constraints: [{
-        comparisonKeyPath: ["name"],
-        value: "mtx-api"
-    }, {
-        comparisonKeyPath: ["properties", "mtx-url"],
-        value: "${default-url}"
-    }]
-}
-
-const requiredMtxAPI = {
-    ref: "required-mtx-api",
-    in: approuter,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["properties", "name"],
-        value: "mtx-api"
-    }, {
-        comparisonKeyPath: ["properties", "url"],
-        value: "~{mtx-url}"
-    }]
-}
-
-const providedAppAPI = {
-    ref: "provided-app-api",
-    in: approuter,
-    keyPath: ["provides"],
-    constraints: [{
-        comparisonKeyPath: ["name"],
-        value: "app-api"
-    }, {
-        comparisonKeyPath: ["properties", "app-protocol"],
-        value: "${protocol}"
-    }, {
-        comparisonKeyPath: ["properties", "app-uri"],
-        value: "${default-uri}"
-    }],
-}
-
-const requiredAppAPI = {
-    ref: "required-app-api",
-    in: srvNode,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["name"],
-        value: "app-api"
-    }, {
-        comparisonKeyPath: ["properties", "SUBSCRIPTION_URL"],
-        value: "~{app-protocol}://\\${tenant_subdomain}-~{app-uri}"
-    }]
-}
-
-const providedMtxSidecarAPI = {
-    ref: "provided-mtx-sidecar-api",
-    in: mtxSidecar,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["properties", "url"],
-        value: "${default-url}"
-    }]
-}
-
-const requiredMtxSidecarAPI = {
-    ref: "required-mtx-sidecar-api",
-    in: srvJava,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["properties", "CDS_MULTITENANCY_SIDECAR_URL"],
-        value: "~{url}"
-    }]
-}
-
-const requiredJavaApprouterAPI = {
-    ref: "required-java-approuter-api",
-    in: srvJava,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["properties", "CDS_MULTITENANCY_APPUI_URL"],
-        value: "~{url}"
-    }]
-}
-
-const providedJavaApprouterAPI = {
-    ref: "provided-java-approuter-api",
-    in: approuter,
-    keyPath: ["requires"],
-    constraints: [{
-        comparisonKeyPath: ["properties", "url"],
-        value: "${default-url}"
-    }]
-}
-
-const approuterExtensibility = {
-    ref: "approuter-extensibility",
-    keyPath: ["routes"],
-    constraints: [{
-        comparisonKeyPath: ["source"],
-        value: "^/extend/(.*)"
-    }, {
-        comparisonKeyPath: ["destination"],
-        value: "mtx-api",
-    }, {
-        comparisonKeyPath: ["target"],
-        value: "$1",
-    }, {
-        comparisonKeyPath: ["authenticationType"],
-        value: "none",
-    }]
-}
-
-const approuterExtensibilityJava = {
-    ref: "approuter-extensibility-java",
-    keyPath: ["routes"],
-    constraints: [{
-        comparisonKeyPath: ["source"],
-        value: "^/extend/(.*)"
-    }, {
-        comparisonKeyPath: ["destination"],
-        value: "mtx-api",
-    }, {
-        comparisonKeyPath: ["target"],
-        value: "$1",
-    }, {
-        comparisonKeyPath: ["authenticationType"],
-        value: "none",
-    }]
-}
-
-module.exports = {
-    srvNode,
-    srvJava,
-    approuter,
-    xsuaa,
-    auditlog,
-    hdbDeployer,
-    hdiContainer,
-    serviceManager,
-    saasRegistry,
-    srvAPI,
-    mtxSidecar,
-    providedMtxAPI,
-    requiredMtxAPI,
-    providedMtxSidecarAPI,
-    requiredMtxSidecarAPI,
-    providedAppAPI,
-    requiredAppAPI,
-    requiredJavaApprouterAPI,
-    providedJavaApprouterAPI,
-    kibanaLogging,
-    approuterExtensibility,
-    approuterExtensibilityJava
-}

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

@@ -1,12 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "multitenancy": true
-    },
-    "mtx": {
-      "element-prefix": "Z_",
-      "namespace-blocklist": [],
-      "extension-allowlist": []
-    }
-  }
-}

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

@@ -1,14 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "multitenancy": true
-      }
-    },
-    "mtx": {
-      "element-prefix": "Z_",
-      "namespace-blocklist": [],
-      "extension-allowlist": []
-    }
-  }
-}

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

@@ -1,17 +0,0 @@
-{
-  "build": {
-    "tasks": [
-      {
-        "for": "java-cf"
-      },
-      {
-        "for": "mtx",
-        "src": ".",
-        "dest": "mtx-sidecar"
-      },
-      {
-        "for": "hana"
-      }
-    ]
-  }
-}

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

@@ -1,43 +0,0 @@
-{
-  "name": "cap-mtx-sidecar",
-  "dependencies": {
-    "@sap/cds": "^6.0.0",
-    "@sap/cds-mtx": "^2.5.6",
-    "@sap/hdi-deploy": "^4.3.3",
-    "@sap/instance-manager": "^3.3.3",
-    "@sap/xssec": "^3.2.13",
-    "@sap/hana-client": "^2.12.25",
-    "express": "^4.18.1",
-    "passport": "^0.6.0"
-  },
-  "scripts": {
-    "start": "node server.js"
-  },
-  "engines": {
-    "node": "^16.15.0"
-  },
-  "cds": {
-    "features": {
-      "kibana_formatter": true
-    },
-    "build": {
-      "tasks": [
-        {
-          "for": "hana"
-        },
-        {
-          "for": "java-cf"
-        }
-      ]
-    },
-    "requires": {
-      "auth": {
-        "kind": "xsuaa"
-      },
-      "db": {
-        "kind": "hana-mt"
-      },
-      "multitenancy": true
-    }
-  }
-}

package/lib/init/template/mtx/files/java/server.js

@@ -1,30 +0,0 @@
-const app = require('express')();
-const cds = require('@sap/cds');
-
-const main = async () => {
-	app.use(defaults.correlate);
-
-	await cds.connect.to('db');
-	const PORT = process.env.PORT || 4004;
-	await cds.mtx.in(app);
-
-	app.listen(PORT);
-}
-
-const defaults = {
-	get correlate() {
-		return (req, _, next) => {
-			if (!cds.context) cds.context = {}
-			const id = cds.context.id
-				|| req.headers['x-correlation-id'] || req.headers['x-correlationid']
-				|| req.headers['x-request-id'] || req.headers['x-vcap-request-id']
-				|| cds.utils.uuid()
-			cds.context.id = req.headers['x-correlation-id'] = id
-			if (!cds.context._) cds.context._ = {}
-			if (!cds.context._.req) cds.context._.req = req
-			next();
-		}
-	}
-}
-
-main();

package/lib/init/template/mtx/files/xs-security.json.hbs

@@ -1,48 +0,0 @@
-{
-  "scopes": [
-    {
-      "name": "$XSAPPNAME.mtcallback",
-      "description": "Subscribe to applications",
-      "grant-as-authority-to-apps": [
-        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
-      ]
-    },
-    {
-      "name": "$XSAPPNAME.mtdeployment",
-      "description": "Deploy applications"
-    },
-    {
-      "name": "$XSAPPNAME.MtxDiagnose",
-      "description": "Diagnose MTX"
-    },
-    {
-      "name": "$XSAPPNAME.ExtendCDS",
-      "description": "Extend CDS applications"
-    },
-    {
-      "name": "$XSAPPNAME.ExtendCDSdelete",
-      "description": "Extend CDS applications with undeployments"
-    }
-  ],
-  "authorities": [
-    "$XSAPPNAME.MtxDiagnose",
-    "$XSAPPNAME.mtdeployment",
-    "$XSAPPNAME.mtcallback"
-  ],
-  "role-templates": [
-    {
-      "name": "ExtensionDeveloper",
-      "description": "Extend application",
-      "scope-references": [
-        "$XSAPPNAME.ExtendCDS"
-      ]
-    },
-    {
-      "name": "ExtensionDeveloperUndeploy",
-      "description": "Undeploy extension",
-      "scope-references": [
-        "$XSAPPNAME.ExtendCDSdelete"
-      ]
-    }
-  ]
-}

package/lib/lint/.eslintrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-    "extends": ["plugin:@sap/cds/recommended"]
-}