Skip to content

pocos namespaces are backed prefixed instead of postfixed #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 2 commits into from
Dec 2, 2024
Merged

pocos namespaces are backed prefixed instead of postfixed #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0eebd
the pocos namespaces are backed prefixed instead of postfixed
PTKu Nov 29, 2024
13b62c8
fixing integration testing
PTKu Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions cake/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,19 +170,34 @@ public override void Run(BuildContext context)
}
if (context.BuildParameters.TestLevel >= 3)
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf"));

context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf"));
// This must be run in a separate environment!
try
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf"));
}
catch
{
System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT");
}

try
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf"));
}
catch
{
System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT");
}
}


Expand Down
2 changes: 1 addition & 1 deletion src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/CsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ public static string CreateGenericSwapperMethodFromPlainer(string methodName, st
/// <returns>Fully qualified poco name for given declarations</returns>
public static string GetFullyQualifiedPocoName(this IDeclaration declaration)
{
return declaration.ContainingNamespace.FullyQualifiedName == "$GLOBAL" ? $"global::Pocos.{declaration.Name}" : $"{declaration.ContainingNamespace.FullyQualifiedName}.Pocos.{declaration.Name}";
return declaration.ContainingNamespace.FullyQualifiedName == "$GLOBAL" ? $"global::Pocos.{declaration.Name}" : $"Pocos.{declaration.ContainingNamespace.FullyQualifiedName}.{declaration.Name}";
}
}
33 changes: 8 additions & 25 deletions src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta
TypeCommAccessibility = eCommAccessibility.ReadOnly;
}


AddToSource($"namespace Pocos{{");

classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this));

var classDeclarations = this.Compilation.GetSemanticTree().Classes
Expand All @@ -82,7 +79,7 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta
.Any(p => p.FullyQualifiedName == classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.FullyQualifiedName);

if (isExtended)
AddToSource($" : {classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.GetFullyQualifiedPocoName()}");
AddToSource($" : {classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.FullyQualifiedName}");



Expand All @@ -101,8 +98,6 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta
classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this));
classDeclaration.Fields.ToList().ForEach(p => p.Accept(visitor, this));
AddToSource("}");

AddToSource("}"); // Close namespace
}

/// <inheritdoc />
Expand Down Expand Up @@ -200,9 +195,11 @@ public void CreateFile(IFileSyntax fileSyntax, IxNodeVisitor visitor)
fileSyntax.UsingDirectives
.Where(p => this.Compilation.GetSemanticTree().Namespaces.Select(p => p.FullyQualifiedName).Contains(p.QualifiedIdentifierList.GetText())))
{
AddToSource($"using {fileSyntaxUsingDirective.QualifiedIdentifierList.GetText()}.Pocos;");
AddToSource($"using Pocos.{fileSyntaxUsingDirective.QualifiedIdentifierList.GetText()};");
}
AddToSource("namespace Pocos {");
fileSyntax.Declarations.ToList().ForEach(p => p.Visit(visitor, this));
AddToSource("}");
}

/// <inheritdoc />
Expand All @@ -212,19 +209,9 @@ public void CreateConfigDeclaration(IConfigDeclarationSyntax configDeclarationSy
{
TypeCommAccessibility = eCommAccessibility.None;

if (configurationDeclaration.ContainingNamespace.FullyQualifiedName != "$GLOBAL")
{
AddToSource($"namespace {configurationDeclaration.ContainingNamespace.FullyQualifiedName}.Pocos{{");
}
else
{
AddToSource($"namespace Pocos{{");
}

AddToSource($"public partial class {Project.TargetProject.ProjectRootNamespace}TwinController{{");
configurationDeclaration.Variables.ToList().ForEach(p => p.Accept(visitor, this));
AddToSource("}");
AddToSource("}");// closing namespace
}

/// <inheritdoc />
Expand Down Expand Up @@ -333,9 +320,7 @@ public void CreateStructuredType(IStructTypeDeclarationSyntax structTypeDeclarat
IxNodeVisitor visitor)
{
TypeCommAccessibility = structuredTypeDeclaration.GetCommAccessibility(this);

AddToSource($"namespace Pocos{{");


AddToSource(
$"{structuredTypeDeclaration.AccessModifier.Transform()}partial class {structTypeDeclarationSyntax.Name.Text} : AXSharp.Connector.IPlain");
AddToSource("{");
Expand All @@ -344,8 +329,6 @@ public void CreateStructuredType(IStructTypeDeclarationSyntax structTypeDeclarat

structuredTypeDeclaration.Fields.ToList().ForEach(p => p.Accept(visitor, this));
AddToSource("}");

AddToSource("}"); // namespace closing
}

/// <inheritdoc />
Expand All @@ -369,13 +352,13 @@ public void CreateScalarTypeDeclaration(IScalarTypeDeclaration scalarTypeDeclara
/// <inheritdoc />
public void CreateClassDeclaration(IClassDeclaration classDeclaration, IxNodeVisitor data)
{
AddToSource(classDeclaration.GetFullyQualifiedPocoName());
AddToSource(classDeclaration.GetQualifiedName());
}

/// <inheritdoc />
public void CreateInterfaceDeclaration(IInterfaceDeclaration interfaceDeclaration, IxNodeVisitor visitor)
{
AddToSource(interfaceDeclaration.GetFullyQualifiedPocoName());
AddToSource(interfaceDeclaration.GetQualifiedName());
}

/// <inheritdoc />
Expand Down Expand Up @@ -404,7 +387,7 @@ public void CreateStringTypeDeclaration(IStringTypeDeclaration stringTypeDeclara
public void CreateStructuredType(IStructuredTypeDeclaration structuredTypeDeclaration, IxNodeVisitor visitor)
{
structuredTypeDeclaration.Pragmas.ToList().ForEach(p => p.Accept(visitor, this));
AddToSource($"{structuredTypeDeclaration.GetFullyQualifiedPocoName()}");
AddToSource($"{structuredTypeDeclaration.GetQualifiedName()}");
}

/// <inheritdoc />
Expand Down
Loading