サンプルのcommands.yamlを使うように修正

Author: sakastudio

CommandForgeGenerator.Tests/GenerateSampleTextCommand.cs

@@ -6,29 +6,32 @@ public partial class TextCommand : ICommandForgeCommand
         public const string Type = "text";
         public readonly CommandId CommandId;
 
-        public readonly string Character;
-        public readonly string? Body;
-        public readonly string? VoiceId;
+        public readonly string CharacterId;
+        public readonly bool IsOverrideCharacterName;
+        public readonly string? OverrideCharacterName;
+        public readonly string Body;
 
 
         public static TextCommand Create(int commandId, global::Newtonsoft.Json.Linq.JToken json)
         {
 
-            var Character = (string)json["character"];
-            var Body = json["body"] == null ? null : (string)json["body"];
-            var VoiceId = json["voiceId"] == null ? null : (string)json["voiceId"];
+            var CharacterId = (string)json["characterId"];
+            var IsOverrideCharacterName = (bool)json["isOverrideCharacterName"];
+            var OverrideCharacterName = json["overrideCharacterName"] == null ? null : (string)json["overrideCharacterName"];
+            var Body = (string)json["body"];
 
 
-            return new TextCommand(commandId, Character, Body, VoiceId);
+            return new TextCommand(commandId, CharacterId, IsOverrideCharacterName, OverrideCharacterName, Body);
         }
 
-        public TextCommand(int commandId, string Character, string? Body, string? VoiceId)
+        public TextCommand(int commandId, string CharacterId, bool IsOverrideCharacterName, string? OverrideCharacterName, string Body)
         {
             CommandId = (CommandId)commandId;
 
-        this.Character = Character;
+        this.CharacterId = CharacterId;
+        this.IsOverrideCharacterName = IsOverrideCharacterName;
+        this.OverrideCharacterName = OverrideCharacterName;
         this.Body = Body;
-        this.VoiceId = VoiceId;
 
         }
     }

CommandForgeGenerator.Tests/GenerateTestCode.cs

@@ -6,4 +6,5 @@ public class GenerateTestCode
 {
     // プロジェクトファイルに存在する GenerateSampleTextCommand.cs を取得する
     public static string TextCommandStr => File.ReadAllText("../../../GenerateSampleTextCommand.cs");
+    public static string YamlFileStr => File.ReadAllText("../../../sampleCommands.yaml");
 }

CommandForgeGenerator.Tests/Test.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Linq;
 using CommandForgeGenerator.Generator.CodeGenerate;
@@ -60,188 +61,16 @@ public void JsonParserTest()
     [Fact]
     public void GenerateTest()
     {
-        var yaml = GetSampleYaml();
+        var yaml = GenerateTestCode.YamlFileStr;
         var commandsSchema = CommandSemanticsLoader.GetCommandSemantics(yaml);
         var codeFiles = CodeGenerator.Generate(commandsSchema);
 
-        Assert.Equal(16, codeFiles.Count);
-        Assert.Equal(GenerateTestCode.TextCommandStr, codeFiles.FirstOrDefault(c => c.FileName == "TextCommand.g.cs").Code);
+        var file = codeFiles.FirstOrDefault(c => c.FileName == "TextCommand.g.cs").Code;
 
-        #region Internal
+        //File.WriteAllText("/Users/katsumi.sato/Desktop/a/TextCommand.g.cs", file);
 
-        string GetSampleYaml()
-        {
-            return """
-                   version: 1
-                   commands:
-                     - id: text
-                       label: テキスト
-                       description: 台詞を表示
-                       commandListLabelFormat: "{character}「{body}」"
-                       properties:
-                         character:
-                           type: enum
-                           options: ["キャラA", "キャラB", "キャラC", "キャラD", "先生", "店員"]
-                           required: true
-                         body:
-                           type: string
-                           multiline: true
-                         voiceId:
-                           type: string
-                           multiline: true
-                           required: false
-                   
-                     - id: emote
-                       label: エモート
-                       description: 立ち絵・表情切替
-                       commandListLabelFormat: "EMOTE: {character}, {emotion}"
-                       properties:
-                         character:
-                           type: enum
-                           options: ["キャラA", "キャラB", "キャラC", "キャラD", "先生", "店員"]
-                           required: true
-                         emotion:
-                           type: enum
-                           options: ["通常", "笑顔", "驚き", "怒り", "悲しみ", "困惑", "照れ", "恐怖", "喜び", "真剣"]
-                           required: true
-                   
-                     - id: wait
-                       label: 待機
-                       description: 指定秒数だけウェイト
-                       commandListLabelFormat: "WAIT: {seconds}"
-                       defaultBackgroundColor: '#57e317'
-                       properties:
-                         seconds:
-                           type: number
-                           default: 0.5
-                           constraints:
-                             min: 0
-                   
-                     - id: bgm
-                       label: BGM
-                       description: 背景音楽を変更
-                       commandListLabelFormat: "BGM: {track}, volume={volume}"
-                       properties:
-                         track:
-                           type: enum
-                           options: ["なし", "日常", "緊張", "悲しい", "楽しい", "神秘的", "アクション", "ロマンティック", "エンディング"]
-                           required: true
-                         volume:
-                           type: number
-                           default: 1.0
-                           constraints:
-                             min: 0
-                             max: 1.0
-                   
-                     - id: sound
-                       label: 効果音
-                       description: 効果音を再生
-                       commandListLabelFormat: "SOUND: {effect}, volume={volume}"
-                       properties:
-                         effect:
-                           type: enum
-                           options: ["ドア", "足音", "衝撃", "爆発", "鐘", "拍手", "警報", "雨", "雷", "風"]
-                           required: true
-                         volume:
-                           type: number
-                           default: 1.0
-                           constraints:
-                             min: 0
-                             max: 1.0
-                   
-                     - id: background
-                       label: 背景
-                       description: 背景画像を変更
-                       commandListLabelFormat: "BG: {scene}, effect={transition}"
-                       properties:
-                         scene:
-                           type: enum
-                           options: ["教室", "廊下", "体育館", "屋上", "公園", "駅", "カフェ", "自宅", "図書館", "商店街"]
-                           required: true
-                         transition:
-                           type: enum
-                           options: ["なし", "フェード", "ワイプ", "クロスフェード", "フラッシュ"]
-                           default: "なし"
-                   
-                     - id: camera
-                       label: カメラ
-                       description: カメラワークを指定
-                       commandListLabelFormat: "CAMERA: {action}, target={target}"
-                       properties:
-                         action:
-                           type: enum
-                           options: ["ズームイン", "ズームアウト", "パン左", "パン右", "シェイク", "フォーカス", "リセット"]
-                           required: true
-                         target:
-                           type: enum
-                           options: ["全体", "キャラA", "キャラB", "キャラC", "キャラD", "先生", "店員", "背景"]
-                           default: "全体"
-                   
-                     - id: choice
-                       label: 選択肢
-                       description: 選択肢を表示
-                       commandListLabelFormat: "CHOICE: {options}"
-                       properties:
-                         options:
-                           type: string
-                           multiline: true
-                           description: "選択肢を1行に1つずつ記述"
-                           required: true
-                         timeout:
-                           type: number
-                           default: 0
-                           description: "自動選択までの秒数（0で無制限）"
-                   
-                     - id: action
-                       label: アクション
-                       description: キャラクターのアクションを実行
-                       commandListLabelFormat: "ACTION: {character}, {action}"
-                       properties:
-                         character:
-                           type: enum
-                           options: ["キャラA", "キャラB", "キャラC", "キャラD", "先生", "店員"]
-                           required: true
-                         action:
-                           type: enum
-                           options: ["歩く", "走る", "座る", "立つ", "ジャンプ", "踊る", "倒れる", "手を振る", "指さす", "抱きしめる"]
-                           required: true
-                         direction:
-                           type: enum
-                           options: ["左", "右", "上", "下", "中央"]
-                           default: "中央"
-                   
-                     - id: narration
-                       label: ナレーション
-                       description: ナレーションテキストを表示
-                       commandListLabelFormat: "NARRATION: {text}"
-                       properties:
-                         text:
-                           type: string
-                           multiline: true
-                           required: true
-                         style:
-                           type: enum
-                           options: ["通常", "強調", "小さく", "斜体", "点滅"]
-                           default: "通常"
-                   
-                     - id: branch
-                       label: 分岐
-                       description: 他のコマンドを参照する分岐
-                       commandListLabelFormat: "BRANCH: Target {targetCommand}"
-                       defaultBackgroundColor: "#f9f0ff"
-                       properties:
-                         targetCommand:
-                           type: command
-                           required: true
-                           commandTypes: ["text", "narration"] # Only allow text and narration commands
-                         condition:
-                           type: string
-                           required: true
-                           multiline: true
-                   """;
-        }
 
-        #endregion
-
+        Assert.Equal(17, codeFiles.Count);
+        Assert.Equal(GenerateTestCode.TextCommandStr, codeFiles.FirstOrDefault(c => c.FileName == "TextCommand.g.cs").Code);
     }
 }