Merge pull request #13 from DanKE123abc/dev

v1.3.1

Author: DanKE123abc

DanKeJson.Test/Program.cs

@@ -1,4 +1,6 @@
-Person person = new Person
+using DanKeJson;
+
+Person person = new Person
 {
     Name = "张三",
     Age = 30,
@@ -37,6 +39,13 @@
 
 string json = DanKeJson.JSON.ToJson(person);
 Person newperson = DanKeJson.JSON.ToData<Person>(json);
+string json5 = DanKeJson.JSON5.ToJson(newperson, new Json5Config
+{
+    AddCommaForObject = false,
+    AddCommaForArray = false,
+    KeyNameStyle = Json5Config.KeyNameType.WithoutQuotes,
+    StringQuoteStyle = Json5Config.StringQuoteType.SingleQuote,
+});
 
 Console.WriteLine(json);
 

DanKeJson/DanKeJson.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>DanKeJson</id>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <title>DanKeJson</title>
     <authors>DanKe</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

DanKeJson/JSON.cs

@@ -159,8 +159,7 @@ private static bool IsFilePath(string path)
                 }
             }
             return true;
-        }
-
+        }   
         private static object FromJson(JsonData json, Type type)
         {
             object dataclass = Activator.CreateInstance(type);
@@ -320,8 +319,7 @@ private static object FromJson(JsonData json, Type type)
                                 propertyInfo.SetValue(dataclass, ushortValue);
                                 break;
                             default:
-                                if (propertyType.IsGenericType &&
-                                    propertyType.GetGenericTypeDefinition() == typeof(List<>))
+                                if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition() == typeof(List<>))
                                 {
                                     Type listType = propertyType.GetGenericArguments()[0];
                                     if (listType == typeof(string))
@@ -464,7 +462,8 @@ private static object FromJson(JsonData json, Type type)
                                 }
                                 else if (propertyType.IsClass)
                                 {
-                                    var propertyValue = FromJson(json[propertyInfo.Name].ToString(), propertyType);
+                                    JsonData nextjson = ToData(json[propertyInfo.Name].json);
+                                    var propertyValue = FromJson(nextjson, propertyType);
                                     propertyInfo.SetValue(dataclass, propertyValue);
                                 }
 

README.md

@@ -39,6 +39,7 @@ DanKeJson 为了方便开发使用，添加了许多特性，包括但不限于
 
 - [ ]  解析器支持单行注释与多行注释
 - [ ]  支持日期格式
+- [ ]  支持更多 .net 版本
 - [X]  键名无需引号
 - [X]  字符串支持单引号
 - [X]  允许数组、对象的多余逗号
@@ -65,46 +66,46 @@ DanKeJson 为了方便开发使用，添加了许多特性，包括但不限于
 
 ## 在你的应用中安装 DanKeJson
 
-**[点击下载](https://www.nuget.org/api/v2/package/DanKeJson/1.3.0)**
+**[点击下载](https://www.nuget.org/api/v2/package/DanKeJson/1.3.1)**
 
 ### Package manager
 
 ```shell
-NuGet\Install-Package DanKeJson -Version 1.3.0
+NuGet\Install-Package DanKeJson -Version 1.3.1
 ```
 
 ### .NET CLI
 
 ```shell
-dotnet add package DanKeJson --version 1.3.0
+dotnet add package DanKeJson --version 1.3.1
 ```
 
 ### PackageReference
 
 ```xaml
-<PackageReference Include="DanKeJson" Version="1.3.0" />
+<PackageReference Include="DanKeJson" Version="1.3.1" />
 ```
 
 ### Paket CLI
 
 ```shell
-paket add DanKeJson --version 1.3.0
+paket add DanKeJson --version 1.3.1
 ```
 
 ### Script & Interactive
 
 ```c#
-#r "nuget: DanKeJson, 1.3.0"
+#r "nuget: DanKeJson, 1.3.1"
 ```
 
 ### Cake
 
 ```C#
 // Install DanKeJson as a Cake Addin
-#addin nuget:?package=DanKeJson&version=1.3.0
+#addin nuget:?package=DanKeJson&version=1.3.1
 
 // Install DanKeJson as a Cake Tool
-#tool nuget:?package=DanKeJson&version=1.3.0
+#tool nuget:?package=DanKeJson&version=1.3.1
 ```
 
 或者，只需复制目录`./publish/DanKeJson`到您自己项目的源代码树中，并将其与您的开发环境集成。

README_en.md

@@ -39,6 +39,7 @@ Deserialization:
 
 - [ ]  Parser support for single-line and multi-line comments
 - [ ]  Support for date formats
+- [ ]  Support more dotnet version
 - [X]  Allow key names without quotes
 - [X]  Support for single quotes in strings
 - [X]  Allow trailing commas in arrays and objects
@@ -65,46 +66,46 @@ Serialization:
 
 ## Using DanKeJson from an application
 
-**[Download package](https://www.nuget.org/api/v2/package/DanKeJson/1.3.0)**
+**[Download package](https://www.nuget.org/api/v2/package/DanKeJson/1.3.1)**
 
 ### Package manager
 
 ```shell
-NuGet\Install-Package DanKeJson -Version 1.3.0
+NuGet\Install-Package DanKeJson -Version 1.3.1
 ```
 
 ### .NET CLI
 
 ```shell
-dotnet add package DanKeJson --version 1.3.0
+dotnet add package DanKeJson --version 1.3.1
 ```
 
 ### PackageReference
 
 ```xaml
-<PackageReference Include="DanKeJson" Version="1.3.0" />
+<PackageReference Include="DanKeJson" Version="1.3.1" />
 ```
 
 ### Paket CLI
 
 ```shell
-paket add DanKeJson --version 1.3.0
+paket add DanKeJson --version 1.3.1
 ```
 
 ### Script & Interactive
 
 ```c#
-#r "nuget: DanKeJson, 1.3.0"
+#r "nuget: DanKeJson, 1.3.1"
 ```
 
 ### Cake
 
 ```C#
 // Install DanKeJson as a Cake Addin
-#addin nuget:?package=DanKeJson&version=1.3.0
+#addin nuget:?package=DanKeJson&version=1.3.1
 
 // Install DanKeJson as a Cake Tool
-#tool nuget:?package=DanKeJson&version=1.3.0
+#tool nuget:?package=DanKeJson&version=1.3.1
 ```
 
 Alternatively, just copy the whole tree of files under `./publish/DanKeJson` to your own project's source tree and integrate it with your development environment.