@sap/cds-dk 6.2.1 → 6.2.3

package/CHANGELOG.md

@@ -7,6 +7,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.2.3 - 2022-10-21
+
+### Changed
+
+- Use `@sap/cds` 6.2.3
+- Use `@sap/hdi-deploy` 4.5.0, which brings support for Node 18
+
+### Fixed
+
+- `cds mock` now prefers a local `@sap/cds` installation, like other `cds` commands as well.
+
+## Version 6.2.2 - 2022-10-13
+
+### Added
+
+- `cds deploy --to postgres --dry` to create drop/create DDL for PostgreSQL. Full deployment (w/o `--dry`) is not yet supported, though.
+
+### Fixed
+
+- `cds deploy --to sql` now honors the `cds.sql.dialect` configuration to specify SQL dialects like `postgres`.
+
 ## Version 6.2.1 - 2022-10-10
 
 ### Fixed

package/bin/deploy/to-postgres.js

@@ -0,0 +1,4 @@
+exports.deploy = function deploy_to_sql (model, db, options) {
+    options.dialect = 'postgres'
+    return require('./to-sql') .deploy (model, db, options)
+}

package/bin/deploy/to-sqlite.js

@@ -5,8 +5,13 @@ exports.deploy = function deploy_to_sqlite (_model, _db, options) {
     const fts = cds.env.features.folders
     const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
     const file = _database4 (_db, _dbrl, conf)
+
     const dialect = _dbrl && _dbrl.match(/^(\w+)/) && RegExp.$1
-    if (dialect) options.dialect = dialect === 'sql' ? conf.dialect || 'plain' : dialect
+    if (dialect)  options.dialect = (dialect === 'sql')
+        ? conf.dialect || cds.env.sql.dialect
+        : dialect
+    if (options.dialect === 'postgres' && !options.dry)  console.error('\nDeploying to PostgreSQL is not yet supported\n')
+
     return cds.deploy(model) .to ('sqlite:'+file, options)
     .then (db => db && db.disconnect()) // REVISIT: we should NOT require to disconnect explicitly
 }

package/bin/mock.js

@@ -1,5 +1,5 @@
-// eslint-disable-next-line
-const serve = require ('@sap/cds/bin/serve')
+const cds = require ('../lib/cds')
+const serve = cds._local('@sap/cds/bin/serve')
 module.exports = Object.assign (
     cds_mock, serve, {help: `
 # SYNOPSIS

package/lib/cds.js

@@ -1,10 +1,13 @@
+const _local = id => require(_resolve(id))
+
 /** @type { import('@sap/cds/lib') } */
-const cds = module.exports = require(_local ('@sap/cds'))
+const cds = module.exports = _local ('@sap/cds')
 
 // for internal use in cds-dk only
-cds._log = require(_local ('@sap/cds/bin/utils/log'))
+cds._log = _local ('@sap/cds/bin/utils/log')
+cds._local = _local
 
-function _local (id) {
+function _resolve (id) {
   return require.resolve (id, {paths:[
     process.cwd(), // project-local module is preferred
     __dirname      // otherwise from our own dependencies

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "6.2.1",
+      "version": "6.2.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@sap/cds": "^6.2.0",
+        "@sap/cds": "^6.2.3",
         "@sap/cds-foss": "^4",
         "@sap/eslint-plugin-cds": "^2.6.0",
         "axios": ">=0.21",
@@ -158,7 +158,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "6.2.1",
+      "version": "6.2.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^3.2.0",
@@ -168,7 +168,7 @@
         "cds": "bin/cds.js"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=14.18.0"
       }
     },
     "node_modules/@sap/cds-compiler": {
@@ -200,6 +200,13 @@
         "node": ">=14"
       }
     },
+    "node_modules/@sap/cds-foss/node_modules/uuid": {
+      "version": "8.3.2",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@sap/cds-mtxs": {
       "version": "1.2.0",
       "license": "SEE LICENSE IN LICENSE",
@@ -240,12 +247,12 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.4.1",
+      "version": "4.5.0",
       "license": "See LICENSE file",
       "optional": true,
       "dependencies": {
-        "@sap/hana-client": "2.13.13",
-        "@sap/hdi": "4.3.1",
+        "@sap/hana-client": "2.13.22",
+        "@sap/hdi": "4.4.0",
         "@sap/xsenv": "3.3.2",
         "async": "3.2.3",
         "dotenv": "10.0.0",
@@ -254,11 +261,11 @@
         "micromatch": "4.0.4"
       },
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || ^16.0.0"
+        "node": "^12.0.0 || ^14.0.0 || ^16.0.0 || ^18.0.0"
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/hana-client": {
-      "version": "2.13.13",
+      "version": "2.13.22",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "optional": true,
@@ -283,14 +290,14 @@
       "optional": true
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/hdi": {
-      "version": "4.3.1",
+      "version": "4.4.0",
       "license": "See LICENSE file",
       "optional": true,
       "dependencies": {
         "async": "3.2.3"
       },
       "engines": {
-        "node": ">=12 <=16"
+        "node": ">=12 <=18"
       },
       "peerDependencies": {
         "@sap/hana-client": "^2 >= 2.5",
@@ -535,7 +542,7 @@
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/uglify-js": {
-      "version": "3.16.1",
+      "version": "3.17.1",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -551,7 +558,7 @@
       "optional": true
     },
     "node_modules/@sap/instance-manager": {
-      "version": "3.3.4",
+      "version": "3.3.6",
       "license": "SEE LICENSE IN LICENSE file",
       "optional": true,
       "dependencies": {
@@ -567,14 +574,14 @@
       }
     },
     "node_modules/@sap/instance-manager/node_modules/@sap/xssec": {
-      "version": "3.2.13",
+      "version": "3.2.14",
       "license": "SAP DEVELOPER LICENSE AGREEMENT",
       "optional": true,
       "dependencies": {
         "axios": "^0.26.0",
-        "debug": "4.3.2",
+        "debug": "^4.3.2",
         "jsonwebtoken": "^8.5.1",
-        "lru-cache": "6.0.0",
+        "lru-cache": "^6.0.0",
         "node-rsa": "^1.1.1",
         "valid-url": "1.0.9"
       },
@@ -582,22 +589,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/@sap/instance-manager/node_modules/@sap/xssec/node_modules/debug": {
-      "version": "4.3.2",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@sap/instance-manager/node_modules/@sap/xssec/node_modules/lru-cache": {
       "version": "6.0.0",
       "license": "ISC",
@@ -663,7 +654,7 @@
       }
     },
     "node_modules/@sap/instance-manager/node_modules/follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
       "funding": [
         {
           "type": "individual",
@@ -1031,7 +1022,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.0",
@@ -3416,7 +3407,8 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.3.2",
+      "version": "9.0.0",
+      "extraneous": true,
       "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
@@ -3615,7 +3607,7 @@
       }
     },
     "@sap/cds": {
-      "version": "6.2.1",
+      "version": "6.2.3",
       "requires": {
         "@sap/cds-compiler": "^3.2.0",
         "@sap/cds-foss": "^4"
@@ -3635,6 +3627,11 @@
         "uuid": "^8.3.2",
         "xmlbuilder": "^15.1.1",
         "yaml": "^2.1.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2"
+        }
       }
     },
     "@sap/cds-mtxs": {
@@ -3664,11 +3661,11 @@
       }
     },
     "@sap/hdi-deploy": {
-      "version": "4.4.1",
+      "version": "4.5.0",
       "optional": true,
       "requires": {
-        "@sap/hana-client": "2.13.13",
-        "@sap/hdi": "4.3.1",
+        "@sap/hana-client": "2.13.22",
+        "@sap/hdi": "4.4.0",
         "@sap/xsenv": "3.3.2",
         "async": "3.2.3",
         "dotenv": "10.0.0",
@@ -3678,7 +3675,7 @@
       },
       "dependencies": {
         "@sap/hana-client": {
-          "version": "2.13.13",
+          "version": "2.13.22",
           "optional": true,
           "requires": {
             "debug": "3.1.0"
@@ -3698,7 +3695,7 @@
           }
         },
         "@sap/hdi": {
-          "version": "4.3.1",
+          "version": "4.4.0",
           "optional": true,
           "requires": {
             "async": "3.2.3"
@@ -3845,7 +3842,7 @@
           }
         },
         "uglify-js": {
-          "version": "3.16.1",
+          "version": "3.17.1",
           "optional": true
         },
         "wordwrap": {
@@ -3855,7 +3852,7 @@
       }
     },
     "@sap/instance-manager": {
-      "version": "3.3.4",
+      "version": "3.3.6",
       "optional": true,
       "requires": {
         "@sap/xssec": "^3.2.13",
@@ -3867,24 +3864,17 @@
       },
       "dependencies": {
         "@sap/xssec": {
-          "version": "3.2.13",
+          "version": "3.2.14",
           "optional": true,
           "requires": {
             "axios": "^0.26.0",
-            "debug": "4.3.2",
+            "debug": "^4.3.2",
             "jsonwebtoken": "^8.5.1",
-            "lru-cache": "6.0.0",
+            "lru-cache": "^6.0.0",
             "node-rsa": "^1.1.1",
             "valid-url": "1.0.9"
           },
           "dependencies": {
-            "debug": {
-              "version": "4.3.2",
-              "optional": true,
-              "requires": {
-                "ms": "2.1.2"
-              }
-            },
             "lru-cache": {
               "version": "6.0.0",
               "optional": true,
@@ -3931,7 +3921,7 @@
           }
         },
         "follow-redirects": {
-          "version": "1.15.1",
+          "version": "1.15.2",
           "optional": true
         },
         "jsonwebtoken": {
@@ -4168,7 +4158,7 @@
       "version": "0.4.0"
     },
     "axios": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -5620,7 +5610,8 @@
       "version": "1.0.1"
     },
     "uuid": {
-      "version": "8.3.2"
+      "version": "9.0.0",
+      "extraneous": true
     },
     "vary": {
       "version": "1.1.2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -16,7 +16,7 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@sap/cds": "^6.2.0",
+    "@sap/cds": "^6.2.3",
     "@sap/cds-foss": "^4",
     "@sap/eslint-plugin-cds": "^2.6.0",
     "axios": ">=0.21",