@cap-js/cds-typer 0.32.0 → 0.32.1

package/CHANGELOG.md

@@ -11,6 +11,17 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 ### Security
 
+## [0.32.1] - 2025-01-20
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- default value for `inline_declarations` in help command
+- entity scope and namespace are now added in the correct order to inflected type names
+### Security
+
 ## [0.32.0] - 2025-01-14
 
 ### Added
@@ -19,7 +30,9 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - prefixed builtin types like `Promise` and `Record` with `globalThis.`, to allow using names of builtin types for entities without collisions
+- default export class representing the service itself is now exported without name
 - bumped peer-dependency to `@cap-js/cds-types` to `>=0.9`
+
 ### Deprecated
 ### Removed
 ### Fixed

package/lib/cli.js

@@ -182,7 +182,7 @@ const flags = enrichFlagSchema({
     inlineDeclarations: {
         desc: `Whether to resolve inline type declarations${EOL}flat: (x_a, x_b, ...)${EOL}or structured: (x: {a, b}).`,
         allowed: ['flat', 'structured'],
-        default: 'structured'
+        default: 'flat'
     },
     propertiesOptional: parameterTypes.boolean({
         desc: `If set to true, properties in entities are${EOL}always generated as optional (a?: T).`,

package/lib/file.js

@@ -420,10 +420,6 @@ class SourceFile extends File {
      */
     getImports() {
         const buffer = new Buffer()
-        if (this.services.names.length) {
-            // currently only needed to extend cds.Service and would trigger unused-variable-errors in strict configs
-            buffer.add('import cds from \'@sap/cds\'') // TODO should go to visitor#printService, but can't express this as Path
-        }
         const file = configuration.targetModuleType === 'esm'
             ? '/index.js'
             : ''

package/lib/resolution/resolver.js

@@ -288,6 +288,8 @@ class Resolver {
         const typeInfo = this.resolveType(element, file, options)
         const cardinality = getMaxCardinality(element)
 
+        /** @type {string|undefined} */
+        let typeNamespaceIdent = undefined
         let typeName = typeInfo.plainName ?? typeInfo.type
 
         // only applies to builtin types, because the association/ composition _themselves_ are the (builtin) types we are checking, not their generic parameter!
@@ -333,9 +335,10 @@ class Resolver {
                 if (!parent.isCwd(file.path.asDirectory())) {
                     file.addImport(parent)
                     // prepend namespace
-                    typeName = `${parent.asIdentifier()}.${typeName}`
-                    typeInfo.inflection.singular = `${parent.asIdentifier()}.${typeInfo.inflection.singular}`
-                    typeInfo.inflection.plural = `${parent.asIdentifier()}.${typeInfo.inflection.plural}`
+                    typeNamespaceIdent = parent.asIdentifier()
+                    typeName = [typeNamespaceIdent, typeName].join('.')
+                    typeInfo.inflection.singular = [typeNamespaceIdent, typeInfo.inflection.singular].join('.')
+                    typeInfo.inflection.plural = [typeNamespaceIdent, typeInfo.inflection.plural].join('.')
                 }
 
                 if (element.type.ref?.length > 1) {
@@ -362,12 +365,23 @@ class Resolver {
         // handle typeof (unless it has already been handled above)
         const target = element.target?.name ?? element.type?.ref?.join('.') ?? element.type
         if (target && !typeInfo.isDeepRequire) {
-            const { propertyAccess, scope } =  this.visitor.entityRepository.getByFq(target) ?? {}
-            if (scope?.length) {
+            const { propertyAccess, scope } = this.visitor.entityRepository.getByFq(target) ?? {}
+            if (scope?.length && typeInfo.inflection) {
+                let { singular, plural } = typeInfo.inflection
+                // remove already added namespace, so the scope is added after the namespace
+                // i.e. _common.Book.texts instead of Book._common.texts
+                if (typeNamespaceIdent) {
+                    if (singular.startsWith(typeNamespaceIdent)) {
+                        singular = singular.substring(typeNamespaceIdent.length+1)
+                    }
+                    if (plural.startsWith(typeNamespaceIdent)) {
+                        plural = plural.substring(typeNamespaceIdent.length+1)
+                    }
+                }
                 // update inflections with proper prefix, e.g. Books.text, Books.texts
                 typeInfo.inflection = {
-                    singular: [...scope, typeInfo.inflection?.singular].join('.'),
-                    plural: [...scope, typeInfo.inflection?.plural].join('.')
+                    singular: [typeNamespaceIdent, ...scope, singular].filter(Boolean).join('.'),
+                    plural: [typeNamespaceIdent,...scope, plural].filter(Boolean).join('.')
                 }
             } else if (propertyAccess?.length) {
                 const element = target.slice(0, -propertyAccess.join('.').length - 1)

package/lib/visitor.js

@@ -535,13 +535,18 @@ class Visitor {
 
         docify(service.doc).forEach(d => { buffer.add(d) })
         // file.addImport(new Path(['cds'], '')) TODO make sap/cds import work
-        buffer.addIndentedBlock(`export class ${serviceNameSimple} extends cds.Service {`, () => {
+        buffer.addIndentedBlock('export default class {', () => {
             Object.entries(service.operations ?? {}).forEach(([name, {doc}]) => {
                 buffer.add(docify(doc))
-                buffer.add(`declare ${name}: typeof ${name}`)
+                buffer.add(createMember({
+                    name,
+                    type: `typeof ${name}`,
+                    isStatic: true,
+                    isReadonly: true,
+                    isDeclare: true,
+                }))
             })
         }, '}')
-        buffer.add(`export default ${serviceNameSimple}`)
         buffer.blankLine()
         file.addService(service.name)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-typer",
-  "version": "0.32.0",
+  "version": "0.32.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",