fix(parser): Fix parsing of array of #9

The parser has been enhanced based on Issue #9 so that it also works with array of definitions and resolves them correctly.
mrbandler · Aug 31, 2021 · 113259e · 113259e
1 parent 04ec58f
commit 113259e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/src/cds.parser.ts b/src/cds.parser.ts
@@ -43,7 +43,7 @@ import {
     ITypeAliasDefinition,
 } from "./utils/types";
 
-import _, { isElement } from "lodash";
+import _ from "lodash";
 
 /**
  * Parses a compiled CDS JSON object.
@@ -384,12 +384,21 @@ export class CDSParser {
      */
     private parseParams(
         definition: ICsnActionDefinition | ICsnFunctionDefinition
-    ): Map<string, ICsnParam> {
-        const result: Map<string, ICsnParam> = new Map<string, ICsnParam>();
+    ): Map<string, ICsnParam | ITypeAliasDefinition> {
+        const result: Map<string, ICsnParam | ITypeAliasDefinition> = new Map<
+            string,
+            ICsnParam | ITypeAliasDefinition
+        >();
 
         if (definition.params) {
             for (const key in definition.params) {
-                if (definition.params.hasOwnProperty(key)) {
+                if (definition.params[key].items !== undefined) {
+                    const value = this.parseArrayTypeAliasDef(
+                        key,
+                        definition.params[key]
+                    );
+                    result.set(key, value);
+                } else if (definition.params.hasOwnProperty(key)) {
                     const value = definition.params[key];
                     result.set(key, value as ICsnParam);
                 }

diff --git a/src/types/action.func.ts b/src/types/action.func.ts
@@ -1,10 +1,13 @@
 import * as morph from "ts-morph";
 
-import { ICsnTypeRef, Kind, isTypeRef } from "../utils/cds.types";
+import { ICsnTypeRef, Kind, isTypeRef, Cardinality } from "../utils/cds.types";
 
 import { BaseType } from "./base.type";
 import { Entity } from "./entity";
-import { IActionFunctionDefinition } from "../utils/types";
+import {
+    IActionFunctionDefinition,
+    ITypeAliasDefinition,
+} from "../utils/types";
 
 /**
  * Action/Function toType return type.
@@ -172,7 +175,7 @@ export class ActionFunction extends BaseType<IActionFunctionDeclarationStructure
             result = this.createInterface(prefix, "Params");
 
             for (const [key, value] of this.def.params) {
-                if (isTypeRef(value.type)) {
+                if (isTypeRef(value.type as ICsnTypeRef)) {
                     const typeRef = value.type as ICsnTypeRef;
                     const type = types.find((t) => t.Name === typeRef.ref[0]);
 
@@ -189,9 +192,19 @@ export class ActionFunction extends BaseType<IActionFunctionDeclarationStructure
                         }
                     }
                 } else {
+                    const type = this.cdsElementToType(
+                        {
+                            type: value.type as string,
+                            canBeNull: false,
+                            cardinality: (value as ITypeAliasDefinition).isArray
+                                ? { max: Cardinality.many }
+                                : { max: Cardinality.one },
+                        },
+                        types
+                    );
                     result.properties?.push({
                         name: key,
-                        type: this.cdsTypeToType(value.type),
+                        type: type,
                     });
                 }
             }

diff --git a/src/utils/cds.types.ts b/src/utils/cds.types.ts
@@ -134,6 +134,10 @@ export interface ICsnTypeRef {
     ref: string[];
 }
 
+export interface ICsnArrayParam {
+    items: ICsnParam;
+}
+
 export interface ICsnParam {
     type: Type | ICsnTypeRef;
 }
@@ -144,7 +148,7 @@ export interface ICsnParams {
 
 export interface ICsnActionDefinition {
     kind: Kind;
-    params?: ICsnParams;
+    params?: ICsnParams | ICsnArrayParam;
     returns?: CsnReturns;
 }
 

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -58,7 +58,7 @@ export interface IActionFunctionReturns {
 
 export interface IActionFunctionDefinition {
     kind: Kind;
-    params?: Map<string, ICsnParam>;
+    params?: Map<string, ICsnParam | ITypeAliasDefinition>;
     returns?: IActionFunctionReturns;
 }