fix(string): 修复JSONC转换中$schema和多行注释处理问题

Author: mudssky

psutils/modules/string.psm1

@@ -98,19 +98,34 @@ function Convert-JsoncToJson {
     # 读取JSONC文件内容
     $jsoncContent = Get-Content -Path $Path -Raw
 
-    # 移除单行注释 (//...)
-    $jsonContent = $jsoncContent -replace '(?m)\s*//.*$', ''
-
-    # 移除多行注释 (/*...*/)
+    # 初始化$jsonContent变量
+    $jsonContent = $jsoncContent
+
+    # 移除键名包含$schema的整行（最终修正版）
+    $jsonContent = $jsonContent -replace '(?m)^\s*"[^"]*?\$schema[^"]*"\s*:\s*".*?"[,\r\n]*\s*$', ''
+    Write-Debug "移除`$schema后:$jsonContent"
+    # 移除单行注释 (//...) 但排除字符串中的//
+    $jsonContent = $jsonContent -replace '(?m)(?<!"[^"]*)//.*$', ''
+    Write-Debug "移除单行注释后:$jsonContent"
+
+    # 移除行尾注释 (/*...*/)
+    # TODO
+    $jsonContent = $jsonContent -replace '(?m)/\*.*?\*/\s*$', ''
+    Write-Debug "移除行尾注释后:$jsonContent"
+
+    # 移除多行注释 (/*...*/) 
     $jsonContent = $jsonContent -replace '(?s)/\*.*?\*/', ''
-
+    Write-Debug "移除多行注释后:$jsonContent"
     # 移除尾随逗号
     $jsonContent = $jsonContent -replace ',\s*([}\]])', '$1'
+    Write-Debug "移除尾随逗号后:$jsonContent"
 
     # 转换内容为JSON对象以验证有效性
     if ( -not (Test-Json -Json $jsonContent -ErrorAction SilentlyContinue)) {
         Write-Debug '目前7.5.0版本，Test-Json无法处理包含$schema的json'
+        Write-Debug '暂未实现移除行尾注释的功能'
         Write-Error "转换失败: $_"
+        return
     }
 
     # 输出结果

psutils/tests/string.Tests.ps1

@@ -42,6 +42,23 @@ Describe "Convert-JsoncToJson 函数测试" {
 "@
         $testJsoncPath = "$TestDrive\test.jsonc"
         $testJsonc | Out-File -FilePath $testJsoncPath -Encoding utf8
+
+        # 新增带$schema的测试用例
+        $testJsoncWithSchema = @"
+{
+    "`$schema": "http://json-schema.org/draft-07/schema#",
+    // 带schema的配置
+    "name": "schema_test",
+    /**
+     * 测试多行需求**/
+    "config": {
+        "url": "http://example.com",  // URL注释
+        "path": "some//path"         // 包含//的字符串
+    }
+}
+"@
+        $testJsoncWithSchemaPath = "$TestDrive\test_with_schema.jsonc"
+        $testJsoncWithSchema | Out-File -FilePath $testJsoncWithSchemaPath -Encoding utf8
     }
 
     It "成功转换JSONC到JSON" {
@@ -73,4 +90,17 @@ Describe "Convert-JsoncToJson 函数测试" {
         Test-Path $outputPath | Should -Be $true
         Get-Content $outputPath -Raw | Should -Not -Match "//"
     }
+
+    It "正确处理包含$schema的JSONC文件" {
+        $result = Convert-JsoncToJson -Path $testJsoncWithSchemaPath -Debug
+        $result | Should -Not -BeNullOrEmpty
+        $result | ConvertFrom-Json | % { $_.name } | Should -Be "schema_test"
+        $result -match '\$schema' | Should -Be $false
+    }
+
+    It "保留字符串中的//不当作注释" {
+        $result = Convert-JsoncToJson -Path $testJsoncWithSchemaPath
+        $jsonObj = $result | ConvertFrom-Json
+        $jsonObj.config.path | Should -Be "some//path"
+    }
 }