Add support for records with properties

svenheden · Apr 13, 2021 · 714e256 · 714e256
1 parent 59f04b7
commit 714e256
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/converter.js b/converter.js
@@ -64,7 +64,7 @@ const createConverter = config => {
             model.BaseClasses = model.BaseClasses.filter(type => !type.match(dictionaryRegex));
         }
 
-        const members = [...model.Fields, ...model.Properties];
+        const members = [...(model.Fields || []), ...(model.Properties || [])];
         const baseClasses = model.BaseClasses && model.BaseClasses.length ? ` extends ${model.BaseClasses.join(', ')}` : '';
 
         rows.push(`// ${filename}`);

diff --git a/lib/csharp-models-to-json/ModelCollector.cs b/lib/csharp-models-to-json/ModelCollector.cs
@@ -49,15 +49,18 @@ public override void VisitRecordDeclaration(RecordDeclarationSyntax node)
             var model = new Model()
             {
                 ModelName = $"{node.Identifier.ToString()}{node.TypeParameterList?.ToString()}",
-                Fields = node.ParameterList.Parameters
+                Fields = node.ParameterList?.Parameters
                                 .Where(field => IsAccessible(field.Modifiers))
                                 .Where(property => !IsIgnored(property.AttributeLists))
                                 .Select((field) => new Field
                                     {
                                         Identifier = field.Identifier.ToString(),
                                         Type = field.Type.ToString(),
                                     }),
-                Properties = new List<Property>(),
+                Properties = node.Members.OfType<PropertyDeclarationSyntax>()
+                                .Where(property => IsAccessible(property.Modifiers))
+                                .Where(property => !IsIgnored(property.AttributeLists))
+                                .Select(ConvertProperty),
                 BaseClasses = new List<string>(),
             };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "csharp-models-to-typescript",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "title": "C# models to TypeScript",
   "author": "Jonathan Svenheden <[email protected]>",
   "license": "MIT",