Implement syntax sugar for defining observable models using IL post-processing (see #4).

TinkStateSharp.sln

@@ -15,6 +15,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Unity", "projects
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Unity-Test", "projects\TinkState-Unity-Test\TinkState-Unity-Test.csproj", "{7CC48BB6-A797-449D-B681-44A364271C97}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Model", "projects\TinkState-Model\TinkState-Model.csproj", "{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Model-Weaver", "projects\TinkState-Model-Weaver\TinkState-Model-Weaver.csproj", "{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Model-Weaver-Unity", "projects\TinkState-Model-Weaver-Unity\TinkState-Model-Weaver-Unity.csproj", "{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinkState-Model-Weaver-Tool", "projects\TinkState-Model-Weaver-Tool\TinkState-Model-Weaver-Tool.csproj", "{E6F1F0D7-47AC-4986-A455-D32637E0A26B}"
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -88,11 +96,63 @@ Global
 		{7CC48BB6-A797-449D-B681-44A364271C97}.Release|x64.Build.0 = Release|Any CPU
 		{7CC48BB6-A797-449D-B681-44A364271C97}.Release|x86.ActiveCfg = Release|Any CPU
 		{7CC48BB6-A797-449D-B681-44A364271C97}.Release|x86.Build.0 = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|x64.Build.0 = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE}.Release|x86.Build.0 = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|x64.Build.0 = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0}.Release|x86.Build.0 = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|x64.Build.0 = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E}.Release|x86.Build.0 = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|x64.Build.0 = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6B383783-3B6F-4685-A506-1E502392E83B} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
 		{DA5CD7B7-76F9-4C6D-875D-36219E9D1086} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
 		{FBE6AC15-3025-45FA-A8EA-FBFD05A7B25F} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
 		{7CC48BB6-A797-449D-B681-44A364271C97} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
+		{05A279B3-BE32-44D6-90B2-EB1DE219B6FE} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
+		{2B3E252A-79C9-4190-B03A-CA2C4C4D79C0} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
+		{FD579783-E58A-4D86-8CF9-C52D3FE4D96E} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
+		{E6F1F0D7-47AC-4986-A455-D32637E0A26B} = {C6990338-31DB-4CD2-BC63-DA0C25A8F043}
 	EndGlobalSection
 EndGlobal

playground-unity/Assets/HelloWorld/HelloWorld.cs

@@ -1,25 +1,36 @@
-using TinkState;
+using TinkState.Model;
 using TMPro;
 using UnityEngine;
 
+class Player : Model
+{
+	[Observable] public string Name { get; set; }
+	[Observable] public int Age { get; set; }
+}
+
+class GreetingViewModel : Model
+{
+	[Observable] public Player Player { get; set; }
+
+	[Observable] public string Greeting => $"Hello, {Player.Name}!";
+}
+
 public class HelloWorld : MonoBehaviour
 {
 	[SerializeField] TMP_InputField nameInput;
 	[SerializeField] TMP_Text greetingLabel;
 
 	void Start()
 	{
-		// define piece of mutable observable state
-		var name = Observable.State("World");
+		var player = new Player {Name = "Dan"};
+		var greetingViewModel = new GreetingViewModel {Player = player};
 
-		// bind the state two-ways to an input field
-		name.Bind(nameInput.SetTextWithoutNotify);
-		nameInput.onValueChanged.AddListener(newValue => name.Value = newValue);
+		var greeting = greetingViewModel.GetObservable(m => m.Greeting);
+		var name = player.GetObservable(p => p.Name);
 
-		// derive automatically updated observable value from it
-		var greeting = Observable.Auto(() => $"Hello, {name.Value}!");
+		name.Bind(nameInput.SetTextWithoutNotify);
+		nameInput.onValueChanged.AddListener(newValue => player.Name = newValue);
 
-		// bind the auto-observable to a text field
 		greeting.Bind(text => greetingLabel.text = text);
 	}
 }

playground-unity/Packages/packages-lock.json

@@ -32,6 +32,13 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.mono-cecil": {
+      "version": "1.11.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
       "version": "2.0.1-exp.2",
       "depth": 0,
@@ -65,7 +72,9 @@
       "version": "file:../../src",
       "depth": 0,
       "source": "local",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.nuget.mono-cecil": "1.11.4"
+      }
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

playground/Playground.cs

@@ -1,35 +1,17 @@
 using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using TinkState;
+using TinkState.Model;
+
+class MyModel : Model
+{
+	[Observable] public string Name { get; set; }
+}
 
 class Playground
 {
-    static async Task Main()
+    static void Main()
     {
-        var stateA = Observable.State("hello");
-        var stateB = Observable.State("world");
-
-        var o = Observable.Auto(async () =>
-        {
-            Console.WriteLine("computing");
-            var a = stateA.Value;
-            await Task.Delay(1000);
-            var b = stateB.Value;
-            return a + " " + b;
-        });
-
-        o.Bind(result => Console.WriteLine(result.Status switch
-        {
-            AsyncComputeStatus.Loading => "Loading...",
-            AsyncComputeStatus.Done => "Done: " + result.Result,
-            AsyncComputeStatus.Failed => "Failed: " + result.Exception,
-        }));
-
-        await Task.Delay(1500);
-
-        stateB.Value = "Dan";
-
-        Process.GetCurrentProcess().WaitForExit();
+	    var model = new MyModel {Name = "Dan"};
+	    var obs = model.GetObservable(_ => _.Name);
+	    obs.Bind(name => Console.WriteLine("Name is: " + name));
     }
 }

playground/Playground.csproj

@@ -6,7 +6,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="../projects/TinkState/TinkState.csproj" />
+		<ProjectReference Include="../projects/TinkState/TinkState.csproj"/>
+		<ProjectReference Include="../projects/TinkState-Model/TinkState-Model.csproj"/>
 	</ItemGroup>
 
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command="$(MSBuildThisFileDirectory)/../projects/TinkState-Model-Weaver-Tool/bin/$(ConfigurationName)/net6.0/TinkState-Model-Weaver-Tool.exe $(TargetPath)"/>
+		<Error Condition="$(ExitCode) == 1"/>
+	</Target>
+
 </Project>

projects/TinkState-Model-Weaver-Tool/TinkState-Model-Weaver-Tool.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>9.0</LangVersion>
+	</PropertyGroup>
+	<PropertyGroup>
+		<EnableDefaultItems>false</EnableDefaultItems>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="../../src-weaver/**/*.cs"/>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="../TinkState-Model-Weaver/TinkState-Model-Weaver.csproj"/>
+	</ItemGroup>
+
+</Project>

projects/TinkState-Model-Weaver-Unity/TinkState-Model-Weaver-Unity.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>9.0</LangVersion>
+		<AssemblyName>Unity.TinkState.Model.CodeGen</AssemblyName>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<EnableDefaultItems>false</EnableDefaultItems>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="../../src/TinkState-Model-Weaver-Unity/Editor/**/*.cs"/>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Reference Include="Unity.CompilationPipeline.Common">
+			<HintPath>../../unity-dlls/Unity.CompilationPipeline.Common.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<ProjectReference Include="../TinkState-Model-Weaver/TinkState-Model-Weaver.csproj"/>
+	</ItemGroup>
+
+</Project>

projects/TinkState-Model-Weaver/TinkState-Model-Weaver.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>9.0</LangVersion>
+		<AssemblyName>Nadako.TinkState.Model.Weaver</AssemblyName>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<EnableDefaultItems>false</EnableDefaultItems>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="../../src/TinkState-Model-Weaver/**/*.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+	</ItemGroup>
+
+</Project>

projects/TinkState-Model/TinkState-Model.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>9.0</LangVersion>
+		<AssemblyName>Nadako.TinkState.Model</AssemblyName>
+	</PropertyGroup>
+	<PropertyGroup>
+		<EnableDefaultItems>false</EnableDefaultItems>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="../../src/TinkState-Model/Runtime/**/*.cs"/>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="../TinkState/TinkState.csproj"/>
+	</ItemGroup>
+
+</Project>

src-weaver/TinkStateModelWeaver.cs

@@ -0,0 +1,55 @@
+using System;
+using Mono.Cecil;
+using System.IO;
+using TinkState.Model.Weaver;
+using Logger = TinkState.Model.Weaver.Logger;
+
+namespace TinkState.Model
+{
+	public class TinkStateModelWeaver
+	{
+		class ConsoleLogger : Logger
+		{
+			public void Debug(string message)
+			{
+				Console.WriteLine(message);
+			}
+
+			public void Error(string message, string file, int line, int column)
+			{
+				Console.WriteLine("ERROR: " + message);
+			}
+		}
+
+		static void Main(string[] args)
+		{
+			var assemblyPath = args[0];
+
+			var logger = new ConsoleLogger();
+			logger.Debug("Processing " + assemblyPath);
+
+			var resolver = new DefaultAssemblyResolver();
+			resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyPath));
+
+			var readParams = new ReaderParameters
+			{
+				ReadWrite = true,
+				ReadSymbols = true,
+				AssemblyResolver = resolver,
+			};
+			var module = ModuleDefinition.ReadModule(assemblyPath, readParams);
+
+			if (ModelWeaver.Weave(module, logger, out var modified))
+			{
+				if (modified)
+				{
+					var writeParameters = new WriterParameters
+					{
+						WriteSymbols = true
+					};
+					module.Write(writeParameters);
+				}
+			}
+		}
+	}
+}

src/TinkState-Model-Weaver-Unity/Editor/Unity.TinkState.Model.CodeGen.asmdef

@@ -0,0 +1,11 @@
+{
+  "name": "Unity.TinkState.Model.CodeGen",
+  "references": [
+	"Nadako.TinkState.Model.Weaver"
+  ],
+  "includePlatforms": [
+	"Editor"
+  ],
+  "excludePlatforms": [],
+  "autoReferenced": false
+}