@cap-js/cds-typer 0.29.0 → 0.31.0

package/CHANGELOG.md

@@ -1,24 +1,46 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## Version 0.30.0 - TBD
+## [Unreleased]
 
-## Version 0.29.0 - 2024-11-20
+### Added 
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## [0.31.0] - 2024-12-16
+### Fixed
+- type-referencing a property that is a key no longer breaks the referring property
+- when targeting ESM, all imports within the generated types now add a `/index.js`-suffix to conform to modern module resolution mechanisms
+- leaving `target_module_type` at `'auto'` now properly acts on a detected `"type":"module"`
+
+### Added
+- cds aspects now generate a synthetic plural type too, to be used in `composition of many`
+
+## [0.30.0] - 2024-12-02
+
+### Changed
+- [breaking] when running cds-typer in a CAP project, the default for the `outputDirectory` option will be `./@cds-models` instead of `./`. This default takes the lowest precedence after setting it in the project's `cds.env`, or explicitly as CLI argument.
+
+### Fixed
+- cds-typer no longer ignores the selected `outputDirectory`, which would also cause an issue during build
+
+## [0.29.0] - 2024-11-20
 ### Added
-- [breaking] cds-typer now tries to automatically detect whether it has to generate ESM or CommonJS in the emitted _index.js_ files. This behaviour can be overridden via the `--targetModuleType` option. _If you rely on these generated index.js files to be CJS despite your project being of ESM type, you need to manually tell cds-typer to generate CJS files!_ 
+- [breaking] cds-typer now tries to automatically detect whether it has to generate ESM or CommonJS in the emitted _index.js_ files. This behaviour can be overridden via the `--targetModuleType` option. _If you rely on these generated index.js files to be CJS despite your project being of ESM type, you need to manually tell cds-typer to generate CJS files!_
 
 ### Fixed
 - The static `.keys` property now properly reels in key types from inherited classes.
 
-## Version 0.28.1 - 2024-11-07
+## [0.28.1] - 2024-11-07
 ### Fixed
 - `cds build` no longer fails on Windows with an `EINVAL` error.
 - `cds build` also supports custom model paths in `tsconfig.json` that do not end with `/index.ts`.  This is the case for projects running with `tsx`.
 
-## Version 0.28.0 - 24-10-24
+## [0.28.0] - 24-10-24
 ### Added
 - Schema definition for `cds.typer` options in `package.json` and `.cdsrc-*.json` files
 - Added a static `elements` property to all entities, which allows access to the `LinkedDefinitions` instance of an entity's elements
@@ -31,7 +53,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Properly support mandatory (`not null`) action parameters with `array of` types
 - Static property `.drafts` is only create for entity classes that are actually draft enabled
 
-## Version 0.27.0 - 2024-10-02
+## [0.27.0] - 2024-10-02
 ### Changed
 - Any configuration variable (via CLI or `cds.env`) can now be passed in snake_case in addition to camelCase
 - Action parameters are now generated as optional by default, which is how the runtime treats them. Mandatory parameters have to be marked as `not null` in CDS/CDL, or `notNull` in CSN.
@@ -41,7 +63,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Fix a bug where cds-typer would produce redundant type declarations when the model contains an associations to another entity's property
 - Reintroduce default value `'.'` for `--outputDirectory`
 
-## Version 0.26.0 - 2024-09-11
+## [0.26.0] - 2024-09-11
 ### Added
 - Added a static `.keys` property in all entities. That property is dictionary which holds all properties as keys that are marked as `key` in CDS
 - Added a CLI option `--useEntitiesProxy`. When set to `true`, all entities are wrapped into `Proxy` objects during runtime, allowing top level imports of entity types.
@@ -54,8 +76,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Services now have their own export (named like the service itself). The current default export is not usable in some scenarios from CommonJS modules.
 - Enums and operation parameters can have doc comments
 
-
-## Version 0.25.0 - 2024-08-13
+## [0.25.0] - 2024-08-13
 ### Added
 - Declaring a type alias on an enum in cds now also exports it on value level in the resulting type
 
@@ -66,7 +87,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - All properties are now preceeded with the `declare` modifier to pass strict tsconfigs using `useDefineForClassFields` or `noImplicitOverride`
 - The static `actions` property of generated classes now includes the types from all inherited classes to also suggest actions defined in a base entity/aspect/type.
 
-## Version 0.24.0 - 2024-07-18
+## [0.24.0] - 2024-07-18
 ### Fixed
 - Suppressed an error that would incorrectly point out naming clashes when an entity was named in singular inflection in the model
 - CDS aspects now also generate a aspect-function in singular inflection, similar to how entities do
@@ -75,14 +96,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Aspects generate named classes again so that tooltips will show more meaningful provenance for properties
 - The TypeScript task for `cds build` no longer looks for tsconfig.json to determine if the project has TS nature and instead checks the dependencies in the project's package.json for an occurrence of `typescript`
 
-## Version 0.23.0 - 2024-07-04
+## [0.23.0] - 2024-07-04
 
 ### Fixed
 - Plurals no longer have `is_singular` attached in the resulting .js files
 - Properties are properly propagated beyond just one level of inheritance
 
-
-## Version 0.22.0 - 2024-06-20
+## [0.22.0] - 2024-06-20
 
 ### Fixed
 - Fixed a bug where keys would sometimes inconsistently become nullable
@@ -90,16 +110,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Changed
 - Logging now internally uses `cds.log` and pipes output into the `cds-typer` logger, which can be configured via `cds.env` in addition to explicitly passing a `--logLevel` parameter to CLI. Users now have to use the levels defined in [`cds.log.levels`](https://cap.cloud.sap/docs/node.js/cds-log#log-levels). The formerly valid levels `WARNING`, `CRITICAL`, and `NONE` are now deprecated and automatically mapped to valid levels for now.
 
-## Version 0.21.2 - 2024-06-06
+## [0.21.2] - 2024-06-06
 ### Fixed
 - The typescript build task will no longer attempt to run unless at least cds 8 is installed
 
-## Version 0.21.1 - 2024-06-03
+## [0.21.1] - 2024-06-03
 ### Fixed
 - Added missing _cds-plugin.js_ to exported files to properly enable calling `cds build --for typescript`
 
-
-## Version 0.21.0 - 2024-05-31
+## [0.21.0] - 2024-05-31
 ### Added
 - Added `IEEE754Compatible` flag which, when set to `true`, generates decimal fields as `(number | string)` instead of `number`. This flag will be removed in the long run
 - Added plugin to `cds build` TypeScript projects. Can be explicitly called using `cds build --for typescript`
@@ -113,15 +132,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Entities ending with an "s" are no longer incorrectly truncated within `extends`-clauses
 - Entity names prefixed with their own namespace (e.g. `Name.Name`, `Name.NameAttachments`) are not stripped of their name prefix
 
-## Version 0.20.2 - 2024-04-29
+## [0.20.2] - 2024-04-29
 ### Fixed
 - Referring to a property's type in a function/ action parameter no longer refers to the enclosing entity
 
-## Version 0.20.1 - 2024-04-24
+## [0.20.1] - 2024-04-24
 ### Fixed
 - Void actions no longer crash the type generation process
 
-## Version 0.20.0 - 2024-04-23
+## [0.20.0] - 2024-04-23
 ### Added
 - Types for actions and functions now expose a `.kind` property which holds the string `'function'` or `'action'` respectively
 - Added the `CdsDate`, `CdsDateTime`, `CdsTime`, `CdsTimestamp` types, which are each represented as a `string`.
@@ -137,32 +156,32 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Aspects are now consistently named and called in their singular form
 - Only detect inflection clash if singular and plural share the same namespace. This also no longer reports `sap.common` as erroneous during type creation
 
-## Version 0.19.0 - 2024-03-28
+## [0.19.0] - 2024-03-28
 ### Added
 - Support for `cds.Vector`, which will be represented as `string`
 
-## Version 0.18.2 - 2024-03-21
+## [0.18.2] - 2024-03-21
 ### Fixed
 - Resolving `@sap/cds` will now look in the CWD first to ensure a consistent use the same CDS version across different setups
 - Types of function parameters starting with `cds.` are not automatically considered builtin anymore and receive a more thorough check against an allow-list
 
 
-## Version 0.18.1 - 2024-03-13
+## [0.18.1] - 2024-03-13
 ### Fix
 - Remove faulty plural for CDS `type` definitions from the generated _index.js_ files
 
-## Version 0.18.0 - 2024-03-12
+## [0.18.0] - 2024-03-12
 ### Added
 - Improved support for projections, including projections on inline definitions, and on views, as well as support for explicit exclusion and selection of properties
 
 ### Changed
 - [breaking] CDS `type` definitions will not be inflected. Whatever inflection you define them in will be assumed treated as a singular form and will not receive a plural form anymore
 
-## Version 0.17.0 - 2024-03-05
+## [0.17.0] - 2024-03-05
 ### Fixed
 - Fixed a bug where refering to an externally defined enum via the `typeof` syntax would crash the type generation
 
-## Version 0.16.0 - 2024-02-01
+## [0.16.0] - 2024-02-01
 ### Changed
 - Changed default log level from `NONE` to `ERROR`. See the doc to manually pass in another log level for cds-typer runs
 - Name collisions between automatically generated foreign key fields (`.…_ID`, `.…_code`, etc.) with explicitly named fields will now raise an error
@@ -171,7 +190,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Externally defined enums can now be used as parameter types in actions
 
-## Version 0.15.0 - 2023-12-21
+## [0.15.0] - 2023-12-21
 ### Added
 - Support for [scoped entities](https://cap.cloud.sap/docs/cds/cdl#scoped-names)
 - Support for [delimited identifiers](https://cap.cloud.sap/docs/cds/cdl#delimited-identifiers)
@@ -182,18 +201,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Arrays of inline enum values can now be used as action parameters too. But they will only be represented by their enclosing type for now, i.e. `string`, `number`, etc.
 - Foreign keys of projection entities are now propagated as well
 
-## Version 0.14.0 - 2023-12-13
+## [0.14.0] - 2023-12-13
 ### Added
 - Entities that are database views now also receive typings
 
-## Version 0.13.0 - 2023-12-06
+## [0.13.0] - 2023-12-06
 ### Changed
 - Enums are now generated ecplicitly in the respective _index.js_ files and don't have to extract their values from the model at runtime anymore
 
 ### Added
 - The `excluding` clause in projections now actually excludes the specified properties in the generated types
 
-## Version 0.12.0 - 2023-11-23
+## [0.12.0] - 2023-11-23
 
 ### Changed
 - Generate `cds.LargeBinary` as string, buffer, _or readable_ in the case of media content
@@ -204,7 +223,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Now using names of enum values in generated _index.js_ files if no explicit value is present
 
-## Version 0.11.1 - 2023-10-12
+## [0.11.1] - 2023-10-12
 
 ### Changed
 
@@ -212,7 +231,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Fixed how service names are exported as default export
 
-## Version 0.11.0 - 2023-10-10
+## [0.11.0] - 2023-10-10
 
 ### Changed
 
@@ -228,7 +247,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Removed
 - `compileFromCSN` is no longer part of the package's API
 
-## Version 0.10.0 - 2023-09-21
+## [0.10.0] - 2023-09-21
 
 ### Changed
 - Actions and functions are now attached to a static `.actions` property of each generated class. This reflects the runtime behaviour better than the former way of generating instance methods
@@ -237,7 +256,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Fixed
 
-## Version 0.9.0 - 2023-09-08
+## [0.9.0] - 2023-09-08
 
 ### Changed
 
@@ -247,8 +266,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Foreign keys are now propagated more than one level (think: `x_ID_ID_ID`)
 
-
-## Version 0.8.0 - 2023-09-05
+## [0.8.0] - 2023-09-05
 
 ### Changed
 
@@ -258,8 +276,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Foreign keys that are inherited via aspects are now also generated in addition to the resolved property (see 0.7.0)
 - Explicitly annotated `@singular` and `@plural` names are now properly used in generated _index.js_ files
 
-
-## Version 0.7.0 - 2023-08-22
+## [0.7.0] - 2023-08-22
 
 ### Changed
 
@@ -268,7 +285,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Foreign keys are now present in the generated types in addition to the resolved property
 
 ### Fixed
-## Version 0.6.1 - 2023-08-10
+## [0.6.1] - 2023-08-10
 
 ### Changed
 
@@ -277,7 +294,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Removed a warning about circular imports
 
-## Version 0.6.0 - 2023-08-07
+## [0.6.0] - 2023-08-07
 
 ### Added
 - Support for `event` syntax
@@ -287,7 +304,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Add leading underscore to appease `noUnusedParameters` in strict tsconfigs
 - No longer inflect `type` definitions when they are referenced within entities or other type definitions
 
-## Version 0.5.0 - 2023-07-25
+## [0.5.0] - 2023-07-25
 
 ### Changed
 - Facilitate strict property checks. Note: `checkJs: true` must be present in the project's _jsconfig.json_ or _tsconfig.json_ respectively for this feature to become effective
@@ -299,12 +316,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Generate `string` type for date-related types in CDS definitions
 - Generate `Buffer | string` type for the CDS type `LargeBinary`
 
-
-## Version 0.4.0 - 2023-07-06
+## [0.4.0] - 2023-07-06
 ### Added
 - Support for enums when they are defined separately (not inline in the property type of an entity)
 
-## Version 0.3.0 - 2023-06-26
+## [0.3.0] - 2023-06-26
 ### Added
 - Support `function` definitions (apart from `action`s)
 ### Changed
@@ -313,25 +329,25 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - Properly import CDS `type` definitions when they are referenced elsewhere
 
-## Version 0.2.5-beta.1 - 2023-06-13
+## [0.2.5-beta.1] - 2023-06-13
 
 ### Changed
 - Bump version
 
-## Version 0.2.4 - 2023-06-12
+## [0.2.4] - 2023-06-12
 - Enable use of annotated singular/ plural names in associations/ compositions
 - Rename package from `@sap/cds-dts-generator` to `@cap-js/cds-typer`
 
-## Version 0.2.3 - 2023-05-17
+## [0.2.3] - 2023-05-17
 - Add missing library files
 
-## Version 0.2.2 - 2023-05-17
+## [0.2.2] - 2023-05-17
 - Make class hierarchy flatter
 
-## Version 0.2.1 - 2023-05-16
+## [0.2.1] - 2023-05-16
 - Add missing files
 
-## Version 0.2.0 - 2023-05-15
+## [0.2.0] - 2023-05-15
 - use native Typescript AST in unit tests
 - add `propertiesOptional` flag
 - support flat, as well as nested inline declarations
@@ -342,9 +358,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - enable use of additional type libraries (HANA types available as first library)
 - provide proper JSDoc for all modules
 - export entity types for singular variants alongside plural types
-## Version 0.1.1 - 2023-01-26
+
+## [0.1.1] - 2023-01-26
 - add TL;DR section to README
 - allow multiple positional arguments
 
-## Version 0.1.0
+## [0.1.0] - 2023-01-01
 - initial code base

package/lib/cli.js

@@ -142,6 +142,7 @@ const addCLIParamsToConfig = params => {
     }
 }
 
+// when changing/ adding anything in here, make sure to adjust scripts/write-cds-typer-schema.js accordingly!
 const flags = enrichFlagSchema({
     outputDirectory: {
         desc: 'Root directory to write the generated files to.',
@@ -258,6 +259,9 @@ const prepareParameters = (/** @type {any[]} */ argv) => {
 }
 
 const main = async (/** @type {any[]} */ argv) => {
+    // when calling from CLI within a CAP project, make sure plugins (this includes cds-typer)
+    // are initialised and have their default values injected into cds.env
+    await cds.plugins
     const { positional } = prepareParameters(argv)
     compileFromFile(positional)
 }

package/lib/components/basedefs.js

@@ -53,7 +53,7 @@ export type DraftOf<T> = { new(...args: any[]): DraftEntity<T> }
 export type DraftsOf<T> = typeof Array<DraftEntity<T>>
 
 export type DeepRequired<T> = { 
-    [K in keyof T]: DeepRequired<T[K]>
+    [K in keyof T]: DeepRequired<Unkey<T[K]>>
 } & Exclude<Required<T>, null>;
 
 const key = Symbol('key')  // to avoid .key showing up in IDE's auto-completion
@@ -63,6 +63,8 @@ export type KeysOf<T> = {
   [K in keyof T as NonNullable<T[K]> extends Key<unknown> ? K : never]-?: Key<{}>  // T[K] 
 }
 
+export type Unkey<T> = T extends Key<infer U> ? U : T
+
 /**
  * Dates and timestamps are strings during runtime, so cds-typer represents them as such.
  */

package/lib/config.js

@@ -1,3 +1,5 @@
+const fs = require('node:fs')
+const path = require('node:path')
 const cds = require('@sap/cds')
 const { camelToSnake, getProjectTargetType } = require('./util')
 const { LOG } = require('./logging')
@@ -32,29 +34,40 @@ const camelSnakeHybrid = target => {
     return proxy
 }
 class Config {
-    static #defaults = {
-        propertiesOptional: true,
-        useEntitiesProxy: false,
-        inlineDeclarations: 'flat',
-        outputDirectory: '.',
-        targetModuleType: 'auto'
+    /** @type {Record<string, unknown>} */
+    static #defaults = {}
+    static get defaults () {
+        // these are the exact defaults that are used when cds-typer is loaded as cds plugin
+        // which will shove the values into cds.env. When executed standalone, without cds environment,
+        // we need to load them from package.json ourselves.
+        if (Object.keys(Config.#defaults).length) return Config.#defaults
+        try {
+            const packageJsonPath = path.resolve(__dirname, path.join('..', 'package.json'))
+            const pjson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
+            Config.#defaults = pjson.cds.typer
+        } catch (e) {
+            LOG.error(`Failed to load default configuration from package.json: ${e}`)
+        }
+        return Config.#defaults
     }
 
     values = undefined
     proxy = undefined
 
     init () {
-        this.values = {...Config.#defaults, ...(cds.env.typer ?? {})}
+        this.values = {...Config.defaults, ...(cds.env.typer ?? {})}
         this.proxy = camelSnakeHybrid(this.values)
-        if (this.values.targetModuleType === 'auto') {
+        if (this.proxy.targetModuleType === 'auto') {
             const type = getProjectTargetType(cds.root)
+            let detectedType = 'cjs'
             if (type) {
                 LOG.info(`automatically detected module type '${type}' in ${cds.root}`)
-                this.values.targetModuleType = type
+                detectedType = type
             } else {
                 LOG.warn(`target module type was set to 'auto', but could not detect module type in ${cds.root}. Falling back to cjs`)
-                this.values.targetModuleType = 'cjs'
             }
+            this.values.targetModuleType = detectedType
+            this.proxy.targetModuleType = detectedType
         }
     }
 

package/lib/file.js

@@ -10,7 +10,6 @@ const { proxyAccessFunction } = require('./components/javascript')
 const { createObjectOf, stringIdent } = require('./printers/wrappers')
 const { configuration } = require('./config')
 const { CJSPrinter, ESMPrinter } = require('./printers/javascript')
-const { getProjectTargetType } = require('./util')
 
 const AUTO_GEN_NOTE = '// This is an automatically generated file. Please do not change its contents manually!'
 
@@ -109,6 +108,9 @@ class Library extends File {
  * Source file containing several buffers.
  */
 class SourceFile extends File {
+    /** @type {import('../lib/printers/javascript').Printer | undefined} */
+    #jsPrinter
+
     /**
      * @param {string | Path} path - path to the file
      */
@@ -146,8 +148,10 @@ class SourceFile extends File {
         this.services = { buffer: new Buffer(), names: [] }
         /** @type {Record<string,string[]>} */
         this.entityProxies = {}
-        /** @type {import('../lib/printers/javascript').Printer} */
-        this.jsPrinter = configuration.targetModuleType === 'esm'
+    }
+
+    get jsPrinter () {
+        return this.#jsPrinter ??= configuration.targetModuleType === 'esm'
             ? new ESMPrinter()
             : new CJSPrinter()
     }
@@ -401,9 +405,13 @@ class SourceFile extends File {
             // 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'
+            : ''
         for (const imp of Object.values(this.imports)) {
             if (!imp.isCwd(this.path.asDirectory())) {
-                buffer.add(`import * as ${imp.asIdentifier()} from '${imp.asDirectory({relative: this.path.asDirectory()})}';`)
+                const from = imp.asDirectory({relative: this.path.asDirectory()}) + file
+                buffer.add(`import * as ${imp.asIdentifier()} from '${from}';`)
             }
         }
         buffer.blankLine()

package/lib/printers/javascript.js

@@ -1,3 +1,11 @@
+/**
+ * Forcefully overrides the .name property of a class.
+ * See: https://github.com/microsoft/TypeScript/issues/442
+ * @param {string} clazz - the class to override the name property for
+ * @param {string} content - the content to set the name property to
+ */
+const overrideNameProperty = (clazz, content) => `Object.defineProperty(${clazz}, 'name', { value: '${content}' })`
+
 class JavaScriptPrinter {
     /**
      * @param {string} text - comment text
@@ -17,7 +25,7 @@ class JavaScriptPrinter {
     /**
      * @abstract
      * @param {string} alias - what the import should be known as within the importing file
-     * @param {string} from - the package/ location to import from 
+     * @param {string} from - the package/ location to import from
      * @returns {string}
      */
     // eslint-disable-next-line no-unused-vars
@@ -127,5 +135,6 @@ class CJSPrinter extends JavaScriptPrinter {
 
 module.exports = {
     CJSPrinter,
-    ESMPrinter
+    ESMPrinter,
+    overrideNameProperty
 }

package/lib/printers/wrappers.js

@@ -113,6 +113,14 @@ const createPromiseOf = t => `Promise<${t}>`
  */
 const deepRequire = (t, lookup = '') => `${base}.DeepRequired<${t}>${lookup}`
 
+/**
+ * Wraps a type into an unkey type (removes they Key<> type).
+ * This is needed for type references, where Foo:id should result in `typeof id`, not `Key<typeof id>`.
+ * @param {string} t - the type to wrap.
+ * @returns {string}
+ */
+const unkey = t => `${base}.Unkey<${t}>`
+
 /**
  * Puts a passed string in docstring format.
  * @param {string | undefined} doc - raw string to docify. May contain linebreaks.
@@ -150,5 +158,6 @@ module.exports = {
     createCompositionOfMany,
     deepRequire,
     docify,
-    stringIdent
+    stringIdent,
+    unkey
 }

package/lib/resolution/entity.js

@@ -189,6 +189,8 @@ function asIdentifier ({info, wrapper = undefined, relative = undefined}) {
         : `${info.namespace.asIdentifier()}.${wrapped}`
 }
 
+/** @typedef {EntityInfo} Info */
+
 module.exports = {
     EntityRepository,
     asIdentifier

package/lib/visitor.js

@@ -8,7 +8,7 @@ const { SourceFile, FileRepository, Buffer, Path } = require('./file')
 const { FlatInlineDeclarationResolver, StructuredInlineDeclarationResolver } = require('./components/inline')
 const { Resolver } = require('./resolution/resolver')
 const { LOG } = require('./logging')
-const { docify, createPromiseOf, createUnionOf, createKeysOf, createElementsOf, stringIdent, createDraftsOf, createDraftOf, createIntersectionOf, createReturnTypeOf } = require('./printers/wrappers')
+const { docify, createPromiseOf, createUnionOf, createKeysOf, createElementsOf, stringIdent, createDraftsOf, createDraftOf, createIntersectionOf } = require('./printers/wrappers')
 const { csnToEnumPairs, propertyToInlineEnumName, isInlineEnumType, stringifyEnumType } = require('./components/enum')
 const { isReferenceType } = require('./components/reference')
 const { empty } = require('./components/typescript')
@@ -18,6 +18,7 @@ const { last } = require('./components/identifier')
 const { getPropertyModifiers } = require('./components/property')
 const { configuration } = require('./config')
 const { createMember } = require('./components/class')
+const { overrideNameProperty } = require('./printers/javascript')
 
 /** @typedef {import('./file').File} File */
 /** @typedef {import('./typedefs').visitor.Context} Context */
@@ -27,6 +28,7 @@ const { createMember } = require('./components/class')
 /** @typedef {import('./typedefs').resolver.EntityCSN} EntityCSN */
 /** @typedef {import('./typedefs').resolver.EnumCSN} EnumCSN */
 
+
 class Visitor {
     /**
      * Gathers all files that are supposed to be written to
@@ -354,13 +356,8 @@ class Visitor {
      * @param {EntityCSN} entity - the entity to print
      */
     #printEntity(fq, entity) {
-        // static .name has to be defined more forcefully: https://github.com/microsoft/TypeScript/issues/442
-        /**
-         * @param {string} clazz - the class to override the name property for
-         * @param {string} content - the content to set the name property to
-         */
-        const overrideNameProperty = (clazz, content) => `Object.defineProperty(${clazz}, 'name', { value: '${content}' })`
-        const { namespace: ns, entityName: clean, inflection } = this.entityRepository.getByFqOrThrow(fq)
+        const info = this.entityRepository.getByFqOrThrow(fq)
+        const { namespace: ns, entityName: clean, inflection } = info
         const file = this.fileRepository.getNamespaceFile(ns)
         let { singular, plural } = inflection
 
@@ -408,24 +405,34 @@ class Visitor {
         buffer.add(`Object.defineProperty(${singular}, 'is_singular', { value: true })`)
 
         // PLURAL
-
         // types do not receive a plural
         if (!isType(entity)) {
-            if (plural.includes('.')) {
-                // Foo.text -> namespace Foo { class text { ... }}
-                plural = last(plural)
-            }
-            // plural can not be a type alias to $singular[] but needs to be a proper class instead,
-            // so it can get passed as value to CQL functions.
-            const additionalProperties = this.#staticClassContents(fq, singular, true)
-            additionalProperties.push('$count?: number')
-            buffer.add(docify(entity.doc))
-            buffer.add(`export class ${plural} extends Array<${singular}> {${additionalProperties.join('\n')}}`)
-            buffer.add(overrideNameProperty(plural, entity.name))
+            this.#printPlural(info, buffer)
         }
         buffer.blankLine()
     }
 
+    /**
+     * @param {import('./resolution/entity').Info} info - the entity info
+     * @param {import('./file').Buffer} buffer - buffer to write the plural into
+     */
+    #printPlural(info, buffer) {
+        const { fullyQualifiedName: fq, csn: entity } = info
+        let { singular, plural } = info.inflection
+
+        if (plural.includes('.')) {
+            // Foo.text -> namespace Foo { class text { ... }}
+            plural = last(plural)
+        }
+        // plural can not be a type alias to $singular[] but needs to be a proper class instead,
+        // so it can get passed as value to CQL functions.
+        const additionalProperties = this.#staticClassContents(fq, singular, true)
+        additionalProperties.push('$count?: number')
+        buffer.add(docify(entity.doc))
+        buffer.add(`export class ${plural} extends Array<${singular}> {${additionalProperties.join('\n')}}`)
+        buffer.add(overrideNameProperty(plural, entity.name))
+    }
+
     /**
      * Stringifies function parameters in preparation of passing them to {@link SourceFile.stringifyLambda}.
      * Resolves all parameters to a pair of parameter name and name of the resolved type.
@@ -522,7 +529,8 @@ class Visitor {
      */
     #printAspect(fq, aspect) {
         LOG.debug(`Printing aspect ${fq}`)
-        const { namespace, entityName, inflection } = this.entityRepository.getByFqOrThrow(fq)
+        const info = this.entityRepository.getByFqOrThrow(fq)
+        const { namespace, entityName, inflection } = info
         const file = this.fileRepository.getNamespaceFile(namespace)
         // aspects are technically classes and can therefore be added to the list of defined classes.
         // Still, when using them as mixins for a class, they need to already be defined.
@@ -530,6 +538,9 @@ class Visitor {
         file.addClass(entityName, fq)
         file.aspects.add(`// the following represents the CDS aspect '${entityName}'`)
         this.#aspectify(fq, aspect, file.aspects, { cleanName: inflection.singular })
+        if (!isType(aspect)) {
+            this.#printPlural(info, file.aspects)
+        }
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-typer",
-  "version": "0.29.0",
+  "version": "0.31.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",
@@ -63,6 +63,13 @@
     ]
   },
   "cds": {
+    "typer": {
+      "output_directory": "@cds-models",
+      "inline_declarations": "flat",
+      "target_module_type": "auto",
+      "properties_optional": true,
+      "use_entities_proxy": false
+    },
     "schema": {
       "buildTaskType": {
         "name": "typescript",