Maintain Foreign Keys (#56)

* Add test for foreign keys

* Explicitly add foreign keys

* Add changelog entry

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Added
 - Support for `[many] $self` syntax in bound action parameters
+- Foreign keys are now present in the generated types in addition to the resolved property
 
 ### Fixed
 ## Version 0.6.1 - 2023-08-10

lib/visitor.js

@@ -59,7 +59,6 @@ class Visitor {
      * @param {VisitorOptions} options
      */
     constructor(csn, options = {}, logger = new Logger()) {
-        util.fixCSN(csn)
         this.options = { ...defaults, ...options }
         this.logger = logger
         this.csn = csn
@@ -130,6 +129,10 @@ class Visitor {
         buffer.indent()
         for (const [ename, element] of Object.entries(entity.elements ?? {})) {
             this.visitElement(ename, element, file, buffer)
+            // make foreign keys explicit
+            for (const [fkname, fkelement] of Object.entries(element.foreignKeys ?? {})) {
+                this.visitElement(`${ename}_${fkname}`, fkelement, file, buffer)
+            }
         }
         for (const [aname, action] of Object.entries(entity.actions ?? {})) {
             buffer.add(

test/unit/files/references/model.cds

@@ -1,6 +1,9 @@
 namespace references;
 
-entity Foo {}
+entity Foo {
+    key first_key: UUID;
+    key second_key: String;
+}
 
 entity Bar {
     key id: Integer;  // required for composition of many ... to work.

test/unit/references.test.js

@@ -34,6 +34,12 @@ describe('References', () => {
                 && m.type.name === 'many'
                 && m.type.args[0].name === 'Foo_'
         )).toBeTruthy()
+        expect(ast.exists('_BarAspect', 'assoc_one_first_key', m => true
+                && m.type.keyword === 'string'
+        )).toBeTruthy()
+        expect(ast.exists('_BarAspect', 'assoc_one_second_key', m => true
+                && m.type.keyword === 'string'
+        )).toBeTruthy()
     })
 
     test('Inline', async () => {