scancscode 1.0.40 → 1.0.41

package/dist/src/CSVUtils.js

@@ -175,6 +175,9 @@ class CSVUtils {
             let csvUtils = new CSVUtils(filePath);
             let rows0 = await csvUtils.parseCsv();
             let header = rows0[0];
+            if (header.findIndex(title => title == null || title.match(/^Column\d+$/)) >= 0) {
+                console.warn(`文件 ${filePath} 包含 Column 列, 请检查title是否正确: ${header}`);
+            }
             if (rows2.length == 0) {
                 rows2.push([header[0], ...langs]);
             }

package/dist/src/CSharpStringExtractor.js

@@ -1788,6 +1788,13 @@ class CSharpStringExtractor {
                 const falseBranch = falseBranchMatch[1];
                 let processedTrueBranch = trueBranch;
                 let processedFalseBranch = falseBranch;
+                const trueBranchTrimmed = trueBranch.trim();
+                if (!trueBranchTrimmed.includes(`${trClass}.${trFormatMethod}(`) && !trueBranchTrimmed.endsWith(`.${trMethod}()`)) {
+                    const whitespaceBefore = trueBranch.substring(0, trueBranch.search(/\S/));
+                    const actualPart = trueBranch.substring(trueBranch.search(/\S/));
+                    const whitespaceAfter = actualPart.search(/\s*$/) === 0 ? actualPart : actualPart.substring(actualPart.search(/\S/) + trueBranchTrimmed.length);
+                    processedTrueBranch = whitespaceBefore + trueBranchTrimmed + `.${trMethod}()` + whitespaceAfter;
+                }
                 const falseBranchTrimmed = falseBranch.trim();
                 if (!falseBranchTrimmed.includes(`${trClass}.${trFormatMethod}(`) && !falseBranchTrimmed.endsWith(`.${trMethod}()`)) {
                     const whitespaceBefore = falseBranch.substring(0, falseBranch.search(/\S/));

package/dist/src/CmdExecutor.js

@@ -69,11 +69,14 @@ class CmdExecutor {
         await literalCollector.convert(cscodedir, configdir, outcsv, langs, trmethod, scanonly, verbose);
         console.log("convert done.");
     }
-    static testSlimCsv() {
-        let inCsvFile = ["E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"];
-        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv";
-        let langs = ["zh_cn"];
-        CSVUtils_1.CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
+    static async testSlimCsv() {
+        let inCsvFile = [
+            "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Editor/Translation/Auto.csv",
+            "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Editor/Translation/Manual.csv",
+        ];
+        let outCsvFile = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/GameConfigs/Translation/ScriptTrans.csv";
+        let langs = ["zh_hk"];
+        await CSVUtils_1.CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
         // node bin/slimlangs.js --incsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv --outcsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv --langs zh_cn
     }
     static async runSlimCsvWithLangs() {

package/dist/test/CSharpStringExtractor.test.js

@@ -2562,7 +2562,7 @@ namespace FaBao
         }
     });
     // 测试`m_btn_xxx.title = yyy;` 形式的赋值语句要和`xxx.text = yyy;`形式的赋值语句完全等同处理
-    test('should handle .text = assignments contains chinese', () => {
+    test('should handle m_btn_xxx.title = yyy assignments contains chinese', () => {
         const code = `
             switch (_roomData.RoomState)
             {
@@ -2628,4 +2628,60 @@ namespace FaBao
             ]);
         }
     });
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 1', () => {
+        const code = `m_btn_confirm.title = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中".TR() : "使用".TR()');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 2', () => {
+        const code = `wefe.text = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中".TR() : "使用".TR()');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 3', () => {
+        const code = `wefetext = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 4', () => {
+        const code = `wefetext(isUsed ? "使用中" : "使用");`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
 });

package/dist/test/TestConvert.test.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const CmdExecutor_1 = require("../src/CmdExecutor");
 describe('TestCmdExecutor', () => {
     test("test convert", async () => {
-        await CmdExecutor_1.CmdExecutor.testConvert();
+        // await CmdExecutor.testConvert();
+        expect(true).toBe(true);
+    }, 50000);
+    test("test slim", async () => {
+        await CmdExecutor_1.CmdExecutor.testSlimCsv();
         expect(true).toBe(true);
     }, 50000);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scancscode",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "",
   "main": "./dist/index.js",
   "bin": {

package/src/CSVUtils.ts

@@ -110,10 +110,10 @@ export class CSVUtils {
     static async updateToFile(filePath: string, literals: string[], langs: string[]) {
         let csvUtils = new CSVUtils(filePath);
         let rows0 = await csvUtils.parseCsv();
-        
+
         // 优化：使用Set去重，减少重复处理
         const uniqueLiterals = [...new Set(literals)];
-        
+
         let rows2 = csvUtils.merge(rows0, uniqueLiterals, langs);
         await CSVUtils.writeCsv(filePath, rows2);
         console.log(`已经更新多语言表: ${filePath} , 共有 ${rows2.length - 1} 条目`);
@@ -139,6 +139,9 @@ export class CSVUtils {
             let csvUtils = new CSVUtils(filePath);
             let rows0 = await csvUtils.parseCsv();
             let header = rows0[0];
+            if (header.findIndex(title => title == null || title.match(/^Column\d+$/)) >= 0) {
+                console.warn(`文件 ${filePath} 包含 Column 列, 请检查title是否正确: ${header}`)
+            }
             if (rows2.length == 0) {
                 rows2.push([header[0], ...langs]);
             }

package/src/CSharpStringExtractor.ts

@@ -1976,6 +1976,15 @@ private findMatchingParenthesis(str: string, openIndex: number): number {
                 const falseBranch = falseBranchMatch[1];
                 let processedTrueBranch = trueBranch;
                 let processedFalseBranch = falseBranch;
+                
+                const trueBranchTrimmed = trueBranch.trim();
+                if (!trueBranchTrimmed.includes(`${trClass}.${trFormatMethod}(`) && !trueBranchTrimmed.endsWith(`.${trMethod}()`)) {
+                    const whitespaceBefore = trueBranch.substring(0, trueBranch.search(/\S/));
+                    const actualPart = trueBranch.substring(trueBranch.search(/\S/));
+                    const whitespaceAfter = actualPart.search(/\s*$/) === 0 ? actualPart : actualPart.substring(actualPart.search(/\S/) + trueBranchTrimmed.length);
+                    processedTrueBranch = whitespaceBefore + trueBranchTrimmed + `.${trMethod}()` + whitespaceAfter;
+                }
+                
                 const falseBranchTrimmed = falseBranch.trim();
                 if (!falseBranchTrimmed.includes(`${trClass}.${trFormatMethod}(`) && !falseBranchTrimmed.endsWith(`.${trMethod}()`)) {
                     const whitespaceBefore = falseBranch.substring(0, falseBranch.search(/\S/));

package/src/CmdExecutor.ts

@@ -68,11 +68,14 @@ export class CmdExecutor {
         await literalCollector.convert(cscodedir, configdir, outcsv, langs, trmethod, scanonly, verbose)
         console.log("convert done.")
     }
-    static testSlimCsv() {
-        let inCsvFile = ["E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv"]
-        let outCsvFile = "E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv"
-        let langs = ["zh_cn"];
-        CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
+    static async testSlimCsv() {
+        let inCsvFile = [
+            "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Editor/Translation/Auto.csv",
+            "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Editor/Translation/Manual.csv",
+        ]
+        let outCsvFile = "E:/DATA/Projects/ZhiYou/ProjectFClient/GameClient/Assets/Bundles/GameConfigs/Translation/ScriptTrans.csv"
+        let langs = ["zh_hk"];
+        await CSVUtils.slimCsvWithLangs(inCsvFile, outCsvFile, langs);
         // node bin/slimlangs.js --incsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello.csv --outcsv E:/DATA/Projects/e-gbl-client/client/Assets/Bundles/GameConfigs/Translation/hello-out.csv --langs zh_cn
     }
     static async runSlimCsvWithLangs() {

package/test/CSharpStringExtractor.test.ts

@@ -2803,7 +2803,7 @@ namespace FaBao
     });
 
     // 测试`m_btn_xxx.title = yyy;` 形式的赋值语句要和`xxx.text = yyy;`形式的赋值语句完全等同处理
-    test('should handle .text = assignments contains chinese', () => {
+    test('should handle m_btn_xxx.title = yyy assignments contains chinese', () => {
         const code = `
             switch (_roomData.RoomState)
             {
@@ -2870,4 +2870,64 @@ namespace FaBao
         }
     });
 
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 1', () => {
+        const code = `m_btn_confirm.title = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中".TR() : "使用".TR()');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 2', () => {
+        const code = `wefe.text = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中".TR() : "使用".TR()');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 3', () => {
+        const code = `wefetext = isUsed ? "使用中" : "使用";`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+
+    // 测试三元表达式中的字符串表达式处理
+    test('should handle thriple expression with string expression 4', () => {
+        const code = `wefetext(isUsed ? "使用中" : "使用");`;
+        const snippets = extractor.extractStrings(code);
+        {
+            let snippet = snippets[0];
+            expect(snippet.originalCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.convertedCode).toBe('isUsed ? "使用中" : "使用"');
+            expect(snippet.literals).toEqual([
+                '使用中',
+                '使用'
+            ]);
+        }
+    });
+
 });

package/test/TestConvert.test.ts

@@ -2,7 +2,12 @@ import { CmdExecutor } from "../src/CmdExecutor";
 
 describe('TestCmdExecutor', () => {
     test("test convert", async () => {
-        await CmdExecutor.testConvert();
+        // await CmdExecutor.testConvert();
+        expect(true).toBe(true);
+    }, 50000);
+
+    test("test slim", async () => {
+        await CmdExecutor.testSlimCsv()
         expect(true).toBe(true);
     }, 50000);
 });