@sap/cds-dk 6.7.1 → 6.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.7.1",
+  "version": "6.8.0",
   "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.7.0",
+    "@sap/cds": "~6.8.0",
+    "@sap/cds-compiler": "~3.9.0",
     "@sap/cds-foss": "^4",
-    "@sap/cds-mtxs": "^1.7.0",
+    "@sap/cds-mtxs": "~1.8.0",
     "@sap/eslint-plugin-cds": "^2.6.0",
     "axios": ">=0.21",
     "eslint": "^8",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "livereload-js": "^4.0.1",
     "md5": "^2.3.0",
     "mustache": "^4.0.1",

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

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "approuter": {
-      "kind": "cloudfoundry"
-    }
-  }
-}

package/lib/init/template/approuter/files/cds.cdsrc.json.hbs

@@ -1,9 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "approuter": {
-        "kind": "cloudfoundry"
-      }
-    }
-  }
-}

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

@@ -1,9 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "approuter": {
-        "kind": "cloudfoundry"
-      }
-    }
-  }
-}

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

@@ -1,11 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "approuter": {
-          "kind": "cloudfoundry"
-        }
-      }
-    }
-  }
-}

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

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-      "@sap/audit-logging": "^5"
-  }
-}

package/lib/init/template/enterprise-messaging/files/cds.package.json

@@ -1,9 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "messaging": {
-        "kind": "enterprise-messaging"
-      }
-    }
-  }
-}

package/lib/init/template/enterprise-messaging/files/cds.profile.package.json.hbs

@@ -1,11 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "messaging": {
-          "kind": "enterprise-messaging"
-        }
-      }
-    }
-  }
-}

package/lib/init/template/enterprise-messaging/files/cdsrc.json

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "messaging": {
-      "kind": "enterprise-messaging"
-    }
-  }
-}

package/lib/init/template/enterprise-messaging/files/cdsrc.json.hbs

@@ -1,9 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "messaging": {
-        "kind": "enterprise-messaging"
-      }
-    }
-  }
-}

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

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

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

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

package/lib/init/template/extensibility/files/cdsrc.json

@@ -1,5 +0,0 @@
-{
-  "requires": {
-    "extensibility": true
-  }
-}

package/lib/init/template/extensibility/files/cdsrc.json.hbs

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "extensibility": true
-    }
-  }
-}

package/lib/init/template/hana/files/java/cds.json.hbs

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "db": {
-      "kind": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-    }
-  }
-}

package/lib/init/template/hana/files/java/cds.profile.json.hbs

@@ -1,12 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "db": {
-        "kind": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-      }
-    },
-    "db": {
-      "kind": "{{#cap.isMultitenant}}sqlite{{/cap.isMultitenant}}{{^cap.isMultitenant}}sql{{/cap.isMultitenant}}"
-    }
-  }
-}

package/lib/init/template/hana/files/java/cds.shortcut.json.hbs

@@ -1,5 +0,0 @@
-{
-  "requires": {
-    "db": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-  }
-}

package/lib/init/template/hana/files/java/cds.shortcut.profile.json.hbs

@@ -1,8 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "db": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-    },
-    "db": "{{#cap.isMultitenant}}sqlite{{/cap.isMultitenant}}{{^cap.isMultitenant}}sql{{/cap.isMultitenant}}"
-  }
-}

package/lib/init/template/hana/files/nodejs/cds.json.hbs

@@ -1,9 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "{{#cap.isMultitenant}}sql-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-      }
-    }
-  }
-}

package/lib/init/template/hana/files/nodejs/cds.profile.json.hbs

@@ -1,14 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "db": {
-          "kind": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-        }
-      },
-      "db": {
-        "kind": "{{#cap.isMultitenant}}sqlite{{/cap.isMultitenant}}{{^cap.isMultitenant}}sql{{/cap.isMultitenant}}"
-      }
-    }
-  }
-}

package/lib/init/template/hana/files/nodejs/cds.shortcut.json.hbs

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "db": "{{#cap.isMultitenant}}sql-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-    }
-  }
-}

package/lib/init/template/hana/files/nodejs/cds.shortcut.profile.json.hbs

@@ -1,10 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "db": "{{#cap.isMultitenant}}hana-mt{{/cap.isMultitenant}}{{^cap.isMultitenant}}hana-cloud{{/cap.isMultitenant}}"
-      },
-      "db": "{{#cap.isMultitenant}}sqlite{{/cap.isMultitenant}}{{^cap.isMultitenant}}sql{{/cap.isMultitenant}}"
-    }
-  }
-}

package/lib/init/template/hana/files/nodejs/dependencies.package.json

@@ -1,5 +0,0 @@
-{
-    "dependencies": {
-        "hdb": "^0.19.0"
-    }
-}

package/lib/init/template/helm/chart/templates/_sapcp_helpers.tpl

@@ -1,103 +0,0 @@
-
-{{/*
-SAPCP Service Bindings: volume mounts
-*/}}
-{{- define "cap.sapcp.bindingsVolumeMounts" }}
-    {{- $ := . -}}
-    {{- range $key, $binding := .bindings }}
-- name: {{ $key | replace "_" "-" }}-secret
-  mountPath: /bindings/{{ $key }}
-  readOnly: true
-    {{- end }}
-{{- end }}
-
-{{/*
-SAPCP Service Bindings: volumes
-*/}}
-{{- define "cap.sapcp.bindingsVolumes" -}}
-    {{- $ := . -}}
-    {{ range $bindingName, $binding := .bindings -}}
-        {{- $secret := include "cap.sapcp.bindingSecretName" (dict "root" $.root "name" $.name "bindingName" $bindingName "binding" $binding) }}
-- name: {{ $bindingName | replace "_" "-" }}-secret
-  secret:
-    secretName: {{ $secret | quote }}
-    {{- end -}}
-{{- end -}}
-
-
-{{/*
-Binding Secret Name
-*/}}
-{{- define "cap.sapcp.bindingName" -}}
-{{ print $.root.Release.Name "-" $.name "-" $.bindingName | replace "_" "-" }}
-{{- end -}}
-
-{{/*
-SAPCP Service Bindings: bindings
-*/}}
-{{- define "cap.sapcp.bindings" -}}
-{{- $ := . -}}
-{{- range $name, $params := .bindings }}
-{{- if not $params.fromSecret }}
----
-apiVersion: services.cloud.sap.com/v1
-kind: ServiceBinding
-metadata:
-  namespace: {{ $.Release.Namespace }}
-  name: {{ include "cap.sapcp.bindingName" (dict "root" $.root "name" $.name "bindingName" $name) }}
-  labels: {{- include "cap.labels" $ | nindent 4 }}
-spec:
-  serviceInstanceName: {{include "cap.sapcp.serviceInstanceName" (dict "binding" $params "release" $.Release.Name) }}
-  {{- if $params.externalName }}
-  externalName: {{ $params.externalName }}
-  {{- end }}
-  {{- if $params.secretName }}
-  secretName: {{ $params.secretName }}
-  {{- end }}
-  {{- if $params.parameters }}
-  parameters: {{ $params.parameters | toYaml | nindent 4 }}
-  {{- end }}
-  {{- if $params.parametersFrom }}
-  parametersFrom: {{ $params.parametersFrom | toYaml | nindent 4 }}
-  {{- end }}
-  {{- if $params.credentialsRotationPolicy }}
-  credentialsRotationPolicy: {{ $params.credentialsRotationPolicy | toYaml | nindent 4 }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Binding Secret Name
-*/}}
-{{- define "cap.sapcp.bindingSecretName" -}}
-{{- $secretName := include "cap.sapcp.bindingName" . }}
-{{- if .binding.fromSecret }}
-{{- $secretName = .binding.fromSecret}}
-{{- else if .binding.secretName }}
-{{- $secretName = .binding.secretName }}
-{{- end }}
-{{- $secretName }}
-{{- end }}
-
-{{/*
-    Service Instance
-    from web-application helm chart
-*/}}
-{{- define "cap.sapcp.serviceInstanceName" -}}
-  {{- if .binding.serviceInstanceFullname }}
-    {{- if gt (len .binding.serviceInstanceFullname) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" .binding.serviceInstanceFullname) }}
-    {{- end }}
-    {{- .binding.serviceInstanceFullname }}
-  {{- else }}
-    {{- $name := .binding.serviceInstanceName }}
-    {{- if not (hasPrefix .release $name)}}
-      {{- $name = printf "%s-%s" .release $name }}
-    {{- end }}
-    {{- if gt (len $name) 63 }}
-      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
-    {{- end }}
-    {{- $name }}
-  {{- end }}
-{{- end }}

package/lib/init/template/kibana-logging/files/cds.profile.package.json.hbs

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

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

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

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

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

package/lib/init/template/toggles/files/cdsrc.json

@@ -1,5 +0,0 @@
-{
-  "requires": {
-    "toggles": true
-  }
-}

package/lib/init/template/toggles/files/cdsrc.json.hbs

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "toggles": true
-    }
-  }
-}

package/lib/init/template/xsuaa/files/cds.cdsrc.json

@@ -1,7 +0,0 @@
-{
-  "requires": {
-    "auth": {
-      "kind": "xsuaa"
-    }
-  }
-}

package/lib/init/template/xsuaa/files/cds.cdsrc.json.hbs

@@ -1,9 +0,0 @@
-{
-  "requires": {
-    "[{{cap.for}}]": {
-      "auth": {
-        "kind": "xsuaa"
-      }
-    }
-  }
-}

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

@@ -1,9 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "auth": {
-        "kind": "xsuaa"
-      }
-    }
-  }
-}

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

@@ -1,11 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "[{{cap.for}}]": {
-        "auth": {
-          "kind": "xsuaa"
-        }
-      }
-    }
-  }
-}

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

@@ -1,6 +0,0 @@
-{
-  "dependencies": {
-    "@sap/xssec": "^3",
-    "passport": "^0"
-  }
-}

package/lib/init/util/versionCompare.js

@@ -1,73 +0,0 @@
-/**
- * VersionComparer
- * Simple semver comparer w/o the complex stuff. It only compares major, minor, patch, and build
- * segments.
- *
- * Usage:
- * const versionCompare = require('./versionCompare');
- * versionCompare(v1, v2) > 0    ->   v1 > v2
- * versionCompare(v1, v2) < 0    ->   v1 < v2
- * versionCompare(v1, v2) === 0  ->   v1 = v2
- * 1.2.3-SNAPSHOT > 1.2.3
- * 1.2.3-SNAPSHOT = 1.2.3-SNAPSHOT
- * 1.2.3-SNAPSHOT > 1.2.3-0
- * 1.2.3-SNAPSHOT > 1.2.3-12
- * -> SNAPSHOT corresponds to maxInt
- */
-
-"use strict";
-
-
-const _REGEX = /^(\d*)\.(\d+)\.(\d+)(?:-(\d+|SNAPSHOT))?$/i;
-const SNAPSHOT = 'SNAPSHOT';
-
-module.exports = function versionCompare(a, b) { //NOSONAR
-
-    const parsedA = _REGEX.exec(a);
-    const parsedB = _REGEX.exec(b);
-
-    let errMessage = "";
-    if (parsedA.length < 4 || parsedA.length > 5) {
-        errMessage = `Invalid parameter a: ${a}. `;
-    }
-
-    if (parsedB.length < 4 || parsedB.length > 5) {
-        errMessage = errMessage + `Invalid parameter b: ${b}.`;
-    }
-
-    if (errMessage) {
-        throw new Error(errMessage);
-    }
-
-    const majorA = parseInt(parsedA[1]);
-    const majorB = parseInt(parsedB[1]);
-    if (majorA !== majorB) {
-        return (majorA > majorB ? 1 : -1);
-    }
-
-    const minorA = parseInt(parsedA[2]);
-    const minorB = parseInt(parsedB[2]);
-    if (minorA !== minorB) {
-        return (minorA > minorB ? 1 : -1);
-    }
-
-    const patchA = parseInt(parsedA[3]);
-    const patchB = parseInt(parsedB[3]);
-    if (patchA !== patchB) {
-        return (patchA > patchB ? 1 : -1);
-    }
-
-    if (parsedA[4] === SNAPSHOT) {
-        parsedA[4] = `${Number.MAX_SAFE_INTEGER}`;
-    }
-    if (parsedB[4] === SNAPSHOT) {
-        parsedB[4] = `${Number.MAX_SAFE_INTEGER}`;
-    }
-    const buildA = (parsedA[4] ? parseInt(parsedA[4]) : 0);
-    const buildB = (parsedB[4] ? parseInt(parsedB[4]) : 0);
-    if (buildA !== buildB) {
-        return (buildA > buildB ? 1 : -1);
-    }
-
-    return 0;
-}