Merge pull request #20 from DanKE123abc/dev

v1.4.3

Author: DanKE123abc

.github/workflows/myget-publish.yml

@@ -32,7 +32,7 @@ jobs:
         $nupkg = Get-ChildItem -Path .\artifacts\*.nupkg | Select-Object -First 1
         dotnet nuget push $nupkg.FullName --source "https://www.myget.org/F/danke/api/v2/package" --api-key ${{ secrets.MYGET_API_KEY }}
       shell: pwsh
-
+      
     - name: Get short commit hash
       id: commit-hash
       run: |
@@ -47,3 +47,4 @@ jobs:
         prerelease: true
         files: artifacts/*.nupkg
         body: "https://www.myget.org/feed/danke/package/nuget/DanKeJson"
+    

.github/workflows/nuget-publish.yml

@@ -44,10 +44,10 @@ jobs:
     - name: Publish to GitHub Release
       uses: softprops/action-gh-release@v2
       with:
-        tag_name: v${{ steps.commit-hash.outputs.version }}re
-        name: Release v${{ steps.commit-hash.outputs.version }}
+        tag_name: v${{ steps.package-version.outputs.version }}re
+        name: Release v${{ steps.package-version.outputs.version }}
         files: artifacts/*.nupkg
-        body: "https://www.nuget.org/packages/DanKeJson/${{ steps.commit-hash.outputs.version }}"
+        body: "https://www.nuget.org/packages/DanKeJson/${{ steps.package-version.outputs.version }}"
 
     - name: Create new branch from main
       run: |

DanKeJson.Demo/Program.cs

@@ -1,11 +1,30 @@
 using DanKeJson;
 
-var test1 = JSONL.LineToData("C:\\Users\\15860\\Downloads\\lora_medical.jsonl",80);
+var text =
+    "{\n  \"model\": \"gpt-3.5-turbo\",\n  \"messages\": [\n    {\"role\": \"system\", \"content\": \"你是一个助手\"},\n    {\"role\": \"user\", \"content\": \"你好！\"}\n  ],\n  \"temperature\": 0.7,\n  \"max_tokens\": 100,\n  \"stream\": false\n}";
 
-var test2 = JSONL.AllLineToData("C:\\Users\\15860\\Downloads\\lora_medical.jsonl");
-
-var test3 = JSONL.ListToJson(test2);
+var json = JSON.ToData<JsonRoot>(text);
 
 Console.WriteLine();
 
 
+public class JsonRoot
+{
+    [JsonProperty("model")]
+    public string Model { get;set; }
+    
+    public List<MessagesItem> messages { get;set; }
+    
+    public double temperature { get;set; }
+    
+    public int max_tokens { get;set; }
+    
+    public bool stream { get;set; }
+}
+
+public class MessagesItem
+{
+    public string role { get;set; }
+    
+    public string content { get;set; }
+}

DanKeJson.sln.DotSettings.user

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARuntimeType_002ECoreCLR_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fad1d58b8dd22123dfae3f2cf5d8b199992465c9c344d032f93a826d8e5539ff_003FRuntimeType_002ECoreCLR_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
 	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">INFO</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">C:\Program Files\dotnet\sdk\6.0.202\MSBuild.dll</s:String>

DanKeJson/DanKeJson.csproj

@@ -9,7 +9,7 @@
         <OutputPath>$(ProjectDir)lib\</OutputPath>
 
         <!-- NuGet 包元数据 -->
-        <Version>1.4.2</Version>
+        <Version>1.4.3</Version>
         <PackageId>DanKeJson</PackageId>
         <Title>DanKeJson</Title>
         <Authors>DanKe</Authors>

DanKeJson/JSON.cs

@@ -2,9 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Text;
-using System.Linq;
 using DanKeJson.Json;
 using DanKeJson.Utils;
 

DanKeJson/JSON5.cs

@@ -2,9 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Text;
-using System.Linq;
 using DanKeJson.Json5;
 using DanKeJson.Utils;
 

DanKeJson/JSONL.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
 using DanKeJson.Utils;
 
 namespace DanKeJson
@@ -13,14 +12,15 @@ public class JSONL
         /// <returns>JsonData</returns>
         public static List<JsonData> AllLineToData(string filePath)
         {
-            var jsonLines = new List<string>();
             var dataLines = new List<JsonData>();
             if (FilePathUtility.IsFilePath(filePath))
             {
-                jsonLines = FileLineReader.ReadAllLines(filePath);
+                var jsonLines = FileLineReader.ReadAllLines(filePath);
                 foreach (var l in jsonLines)
                 {
-                    dataLines.Add(JSON.ToData(l));
+                    // 添加空行检查
+                    if (string.IsNullOrWhiteSpace(l)) continue;
+                    dataLines.Add(JSON.ToData(l, true));
                 }
             }
             return dataLines;
@@ -34,14 +34,15 @@ public static List<JsonData> AllLineToData(string filePath)
         /// <returns>JsonData</returns>
         public static List<T> AllLineToData<T>(string filePath) where T : class, new()
         {
-            var jsonLines = new List<string>();
             var dataLines = new List<T>();
             if (FilePathUtility.IsFilePath(filePath))
             {
-                jsonLines = FileLineReader.ReadAllLines(filePath);
+                var jsonLines = FileLineReader.ReadAllLines(filePath);
                 foreach (var l in jsonLines)
                 {
-                    dataLines.Add(JSON.ToData<T>(l));
+                    // 添加空行检查
+                    if (string.IsNullOrWhiteSpace(l)) continue;
+                    dataLines.Add(JSON.ToData<T>(l, true));
                 }
             }
             return dataLines;
@@ -55,14 +56,15 @@ public static List<JsonData> AllLineToData(string filePath)
         /// <returns>JsonData</returns>
         public static JsonData LineToData(string filePath, int lineNumber)
         {
-            string jsonLine = null;
-            JsonData dataLine = null;
             if (FilePathUtility.IsFilePath(filePath))
             {
-                jsonLine = FileLineReader.ReadLine(filePath, lineNumber);
-                dataLine = JSON.ToData(jsonLine);
+                var jsonLine = FileLineReader.ReadLine(filePath, lineNumber);
+                if (!string.IsNullOrWhiteSpace(jsonLine))
+                {
+                    return JSON.ToData(jsonLine, true);
+                }
             }
-            return dataLine;
+            return null;
         }
 
         /// <summary>
@@ -74,17 +76,22 @@ public static JsonData LineToData(string filePath, int lineNumber)
         /// <returns>JsonData</returns>
         public static T LineToData<T>(string filePath, int lineNumber) where T : class, new()
         {
-            string jsonLine = null;
-            T dataLine = null;
             if (FilePathUtility.IsFilePath(filePath))
             {
-                jsonLine = FileLineReader.ReadLine(filePath, lineNumber);
-                dataLine = JSON.ToData<T>(jsonLine);
+                var jsonLine = FileLineReader.ReadLine(filePath, lineNumber);
+                if (!string.IsNullOrWhiteSpace(jsonLine))
+                {
+                    return JSON.ToData<T>(jsonLine, true);
+                }
             }
-            return dataLine;
+            return null;
         }
 
-
+        /// <summary>
+        /// Deserializing JsonData List to Json(String)
+        /// </summary>
+        /// <param name="jsonDataList">the JsonData list</param>
+        /// <returns></returns>
         public static string ListToJson(List<JsonData> jsonDataList)
         {
             if (jsonDataList == null)
@@ -99,7 +106,14 @@ public static string ListToJson(List<JsonData> jsonDataList)
             return string.Join("\n", jsonLines);
         }
 
-        public static string ListToJson(List<object> jsonDataList)
+        
+        /// <summary>
+        /// Deserializing Object List to Json(String)
+        /// </summary>
+        /// <param name="jsonDataList">the JsonData list</param>
+        /// <typeparam name="T">Class</typeparam>
+        /// <returns></returns>
+        public static string ListToJson<T>(List<T> jsonDataList) where T : class, new()
         {
             if (jsonDataList == null)
             {

DanKeJson/Json/Reader.cs

@@ -1,4 +1,7 @@
-#pragma warning disable CS8603
+using System.Globalization;
+using System.Text;
+
+#pragma warning disable CS8603
 
 namespace DanKeJson.Json
 {
@@ -24,25 +27,87 @@ public static JsonData ToString_Double(string json, ref int index)
                 return null;
             }
 
-            int start = index++;
-
-            while (index < json.Length && json[index] != '\"')
+            StringBuilder sb = new StringBuilder();
+            int start = index; // 记录起始位置
+            index++; // 跳过起始引号
+            
+            while (index < json.Length)
             {
-                index++;
-            }
+                char current = json[index];
+                
+                if (current == '\"')
+                {
+                    index++;
+                    return new JsonData(JsonData.Type.String)
+                    {
+                        json = sb.ToString()
+                    };
+                }
 
-            if (index >= json.Length)
-            {
-                return null;
-            }
+                // 4. 处理转义序列
+                if (current == '\\')
+                {
+                    index++; // 跳过反斜杠
+                    if (index >= json.Length) break; // 防止越界
 
-            return new JsonData(JsonData.Type.String)
-            {
-                json = json[start..(++index)]
-            };
+                    switch (json[index++]) // 处理转义字符并移动索引
+                    {
+                        case '\"':
+                            sb.Append('\"');
+                            break;
+                        case '\\':
+                            sb.Append('\\');
+                            break;
+                        case '/':
+                            sb.Append('/');
+                            break;
+                        case 'b':
+                            sb.Append('\b');
+                            break;
+                        case 'f':
+                            sb.Append('\f');
+                            break;
+                        case 'n':
+                            sb.Append('\n');
+                            break;
+                        case 'r':
+                            sb.Append('\r');
+                            break;
+                        case 't':
+                            sb.Append('\t');
+                            break;
+                        case 'u': // Unicode转义处理
+                            if (index + 4 <= json.Length)
+                            {
+                                string hex = json.Substring(index, 4);
+                                if (int.TryParse(hex, NumberStyles.HexNumber, null, out int code))
+                                {
+                                    sb.Append((char)code);
+                                }
+
+                                index += 4;
+                            }
+
+                            break;
+                        default: // 未知转义序列保持原样
+                            sb.Append('\\');
+                            sb.Append(json[index - 1]);
+                            break;
+                    }
+                }
+                else
+                {
+                    // 5. 普通字符直接添加
+                    sb.Append(current);
+                    index++;
+                }
+            }
 
+            // 6. 未找到结束引号（字符串未闭合）
+            return null;
         }
 
+
         public static JsonData ToBoolean(string json, ref int index)
         {
             if (index < 0)
@@ -174,7 +239,7 @@ public static JsonData ToObject(string json, ref int index)
             {
                 return null;
             }
-        
+
             int start = index++;
             JsonData obj = new JsonData(JsonData.Type.Object);
             do
@@ -206,34 +271,34 @@ public static JsonData ToObject(string json, ref int index)
                 {
                     return null;
                 }
-        
+
                 SkipWhiteSpace(json, ref index);
                 if (json[index] != ':')
                 {
                     return null;
                 }
-        
+
                 index++;
-        
+
                 SkipWhiteSpace(json, ref index);
                 JsonData sub = Serializer.ProcessJson(json, ref index);
                 if (sub == null)
                 {
                     return null;
                 }
-        
+
                 obj[key] = sub;
-        
+
                 SkipWhiteSpace(json, ref index);
-        
+
             } while (json[index] == ',');
-        
+
             if (json[index] == '}')
             {
                 obj.json = json[start..(++index)];
                 return obj;
             }
-        
+
             return null;
         }
 
@@ -273,7 +338,7 @@ public static JsonData ToArray(string json, ref int index)
             arr.json = json[start..index];
             return arr;
         }
-        
+
         public static JsonData ToNone(string json, ref int index)
         {
             if (index < 0)
@@ -311,4 +376,4 @@ public static int GetDistanceToNextComma(string json, ref int startIndex)
             return json.Length - startIndex - 1;
         }
     }
-}
+}