Primary ctor working

Saspect.Test/GeneratorTest.cs

@@ -1,10 +1,10 @@
 // avoid adding System usings here... yeah right.
 
-using System;
 using Autofac;
 using Autofac.Builder;
 using NUnit.Framework;
 using Saspect.Autofac;
+using Saspect.Test.Samples;
 using SharpTestsEx;
 using Sinjector;
 
@@ -17,9 +17,11 @@ public void ContainerSetup(IContainerSetupContext context)
 	{
 		context.AddService<AspectInterceptor>();
 
+		context.AddService<NestedClassSample.NestedClass>();
 		context.AddService<CtorSample>();
+		context.AddService<PrimaryCtorSample>();
 		context.AddService<DependencySample>();
-		context.AddService<Aspect1Attribute.Aspect1>();
+		context.AddService<Aspect1>();
 	}
 
 	public void ContainerRegistrationSetup<TLimit, TConcreteReflectionActivatorData, TRegistrationStyle>(IRegistrationBuilder<TLimit, TConcreteReflectionActivatorData, TRegistrationStyle> registration) where TConcreteReflectionActivatorData : ConcreteReflectionActivatorData
@@ -30,56 +32,23 @@ public void ContainerRegistrationSetup<TLimit, TConcreteReflectionActivatorData,
 	public IComponentContext Container;
 
 	[Test]
-	public void ShouldGenerateCtor()
+	public void ShouldManageNestedClass()
 	{
-		Container.Resolve<CtorSample>().AspectedMethod();
+		Container.Resolve<NestedClassSample.NestedClass>()
+			.Should().Be.OfType<NestedClassSample_NestedClassAspected>();
 	}
-
-	// [Test]
-	// public void ShouldGeneratePrimaryCtor()
-	// {
-	// 	Container.Resolve<PrimaryCtorSample>().AspectedMethod();
-	// }
 
-	public class CtorSample
+	[Test]
+	public void ShouldGenerateCtor()
 	{
-		public CtorSample(DependencySample injected)
-		{
-		}
-
-		[Aspect1]
-		public virtual void AspectedMethod()
-		{
-		}
+		Container.Resolve<CtorSample>()
+			.Should().Be.OfType<CtorSampleAspected>();
 	}
-	//
-	// public class PrimaryCtorSample(DependencySample injected)
-	// {
-	// 	[Aspect1]
-	// 	public virtual void AspectedMethod()
-	// 	{
-	// 	}
-	// }
 
-	public class Aspect1Attribute : AspectAttribute
+	[Test]
+	public void ShouldGeneratePrimaryCtor()
 	{
-		public Aspect1Attribute() : base(typeof(Aspect1))
-		{
-		}
-
-		public class Aspect1 : IAspect
-		{
-			public void OnBeforeInvocation(InvocationInfo invocation)
-			{
-			}
-
-			public void OnAfterInvocation(Exception exception, InvocationInfo invocation)
-			{
-			}
-		}
+		Container.Resolve<PrimaryCtorSample>()
+			.Should().Be.OfType<PrimaryCtorSampleAspected>();
 	}
-}
-
-public class DependencySample
-{
-}
+}

Saspect.Test/Samples/Aspect1.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Saspect.Test.Samples;
+
+public class Aspect1 : IAspect
+{
+	public void OnBeforeInvocation(InvocationInfo invocation)
+	{
+	}
+
+	public void OnAfterInvocation(Exception exception, InvocationInfo invocation)
+	{
+	}
+}

Saspect.Test/Samples/Aspect1Attribute.cs

@@ -0,0 +1,8 @@
+namespace Saspect.Test.Samples;
+
+public class Aspect1Attribute : AspectAttribute
+{
+	public Aspect1Attribute() : base(typeof(Aspect1))
+	{
+	}
+}

Saspect.Test/Samples/CtorSample.cs

@@ -0,0 +1,13 @@
+namespace Saspect.Test.Samples;
+
+public class CtorSample
+{
+	public CtorSample(DependencySample injected)
+	{
+	}
+
+	[Aspect1]
+	public virtual void AspectedMethod()
+	{
+	}
+}

Saspect.Test/Samples/DependencySample.cs

@@ -0,0 +1,3 @@
+namespace Saspect.Test.Samples;
+
+public class DependencySample;

Saspect.Test/Samples/NestedClassSample.cs

@@ -0,0 +1,12 @@
+namespace Saspect.Test.Samples;
+
+public class NestedClassSample
+{
+	public class NestedClass
+	{
+		[Aspect1]
+		public virtual void AspectedMethod()
+		{
+		}
+	}
+}

Saspect.Test/Samples/PrimaryCtorSample.cs

@@ -0,0 +1,9 @@
+namespace Saspect.Test.Samples;
+
+public class PrimaryCtorSample(DependencySample injected)
+{
+	[Aspect1]
+	public virtual void AspectedMethod()
+	{
+	}
+}

Saspect/GeneratorOutput.cs

@@ -137,15 +137,16 @@ private static void generateCtor(StringBuilder code, ClassDeclarationSyntax clas
 		code.Append($@"
 		public {className}");
 
-		var ctor = clasz.Members.OfType<ConstructorDeclarationSyntax>().FirstOrDefault();
+		var firstCtor = clasz.Members.OfType<ConstructorDeclarationSyntax>().FirstOrDefault();
+		var primaryCtor = clasz.ParameterList;
 
-		if (ctor == null)
+		if (firstCtor == null && primaryCtor == null)
 		{
 			code.Append($"(Saspect.AspectInterceptor interceptor)");
 			return;
 		}
 
-		var parameterz = ctor.ParameterList;
+		var parameterz = firstCtor?.ParameterList ?? primaryCtor;
 
 		var parameters = string.Join(", ",
 			parameterz.Parameters