@sap/cds-dk 6.7.2 → 6.8.0

package/lib/init/util/xml.js

@@ -0,0 +1,56 @@
+const cds = require('../../cds')
+const { read } = cds.utils
+const LOG = console
+
+/*
+  Remove the _text attributes and convert value it into array
+  input : "groupId":[{"_text":["customer"]}]
+  output: "groupId":["customer"]
+*/
+function _removeTextAttributes(value, parentElement) {
+  const parentKeys = Object.keys(parentElement._parent)
+  const key = parentKeys[parentKeys.length - 1]
+  const _text = parentElement._parent[key]
+  if (_text.length > 0) {
+      _text[_text.length - 1] = value
+  } else {
+      parentElement._parent[key] = value
+  }
+}
+
+/**
+ * Parse a given string containing xml
+ * used to remove the _text object from converted json i.e. from xml-js.
+ * example: converted json has "groupId":[{"_text":["customer"]}]
+ * and after removing textAttributes (using this function): "groupId":["customer"]
+ * @param xml string to parse
+ * @returns parsed json object
+*/
+
+async function parseXml(pomXmlPath) {
+  const xmljs = require('xml-js')
+  const xmljsParse = {}
+  try {
+      const xml = await read(pomXmlPath, 'utf-8')
+      xmljsParse.project = JSON.parse(xmljs.xml2json(xml, {
+          ignoreComment: true,
+          compact: true,
+          alwaysArray: true,
+          ignoreDeclaration: true,
+          attributesKey: "$",
+          trim: true,
+          nativeType: true,
+          ignoreInstruction: true,
+          ignoreCdata: true,
+          ignoreDoctype: true,
+          textFn: _removeTextAttributes
+      })).project[0]
+      return xmljsParse
+  } catch (e) {
+    // REVISIT: We shouldn't continue with errors
+    LOG.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
+    LOG.error(e)
+  }
+}
+
+module.exports = { parseXml }

package/lib/lint/checks.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const term = require("../util/term");
-const commandUtil = require("../init/util/commandUtil");
+const commandUtil = require("../util/command");
 
 const IS_WIN = os.platform() === "win32";
 const { URLS } = require("../init/constants");

package/lib/lint/io.js

@@ -2,7 +2,7 @@ const path = require("path");
 const yaml = require("@sap/cds-foss")("yaml");
 const term = require("../util/term");
 const { read, write, exists } = require('../cds').utils;
-const { readJSONC } = require("../init/util/fsUtil");
+const { readJSONC } = require("../util/fs");
 const JSONC = require('../util/jsonc');
 
 module.exports = {

package/lib/{init/util/commandUtil.js → util/command.js}

@@ -1,10 +1,12 @@
+// REVISIT: Consolidate with lib/util/exec.js
+
 const cp = require('child_process');
 const os = require('os');
-const cds = require('../../cds');
+const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 
 
-const { IS_WIN } = require('../constants');
+const { IS_WIN } = require('../init/constants');
 
 class CommandUtil {
 

package/lib/{init/util/fsUtil.js → util/fs.js}

@@ -1,6 +1,6 @@
 const { yaml: YAML } = require('@sap/cds-foss')
-const JSONC = require('../../util/jsonc');
-const { read, write } = require('../../cds').utils;
+const JSONC = require('./jsonc');
+const { read, write } = require('../cds').utils;
 
 // REVISIT: Consider merging with template util
 

package/npm-shrinkwrap.json

@@ -1,21 +1,22 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.7.2",
+  "version": "6.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "6.7.2",
+      "version": "6.8.0",
       "license": "SEE LICENSE IN LICENSE",
       "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",
@@ -46,7 +47,7 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.0",
+      "version": "4.5.1",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -182,7 +183,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "6.7.2",
+      "version": "6.8.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^3.2.0",
@@ -197,7 +198,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "3.8.2",
+      "version": "3.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -212,12 +213,12 @@
       }
     },
     "node_modules/@sap/cds-foss": {
-      "version": "4.0.0",
+      "version": "4.0.1",
       "license": "See LICENSE in LICENSE",
       "dependencies": {
         "big.js": "^6.1.1",
         "generic-pool": "^3.8.2",
-        "uuid": "^8.3.2",
+        "uuid": "^9.0.0",
         "xmlbuilder": "^15.1.1",
         "yaml": "^2.1.1"
       },
@@ -226,7 +227,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.7.3",
+      "version": "1.8.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -686,7 +687,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.3.6",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.0",
@@ -2760,13 +2761,13 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.13",
+      "version": "6.1.14",
       "license": "ISC",
       "optional": true,
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^4.0.0",
+        "minipass": "^5.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
@@ -2776,7 +2777,7 @@
       }
     },
     "node_modules/tar/node_modules/minipass": {
-      "version": "4.2.8",
+      "version": "5.0.0",
       "license": "ISC",
       "optional": true,
       "engines": {
@@ -2889,7 +2890,7 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.3.2",
+      "version": "9.0.0",
       "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.7.2",
+  "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"
-        }
-      }
-    }
-  }
-}