Fix type references in parameters (#227)

* Retain deep requires in parameter types * Add changelog entry and bump version number * Add test case * Fix ast file resolution in actions test * Fix tests on windows
cap-js · Apr 29, 2024 · 3120af3 · 3120af3
1 parent b58963c
commit 3120af3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Version 0.21.0 - TBD
 
+## Version 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
 ### Fixed
 - Void actions no longer crash the type generation process

diff --git a/lib/visitor.js b/lib/visitor.js
@@ -353,7 +353,7 @@ class Visitor {
         const paramType = this.resolver.resolveAndRequire(type, file)
         return this.inlineDeclarationResolver.getPropertyDatatype(
             paramType,
-            paramType.typeInfo.isArray ? paramType.typeName : paramType.typeInfo.inflection.singular
+            paramType.typeInfo.isArray || paramType.typeInfo.isDeepRequire ? paramType.typeName : paramType.typeInfo.inflection.singular
         )
     }
 

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

diff --git a/test/unit/actions.test.js b/test/unit/actions.test.js
@@ -12,8 +12,8 @@ describe('Actions', () => {
 
     beforeAll(async () => {
         paths = (await prepareUnitTest('actions/model.cds', locations.testOutput('actions_test'))).paths
-        astwBound = new ASTWrapper(path.join(paths[1], 'index.ts'))
-        astwUnbound = new ASTWrapper(path.join(paths[2], 'index.ts'))
+        astwBound = new ASTWrapper(path.join(paths.find(p => p.endsWith('S')), 'index.ts'))
+        astwUnbound = new ASTWrapper(path.join(paths.find(p => p.endsWith('actions_test')), 'index.ts'))
     })
 
     test('Bound', async () => {
@@ -183,4 +183,13 @@ describe('Actions', () => {
             && checkKeyword(type.args[1], 'never')
         ).toBe(true)
     })
+
+    test ('typeof Parameter Referring to Correct Type', async () => {
+        checkFunction(astwUnbound.tree.find(node => node.name === 'freetypeof'), {
+            modifiersCheck: (modifiers = []) => !modifiers.some(check.isStatic),
+            callCheck: type => check.isNullable(type, [check.isVoid]),
+            returnTypeCheck: type => check.isNullable(type, [check.isVoid]),
+            parameterCheck: ({members: [fst]}) => check.isNullable(fst.type, [check.isIndexedAccessType])
+        })
+    })
 })
diff --git a/test/unit/files/actions/model.cds b/test/unit/files/actions/model.cds
@@ -3,6 +3,10 @@ using elsewhere.ExternalType from './elsewhere';
 using elsewhere.ExternalType2 from './elsewhere';
 using ExternalInRoot from './root';
 
+entity Foo {
+    bar: Integer;
+}
+
 service S {
     entity E {}
         actions {
@@ -33,6 +37,7 @@ action free (param: String) returns { a: Integer; b: String } ;
 action free2 () returns ExternalType;
 action free3 () returns ExternalInRoot;
 action freevoid ();
+action freetypeof (p: Foo:bar);
 
 action free4 () returns {
     foo: ExternalType2
@@ -42,4 +47,4 @@ entity NoActions {}
 entity ParameterlessActions {}
     actions {
         action a()
-    }
+    }