@cap-js/cds-typer 0.31.0 → 0.32.0

package/CHANGELOG.md

@@ -4,11 +4,26 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-### Added 
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## [0.32.0] - 2025-01-14
+
+### Added
+- dedicated classes for inline compositions
+- dedicated text-classes for entities with `localized` elements
+
 ### Changed
+- prefixed builtin types like `Promise` and `Record` with `globalThis.`, to allow using names of builtin types for entities without collisions
+- bumped peer-dependency to `@cap-js/cds-types` to `>=0.9`
 ### Deprecated
 ### Removed
 ### Fixed
+- referencing another entity's property of type `cds.String` in an enum will now properly quote the generated values
 ### Security
 
 ## [0.31.0] - 2024-12-16

package/lib/components/enum.js

@@ -67,7 +67,7 @@ function printEnum(buffer, name, kvs, options = {}, doc=[]) {
  * Converts a CSN type describing an enum into a list of kv-pairs.
  * Values from CSN are unwrapped from their `.val` structure and
  * will fall back to the key if no value is provided.
- * @param {import('../typedefs').resolver.EnumCSN} enumCsn - the CSN type describing the enum
+ * @param {import('../typedefs').resolver.EnumCSN & { resolvedType?: string }} enumCsn - the CSN type describing the enum
  * @param {{unwrapVals: boolean} | {}} options - if `unwrapVals` is passed,
  *  then the CSN structure `{val:x}` is flattened to just `x`.
  *  Retaining `val` is closer to the actual CSN structure and should be used where we want
@@ -81,10 +81,10 @@ function printEnum(buffer, name, kvs, options = {}, doc=[]) {
  * csnToEnumPairs(csn, {unwrapVals: false}) // -> [['X', {val:'a'}], ['Y': {val:'b'}], ['Z':'Z']]
  * ```
  */
-const csnToEnumPairs = ({enum: enm, type}, options = {}) => {
+const csnToEnumPairs = ({enum: enm, type, resolvedType}, options = {}) => {
     const actualOptions = {...{unwrapVals: true}, ...options}
     return Object.entries(enm).map(([k, v]) => {
-        const val = enumVal(k, v.val, type)
+        const val = enumVal(k, v.val, resolvedType ?? type)  // if type is a ref, prefer the resolvedType to catch references to cds.Strings
         return [k, (actualOptions.unwrapVals ? val : { val })]
     })
 }

package/lib/components/typescript.js

@@ -1,3 +1,3 @@
 module.exports = {
-    empty: 'Record<never, never>'
+    empty: 'globalThis.Record<never, never>'
 }

package/lib/csn.js

@@ -1,4 +1,5 @@
 const { LOG } = require('./logging')
+const { annotations } = require('./util')
 
 const DRAFT_ENABLED_ANNO = '@odata.draft.enabled'
 /** @type {string[]} */
@@ -292,6 +293,30 @@ function propagateForeignKeys(csn) {
     }
 }
 
+/**
+ * Clears "correct" singular/plural annotations from inferred model
+ * copies the ones from the xtended model.
+ *
+ * This is done to prevent potential duplicate class names because of annotation propagation.
+ * @param {{inferred: CSN, xtended: CSN}} csn - CSN models
+ */
+function propagateInflectionAnnotations(csn) {
+    const singularAnno = annotations.singular[0]
+    const pluralAnno = annotations.plural[0]
+    for (const [name, def] of Object.entries(csn.inferred.definitions)) {
+        const xtendedDef = csn.xtended.definitions[name]
+        // we keep the annotations from definition specific to the inferred model (e.g. inline compositions)
+        if (!xtendedDef) continue
+
+        // clear annotations from inferred definition
+        if (Object.hasOwn(def, singularAnno)) delete def[singularAnno]
+        if (Object.hasOwn(def, pluralAnno)) delete def[pluralAnno]
+        // transfer annotation from xtended if existing
+        if (Object.hasOwn(xtendedDef, singularAnno)) def[singularAnno] = xtendedDef[singularAnno]
+        if (Object.hasOwn(xtendedDef, pluralAnno)) def[pluralAnno] = xtendedDef[pluralAnno]
+    }
+}
+
 /**
  * @param {EntityCSN} entity - the entity
  */
@@ -311,6 +336,25 @@ const getProjectionAliases = entity => {
     return { aliases, all }
 }
 
+/**
+ * Heuristic way of looking up a reference type.
+ * We currently only support up to two segments,
+ * the first referring to the entity, a possible second
+ * referring to an element of the entity.
+ * @param {CSN} csn - CSN
+ * @param {string[]} ref - reference
+ * @returns {EntityCSN}
+ */
+function lookUpRefType (csn, ref) {
+    if (ref.length > 2) throw new Error(`Unsupported reference type ${ref.join('.')} with ${ref.length} segments. Please report this error.`)
+    /** @type {EntityCSN | undefined} */
+    let result = csn.definitions[ref[0]]  // entity
+    if (ref.length === 1) return result
+    result = result?.elements?.[ref[1]]  // property
+    if (!result) throw new Error(`Failed to look up reference type ${ref.join('.')}`)
+    return result
+}
+
 module.exports = {
     collectDraftEnabledEntities,
     isView,
@@ -326,5 +370,7 @@ module.exports = {
     getProjectionAliases,
     getViewTarget,
     propagateForeignKeys,
-    isCsnAny
+    propagateInflectionAnnotations,
+    isCsnAny,
+    lookUpRefType
 }

package/lib/file.js

@@ -257,6 +257,7 @@ class SourceFile extends File {
         if (!(name in this.namespaces)) {
             const buffer = new Buffer()
             buffer.closed = false
+            buffer.namespace = name
             buffer.add(`export namespace ${name} {`)
             buffer.indent()
             this.namespaces[name] = buffer
@@ -286,6 +287,8 @@ class SourceFile extends File {
      * @param {string} entityFqName - name of the entity the enum is attached to with namespace
      * @param {string} propertyName - property to which the enum is attached.
      * @param {[string, string][]} kvs - list of key-value pairs
+     * @param {Buffer} [buffer] - if buffer is of subnamespace the enum will be added there,
+     *                            otherwise to the inline enums of the file
      * @param {string[]} doc - the enum docs
      *  If given, the enum is considered to be an inline definition of an enum.
      *  If not, it is considered to be regular, named enum.
@@ -310,16 +313,32 @@ class SourceFile extends File {
      * }
      * ```
      */
-    addInlineEnum(entityCleanName, entityFqName, propertyName, kvs, doc=[]) {
+    addInlineEnum(entityCleanName, entityFqName, propertyName, kvs, buffer, doc=[]) {
+        const namespacedEntity = [buffer?.namespace, entityCleanName].filter(Boolean).join('.')
         this.enums.data.push({
-            name: `${entityCleanName}.${propertyName}`,
+            name: `${namespacedEntity}.${propertyName}`,
             property: propertyName,
             kvs,
-            fq: `${entityCleanName}.${propertyName}`
+            fq: `${namespacedEntity}.${propertyName}`
         })
-        const entityProxy = this.entityProxies[entityCleanName] ?? (this.entityProxies[entityCleanName] = [])
+        const entityProxy = this.entityProxies[namespacedEntity] ?? (this.entityProxies[namespacedEntity] = [])
         entityProxy.push(propertyName)
-        printEnum(this.inlineEnums.buffer, propertyToInlineEnumName(entityCleanName, propertyName), kvs, {export: false}, doc)
+
+        // REVISIT: find a better way to do this???
+        const printEnumToBuffer = (/** @type {Buffer} */buffer) => printEnum(buffer, propertyToInlineEnumName(entityCleanName, propertyName), kvs, {export: false}, doc)
+
+        if (buffer?.namespace) {
+            const tempBuffer = new Buffer()
+            // we want to put the enums on class level
+            tempBuffer.indent()
+            printEnumToBuffer(tempBuffer)
+
+            // we want to write the enums at the beginning of the namespace
+            const [first,...rest] = buffer.parts
+            buffer.parts = [first, ...tempBuffer.parts, ...rest]
+        } else {
+            printEnumToBuffer(this.inlineEnums.buffer)
+        }
     }
 
     /**
@@ -490,12 +509,15 @@ class SourceFile extends File {
 
             return {
                 singularRhs: `createEntityProxy(['${namespace}', '${original}'], { target: { is_singular: true }${customPropsStr} })`,
-                pluralRhs: `createEntityProxy(['${namespace}', '${original}'])`,
+                pluralRhs: `createEntityProxy(['${namespace}', '${original}'], { target: { is_singular: false }})`,
             }
         } else {
+            // standard entity: csn.Books
+            // inline entity: csn['Books.texts']
+            const csnAccess = original.includes('.') ? `csn['${original}']` : `csn.${original}`
             return {
-                singularRhs: `{ is_singular: true, __proto__: csn.${original} }`,
-                pluralRhs: `csn.${original}`
+                singularRhs: `{ is_singular: true, __proto__: ${csnAccess} }`,
+                pluralRhs: csnAccess
             }
         }
     }
@@ -589,6 +611,11 @@ class Buffer {
          * @type {boolean}
          */
         this.closed = false
+        /**
+         * Required for inline enums of inline compositions or text entities
+         * @type {string | undefined}
+         */
+        this.namespace = undefined
     }
 
     /**

package/lib/printers/javascript.js

@@ -84,12 +84,14 @@ class ESMPrinter extends JavaScriptPrinter {
 
     /** @type {JavaScriptPrinter['printDeconstructedImport']} */
     printDeconstructedImport (imports, from) {
-        return `import { ${imports.join(', ')} } from '${from}'`
+        return `import { ${imports.join(', ')} } from '${from}/index.js'`
     }
 
     /** @type {JavaScriptPrinter['printExport']} */
     printExport (name, value) {
-        return `export const ${name} = ${value}`
+        return name.includes('.')
+            ? `${name} = ${value}`
+            : `export const ${name} = ${value}`
     }
 
     /** @type {JavaScriptPrinter['printDefaultExport']} */

package/lib/printers/wrappers.js

@@ -103,7 +103,7 @@ const createIntersectionOf = (...types) => types.join(' & ')
  * createPromiseOf('string') // -> 'Promise<string>'
  * ```
  */
-const createPromiseOf = t => `Promise<${t}>`
+const createPromiseOf = t => `globalThis.Promise<${t}>`
 
 /**
  * Wraps type into a deep require (removes all posibilities of undefined recursively).

package/lib/resolution/entity.js

@@ -61,6 +61,22 @@ class EntityInfo {
     /** @type {import('../typedefs').resolver.EntityCSN | undefined} */
     #csn
 
+    /** @type {Set<string> | undefined} */
+    #inheritedElements
+
+    /** @returns set of inherited elements (e.g. ID of aspect cuid) */
+    get inheritedElements() {
+        if (this.#inheritedElements) return this.#inheritedElements
+        this.#inheritedElements = new Set()
+        for (const parentName of this.csn.includes ?? []) {
+            const parent = this.#repository.getByFq(parentName)
+            for (const element of Object.keys(parent?.csn?.elements ?? {})) {
+                this.#inheritedElements.add(element)
+            }
+        }
+        return this.#inheritedElements
+    }
+
     /** @returns the **inferred** csn for this entity. */
     get csn () {
         return this.#csn ??= this.#resolver.csn.definitions[this.fullyQualifiedName]

package/lib/resolution/resolver.js

@@ -24,7 +24,7 @@ const { configuration } = require('../config')
 /** @typedef {{typeName: string, typeInfo: TypeResolveInfo & { inflection: Inflection }}} ResolveAndRequireInfo */
 
 class Resolver {
-    get csn() { return this.visitor.csn.inferred }
+    get csn() { return this.visitor.csn }
 
     /** @param {Visitor} visitor - the visitor */
     constructor(visitor) {
@@ -165,11 +165,13 @@ class Resolver {
          */
         const isPropertyOf = (property, entity) => property && Object.hasOwn(entity?.elements ?? {}, property)
 
-        const defs = this.visitor.csn.inferred.definitions
+        const defs = this.visitor.csn.definitions
+
+        // check if name is already an entity, then we do not have a property access, but a nested entity
+        if (defs[p]?.kind === 'entity') return []
+
         // assume parts to contain [Namespace, Service, Entity1, Entity2, Entity3, property1, property2]
-        /** @type {string} */
-        // @ts-expect-error - nope, we know there is at least one element
-        let qualifier = parts.shift()
+        let qualifier = /** @type {string} */ (parts.shift())
         // find first entity from left (Entity1)
         while ((!defs[qualifier] || !isEntity(defs[qualifier])) && parts.length) {
             qualifier += `.${parts.shift()}`
@@ -240,6 +242,8 @@ class Resolver {
         } else {
             // TODO: make sure the resolution still works. Currently, we only cut off the namespace!
             plural = util.getPluralAnnotation(typeInfo.csn) ?? typeInfo.plainName
+            // remove leading entity name
+            if (plural.includes('.')) plural = last(plural)
             singular = util.getSingularAnnotation(typeInfo.csn) ?? util.singular4(typeInfo.csn, true) // util.singular4(typeInfo.csn, true)  // can not use `plural` to honor possible @singular annotation
 
             // don't slice off namespace if it isn't part of the inflected name.
@@ -311,18 +315,6 @@ class Resolver {
                 } else {
                     let { singular, plural } = targetTypeInfo.typeInfo.inflection
 
-                    // FIXME: super hack!!
-                    // Inflection currently does not retain the scope of the entity.
-                    // But we can't just fix it in inflection(...), as that would break several other things
-                    // So we bandaid-fix it back here, as it is the least intrusive place -- but this should get fixed asap!
-                    if (target.type) {
-                        const untangled = this.visitor.entityRepository.getByFqOrThrow(target.type)
-                        const scope = untangled.scope.join('.')
-                        if (scope && !singular.startsWith(scope)) {
-                            singular = `${scope}.${singular}`
-                        }
-                    }
-
                     typeName = cardinality > 1
                         ? toMany(plural)
                         : toOne(this.visitor.isSelfReference(target) ? 'this' : singular)
@@ -370,8 +362,14 @@ 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 } =  this.visitor.entityRepository.getByFq(target) ?? {}
-            if (propertyAccess?.length) {
+            const { propertyAccess, scope } =  this.visitor.entityRepository.getByFq(target) ?? {}
+            if (scope?.length) {
+                // 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('.')
+                }
+            } else if (propertyAccess?.length) {
                 const element = target.slice(0, -propertyAccess.join('.').length - 1)
                 const access = this.visitor.inlineDeclarationResolver.getTypeLookup(propertyAccess)
                 // singular, as we have to access the property of the entity
@@ -452,6 +450,7 @@ class Resolver {
 
         const cardinality = getMaxCardinality(element)
 
+        /** @type {TypeResolveInfo} */
         const result = {
             isBuiltin: false, // will be rectified in the corresponding handlers, if needed
             isInlineDeclaration: false,
@@ -569,7 +568,7 @@ class Resolver {
      * @returns @see resolveType
      */
     resolveTypeName(t, into) {
-        const result = into ?? {}
+        const result = into ?? /** @type {TypeResolveInfo} */({})
         const path = t.split('.')
         const builtin = this.builtinResolver.resolveBuiltin(path)
         if (builtin === undefined) {

package/lib/typedefs.d.ts

@@ -13,7 +13,7 @@ export module resolver {
         compositions?: { target: string }[]
         doc?: string,
         elements?: { [key: string]: EntityCSN }
-        key?: string // custom!!
+        key?: boolean // custom!!
         keys?: { [key:string]: any }
         kind: string,
         includes?: string[]
@@ -25,6 +25,8 @@ export module resolver {
         target?: string,
         type: string | ref,
         name: string,
+        '@singular'?: string,
+        '@plural'?: string,
         '@odata.draft.enabled'?: boolean // custom!
         _unresolved?: boolean
         isRefNotNull?: boolean // custom!
@@ -46,7 +48,8 @@ export module resolver {
 
 
     export type EnumCSN = EntityCSN & {
-        enum: {[key:name]: string}
+        enum: {[key:name]: string},
+        resolvedType?: string  // custom property! When .type points to a ref, the visitor will resolve the ref into this property
     }
 
     export type CSN = {

package/lib/util.js

@@ -15,10 +15,10 @@ if (process.version.startsWith('v14')) {
 
 const last = /\w+$/
 
-const annotations = {
+const annotations = /** @type {const} */ ({
     singular: ['@singular'],
     plural: ['@plural'],
-}
+})
 
 /**
  * Converts a camelCase string to snake_case.

package/lib/visitor.js

@@ -1,8 +1,6 @@
 'use strict'
 
-const util = require('./util')
-
-const { isView, isUnresolved, propagateForeignKeys, collectDraftEnabledEntities, isDraftEnabled, isType, isProjection, getMaxCardinality, isViewOrProjection, isEnum, isEntity } = require('./csn')
+const { propagateForeignKeys, propagateInflectionAnnotations, collectDraftEnabledEntities, isDraftEnabled, isType, getMaxCardinality, isViewOrProjection, isEnum, isEntity, lookUpRefType } = require('./csn')
 // eslint-disable-next-line no-unused-vars
 const { SourceFile, FileRepository, Buffer, Path } = require('./file')
 const { FlatInlineDeclarationResolver, StructuredInlineDeclarationResolver } = require('./components/inline')
@@ -44,11 +42,12 @@ class Visitor {
      * @param {{xtended: CSN, inferred: CSN}} csn - root CSN
      */
     constructor(csn) {
-        propagateForeignKeys(csn.xtended)
         propagateForeignKeys(csn.inferred)
-        // has to be executed on the inferred model as autoexposed entities are not included in the xtended csn
+        propagateInflectionAnnotations(csn)
         collectDraftEnabledEntities(csn.inferred)
-        this.csn = csn
+
+        // xtendend csn not required after this point -> continue with inferred
+        this.csn = csn.inferred
 
         /** @type {Context[]} **/
         this.contexts = []
@@ -74,41 +73,8 @@ class Visitor {
      * Visits all definitions within the CSN definitions.
      */
     visitDefinitions() {
-        for (const [name, entity] of Object.entries(this.csn.xtended.definitions)) {
-            if (isView(entity)) {
-                this.visitEntity(name, this.csn.inferred.definitions[name])
-            } else if (isProjection(entity) || !isUnresolved(entity)) {
-                this.visitEntity(name, entity)
-            } else {
-                LOG.warn(`Skipping unresolved entity: ${name}`)
-            }
-        }
-        // FIXME: optimise
-        // We are currently working with two flavours of CSN:
-        // xtended, as it is as close as possible to an OOP class hierarchy
-        // inferred, as it contains information missing in xtended
-        // This is less than optimal and has to be revisited at some point!
-        const handledKeys = new Set(Object.keys(this.csn.xtended.definitions))
-        // we are looking for autoexposed entities in services
-        const missing = Object.entries(this.csn.inferred.definitions).filter(([key]) => !key.endsWith('.texts') &&!handledKeys.has(key))
-        for (const [name, entity] of missing) {
-            // instead of using the definition from inferred CSN, we refer to the projected entity from xtended CSN instead.
-            // The latter contains the CSN fixes (propagated foreign keys, etc) and none of the localised fields we don't handle yet.
-            if (entity.projection) {
-                const targetName = entity.projection.from.ref[0]
-                // FIXME: references to types of entity properties may be missing from xtendend flavour (see #103)
-                // this should be revisted once we settle on a single flavour.
-                const target = this.csn.xtended.definitions[targetName] ?? this.csn.inferred.definitions[targetName]
-                if (target.kind !== 'type') {
-                    // skip if the target is a property, like in:
-                    // books: Association to many Author.books ...
-                    // as this would result in a type definition that
-                    // name-clashes with the actual declaration of Author
-                    this.visitEntity(name, target)
-                }
-            } else {
-                LOG.error(`Expecting an autoexposed projection within a service. Skipping ${name}`)
-            }
+        for (const [name, entity] of Object.entries(this.csn.definitions)) {
+            this.visitEntity(name, entity)
         }
     }
 
@@ -119,15 +85,8 @@ class Visitor {
      * @returns {[string, object][]} array of key name and key element pairs
      */
     #keys(fq) {
-        // FIXME: this is actually pretty bad, as not only have to propagate keys through
-        // both flavours of CSN (see constructor), but we are now also collecting them from
-        // both flavours and deduplicating them.
-        // xtended contains keys that have been inherited from parents
-        // inferred contains keys from queried entities (thing `entity Foo as select from Bar`, where Bar has keys)
-        // So we currently need them both.
         return Object.entries({
-            ...this.csn.inferred.definitions[fq]?.keys ?? {},
-            ...this.csn.xtended.definitions[fq]?.keys ?? {}
+            ...this.csn.definitions[fq]?.keys ?? {}
         })
     }
 
@@ -233,7 +192,7 @@ class Visitor {
         // FIXME: replace with resolution/entity::asIdentifier
         const toLocalIdent = ({ns, clean, fq}) => {
             // types are not inflected, so don't change those to singular
-            const csn = this.csn.inferred.definitions[fq]
+            const csn = this.csn.definitions[fq]
             const ident = isType(csn)
                 ? clean
                 : this.resolver.inflect({csn, plainName: clean}).singular
@@ -263,6 +222,7 @@ class Visitor {
             .reverse() // reverse so that own aspect A is applied before extensions B,C: B(C(A(Entity)))
             .reduce((wrapped, ancestor) => `${asIdentifier({info: ancestor, wrapper: name => `_${name}Aspect`, relative: file.path})}(${wrapped})`, 'Base')
 
+        const inheritedElements = !isViewOrProjection(entity) ? info.inheritedElements : null
         this.contexts.push({ entity: fq })
 
         // CLASS ASPECT
@@ -274,10 +234,7 @@ class Visitor {
                 const resolverOptions = { forceInlineStructs: isEntity(entity) && configuration.inlineDeclarations === 'flat'}
 
                 for (let [ename, element] of Object.entries(entity.elements ?? [])) {
-                    if (element.target && /\.texts?/.test(element.target)) {
-                        LOG.warn(`referring to .texts property in ${fq}. This is currently not supported and will be ignored.`)
-                        continue
-                    }
+                    if (inheritedElements?.has(ename)) continue
                     this.visitElement({name: ename, element, file, buffer, resolverOptions})
 
                     // make foreign keys explicit
@@ -292,7 +249,8 @@ class Visitor {
                                     LOG.error(`Attempting to generate a foreign key reference called '${foreignKey}' in type definition for entity ${fq}. But a property of that name is already defined explicitly. Consider renaming that property.`)
                                 } else {
                                     const kelement = Object.assign(Object.create(originalKeyElement), {
-                                        isRefNotNull: !!element.notNull || !!element.key
+                                        isRefNotNull: !!element.notNull || !!element.key,
+                                        key: element.key
                                     })
                                     this.visitElement({name: foreignKey, element: kelement, file, buffer, resolverOptions})
                                 }
@@ -301,7 +259,7 @@ class Visitor {
                     }
 
                     // store inline enums for later handling, as they have to go into one common "static elements" wrapper
-                    if (isInlineEnumType(element, this.csn.xtended)) {
+                    if (isInlineEnumType(element, this.csn)) {
                         enums.push(element)
                     }
                 }
@@ -314,7 +272,10 @@ class Visitor {
                         initialiser: propertyToInlineEnumName(clean, e.name),
                         isStatic: true,
                     }))
-                    file.addInlineEnum(clean, fq, e.name, csnToEnumPairs(e, {unwrapVals: true}), eDoc)
+                    if (typeof e?.type !== 'string' && e?.type?.ref) {
+                        e.resolvedType = /** @type {string} */(lookUpRefType(this.csn, e.type.ref)?.type)
+                    }
+                    file.addInlineEnum(clean, fq, e.name, csnToEnumPairs(e, {unwrapVals: true}), buffer, eDoc)
                 }
 
                 if ('kind' in entity) {
@@ -357,7 +318,7 @@ class Visitor {
      */
     #printEntity(fq, entity) {
         const info = this.entityRepository.getByFqOrThrow(fq)
-        const { namespace: ns, entityName: clean, inflection } = info
+        const { namespace: ns, entityName: clean, inflection, scope } = info
         const file = this.fileRepository.getNamespaceFile(ns)
         let { singular, plural } = inflection
 
@@ -373,7 +334,7 @@ class Visitor {
         // as types are not inflected, their singular will always clash and there is also no plural for them anyway -> skip
         // if the user defined their entities in singular form we would also have a false positive here -> skip
         const namespacedSingular = `${ns.asNamespace()}.${singular}`
-        if (!isType(entity) && namespacedSingular !== fq && namespacedSingular in this.csn.xtended.definitions) {
+        if (!isType(entity) && namespacedSingular !== fq && namespacedSingular in this.csn.definitions) {
             LOG.error(
                 `Derived singular '${singular}' for your entity '${fq}', already exists. The resulting types will be erronous. Consider using '@singular:'/ '@plural:' annotations in your model or move the offending declarations into different namespaces to resolve this collision.`
             )
@@ -386,20 +347,15 @@ class Visitor {
             ? file.getSubNamespace(this.resolver.trimNamespace(parent.name))
             : file.classes
 
-        // we can't just use "singular" here, as it may have the subnamespace removed:
-        // "Books.text" is just "text" in "singular". Within the inflected exports we need
-        // to have Books.texts = Books.text, so we derive the singular once more without cutting off the ns.
-        // Directly deriving it from the plural makes sure we retain any parent namespaces of kind "entity",
-        // which would not be possible while already in singular form, as "Book.text" could not be resolved in CSN.
-        // edge case: @singular annotation present. singular4 will take care of that.
-        file.addInflection(util.singular4(entity, true), plural, clean)
-
-        // in case of projections `entity` is empty -> retrieve from inferred csn where the actual properties are rolled out
-        const target = isProjection(entity) || isView(entity)
-            ? this.csn.inferred.definitions[fq]
-            : entity
+        if (scope?.length > 0) {
+            /** @param {string} n - name of entity */
+            const scoped = n => [...scope, n].join('.')
+            file.addInflection(scoped(singular), scoped(plural), scoped(clean))
+        } else {
+            file.addInflection(singular, plural, clean)
+        }
 
-        this.#aspectify(fq, target, buffer, { cleanName: singular })
+        this.#aspectify(fq, entity, buffer, { cleanName: singular })
 
         buffer.add(overrideNameProperty(singular, entity.name))
         buffer.add(`Object.defineProperty(${singular}, 'is_singular', { value: true })`)
@@ -516,7 +472,7 @@ class Visitor {
         if (isEnum(type) && !isReferenceType(type) && this.resolver.builtinResolver.resolveBuiltin(type.type)) {
             file.addEnum(fq, entityName, csnToEnumPairs(type), docify(type.doc))
         } else {
-            const isEnumReference = typeof type.type === 'string' && isEnum(this.csn.inferred.definitions[type?.type])
+            const isEnumReference = typeof type.type === 'string' && isEnum(this.csn.definitions[type?.type])
             // alias
             file.addType(fq, entityName, this.resolver.resolveAndRequire(type, file).typeName, isEnumReference)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-typer",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "Generates .ts files for a CDS model to receive code completion in VS Code",
   "main": "index.js",
   "repository": "github:cap-js/cds-typer",
@@ -42,7 +42,7 @@
     "cds-typer": "./lib/cli.js"
   },
   "peerDependencies": {
-    "@cap-js/cds-types": ">=0.6.4",
+    "@cap-js/cds-types": ">=0.9",
     "@sap/cds": ">=8"
   },
   "devDependencies": {