@sap/cds 7.3.0 → 7.3.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.3.1 - 2023-10-23
+
+### Fixed
+
+- `cds-ts` no longer fails if configured with an ESM loader. It tries loading files w/ `import()` in this case.
+- `cds deploy` for draft enabled entities
+
 ## Version 7.3.0 - 2023-10-04
 
 ### Added

package/lib/compile/for/lean_drafts.js

@@ -145,7 +145,7 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
     def.elements.IsActiveEntity.virtual = true
     def.elements.HasDraftEntity.virtual = true
     def.elements.HasActiveEntity.virtual = true
-    def.elements.DraftAdministrativeData_DraftUUID.virtual = true
+    if (def.elements.DraftAdministrativeData_DraftUUID) def.elements.DraftAdministrativeData_DraftUUID.virtual = true
     def.elements.DraftAdministrativeData.virtual = true
     // will insert drafts entities, so that others can use `.drafts` even without incoming draft requests
     addDraftEntity(def, csn)

package/lib/index.js

@@ -116,7 +116,7 @@ const cds = module.exports = new class cds extends EventEmitter {
 
   // legacy and to be moved stuff -> hidden for tools in cds.__proto__
   /** @deprecated */ in (cwd) { return !cwd ? this : {__proto__:this, cwd, env: this.env.for('cds',cwd) } }
-  /** @deprecated */ get build() { return () => cds.error('\
+  get build() { return () => cds.error('\
     This application uses @sap/cds version >= 7, which is not compatible with the installed @sap/cds-dk version 6. \
     Either update @sap/cds-dk to version 7 or downgrade @sap/cds to version 6 instead.\
   ')}

package/lib/utils/cds-utils.js

@@ -189,7 +189,14 @@ exports._import = id => require(id)
 if (process.env.JEST_WORKER_ID === undefined) {  // jest's ESM support is experimental: https://jestjs.io/docs/ecmascript-modules
   const { pathToFileURL } = require('url')
   exports._import = id => {
-    if (extname(id) === '.ts') return require(id) // ts-node w/ ESM not working (cap/issues#11980)
-    else return import (pathToFileURL(id).href) // must use a file: URL, esp. on Windows for C:\... paths
+    if (extname(id) === '.ts') {
+      try {
+        return require(id) // ts-node w/ ESM not working ootb (cap/issues#14463), so try CommonJS first
+      } catch (err) {
+        if (err.code !== 'ERR_REQUIRE_ESM')  throw err
+        // else: this means ts-node is configured w/ an ESM loader, so fall through and try w/ ESM
+      }
+    }
+    return import (pathToFileURL(id).href) // must use a file: URL, esp. on Windows for C:\... paths
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [