@cap-js/cds-typer 0.11.0 → 0.11.1

package/CHANGELOG.md

@@ -11,6 +11,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 ### Fixed
 
+## Version 0.11.1 - 2023-10-12
+
+### Changed
+
+### Added
+### Fixed
+Fixed how service names are exported as default export
+
 ## Version 0.11.0 - 2023-10-10
 
 ### Changed

package/lib/file.js

@@ -335,6 +335,7 @@ class SourceFile extends File {
      * @param {string} fq the fully qualified name of the service
      */
     addService(fq) {
+        // FIXME: warn the user when they're trying to add an entity/ type/ enum called "name", which will override our name export
         if (this.services.names.length) {
             throw new Error(`trying to add more than one service to file ${this.path.asDirectory()}. Existing service is ${this.services.names[0]}, trying to add ${fq}`)
         }
@@ -369,6 +370,7 @@ class SourceFile extends File {
             AUTO_GEN_NOTE,
             this.getImports().join(),
             this.preamble.join(),
+            this.services.buffer.join(), // must be the very first
             this.types.join(),
             this.enums.buffer.join(), 
             this.inlineEnums.buffer.join(), // needs to be before classes
@@ -376,15 +378,16 @@ class SourceFile extends File {
             this.aspects.join(), // needs to be before classes
             this.classes.join(),
             this.events.buffer.join(),
-            this.actions.buffer.join(),
-            this.services.buffer.join() // should be at the end
+            this.actions.buffer.join()            
         ].filter(Boolean).join('\n')
     }
 
     toJSExports() {
         return [AUTO_GEN_NOTE, "const cds = require('@sap/cds')", `const csn = cds.entities('${this.path.asNamespace()}')`] // boilerplate
             .concat(
-                this.inflections
+                // FIXME: move stringification of service into own module
+                this.services.names.map(name => `module.exports = { name: '${name}' }`))  // there should be only one
+                .concat(this.inflections
                     // sorting the entries based on the number of dots in their singular.
                     // that makes sure we have defined all parent namespaces before adding subclasses to them e.g.:
                     // "module.exports.Books" is defined before "module.exports.Books.text"
@@ -410,8 +413,6 @@ class SourceFile extends File {
             .concat(this.enums.fqs.map(({name, fq, property}) => property 
                 ? stringifyAnonymousEnum(name, fq, property)
                 : stringifyNamedEnum(name, fq)))
-            // FIXME: move stringification of service into own module
-            .concat(this.services.names.map(name => `module.exports.default = { name: '${name}' }`))  // there should be only one
             .join('\n') + '\n'
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-typer",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Generates .ts files for a CDS model to receive code completion in VS Code",
   "main": "index.js",
   "repository": "github:cap-js/cds-typer",