Small Cleanups (#261)

* Start cleanup
* dont send list when disabled
* Fix up C# new value types

Samples/Cpp/ConsoleApplication/PackageLock.sml

@@ -7,7 +7,7 @@ Closures: {
 	}
 	Build0: {
 		Wren: {
-			'mwasplund|Soup.Cpp': { Version: '0.12.0' }
+			'mwasplund|Soup.Cpp': { Version: '0.13.0' }
 		}
 	}
 	Tool0: {

Samples/Cpp/ConsoleApplication/Recipe.sml

@@ -1,7 +1,4 @@
 Name: 'Samples.Cpp.ConsoleApplication'
 Language: (C++@0)
 Type: 'Executable'
-Version: 1.0.0
-Source: [
-	'Main.cpp'
-]
+Version: 1.0.0

Scripts/Windows/build-view.cmd

@@ -8,7 +8,7 @@ SET SWhereDir=%SourceDir%\GenerateSharp\SoupView
 SET OutDir=%RootDir%\out
 
 REM - Cleanup old publish to work around bug in publish
-rmdir /S /Q %OutDir%\msbuild\bin\SoupView\Release\net8.0\win-x64\publish\
+rmdir /S /Q %OutDir%\msbuild\bin\SoupView\%Flavor%\net8.0\win-x64\publish\
 
 REM - Build SWhere tool
 echo dotnet publish %SWhereDir% -c %Flavor% -f net8.0 -r win-x64 --self-contained

Source/Client/Core/Source/Build/BuildEvaluateEngine.h

@@ -386,8 +386,14 @@ namespace Soup::Core
 			environment.emplace("TMP", temporaryDirectory.ToString());
 
 			// Allow access to the declared inputs/outputs
-			auto allowedReadAccess = _fileSystemState.GetFilePaths(operationInfo.ReadAccess);
-			auto allowedWriteAccess = _fileSystemState.GetFilePaths(operationInfo.WriteAccess);
+			bool enableAccessChecks = true;
+			auto allowedReadAccess = std::vector<Path>();
+			auto allowedWriteAccess = std::vector<Path>();
+			if (enableAccessChecks)
+			{
+				allowedReadAccess = _fileSystemState.GetFilePaths(operationInfo.ReadAccess);
+				allowedWriteAccess = _fileSystemState.GetFilePaths(operationInfo.WriteAccess);
+			}
 
 			// Allow access to the global overrides
 			std::copy(globalAllowedReadAccess.begin(), globalAllowedReadAccess.end(), std::back_inserter(allowedReadAccess));
@@ -400,7 +406,6 @@ namespace Soup::Core
 			for (auto& file : allowedWriteAccess)
 				Log::Diag(file.ToString());
 
-			bool enableAccessChecks = true;
 			std::shared_ptr<System::IProcess> process = nullptr;
 			if (_disableMonitor)
 			{
@@ -419,8 +424,8 @@ namespace Soup::Core
 					environment,
 					callback,
 					enableAccessChecks,
-					allowedReadAccess,
-					allowedWriteAccess);
+					std::move(allowedReadAccess),
+					std::move(allowedWriteAccess));
 			}
 
 			process->Start();

Source/Directory.Build.props

@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Source/GenerateSharp/SoupView/ViewModels/MainWindowViewModel.cs

@@ -78,7 +78,7 @@ public MainWindowViewModel(string? packagePath)
 
 		if (packagePath is not null)
 		{
-			RecipeFile = new Path(packagePath);
+			RecipeFile = Path.Parse(packagePath);
 		}
 	}
 

Source/GenerateSharp/SoupView/ViewModels/TaskDetailsViewModel.cs

@@ -71,8 +71,18 @@ private void BuildValueTable(
 					type = ValueTableItemType.Table;
 					BuildValueTable(value.Value.AsTable(), children);
 					break;
-				case ValueType.Empty:
-					throw new NotImplementedException();
+				case ValueType.Version:
+					title = $"{value.Key}: {value.Value}";
+					type = ValueTableItemType.Value;
+					break;
+				case ValueType.PackageReference:
+					title = $"{value.Key}: {value.Value}";
+					type = ValueTableItemType.Value;
+					break;
+				case ValueType.LanguageReference:
+					title = $"{value.Key}: {value.Value}";
+					type = ValueTableItemType.Value;
+					break;
 				default:
 					throw new InvalidOperationException("Unknown Value type");
 			}
@@ -125,8 +135,18 @@ private void BuildValueList(
 					type = ValueTableItemType.Table;
 					BuildValueTable(value.AsTable(), children);
 					break;
-				case ValueType.Empty:
-					throw new NotImplementedException();
+				case ValueType.Version:
+					title = $"{value}";
+					type = ValueTableItemType.Value;
+					break;
+				case ValueType.PackageReference:
+					title = $"{value}";
+					type = ValueTableItemType.Value;
+					break;
+				case ValueType.LanguageReference:
+					title = $"{value}";
+					type = ValueTableItemType.Value;
+					break;
 				default:
 					throw new InvalidOperationException("Unknown Value type");
 			}

Source/GenerateSharp/Utilities/ValueTable/Value.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
+using Opal;
 using System;
 using System.Globalization;
 
@@ -19,12 +20,6 @@ private Value(ValueType type, object? rawValue)
 		RawValue = rawValue;
 	}
 
-	public Value()
-	{
-		Type = ValueType.Empty;
-		RawValue = null;
-	}
-
 	public Value(bool value)
 	{
 		Type = ValueType.Boolean;
@@ -61,6 +56,24 @@ public Value(ValueList value)
 		RawValue = value;
 	}
 
+	public Value(SemanticVersion value)
+	{
+		Type = ValueType.Version;
+		RawValue = value;
+	}
+
+	public Value(LanguageReference value)
+	{
+		Type = ValueType.LanguageReference;
+		RawValue = value;
+	}
+
+	public Value(PackageReference value)
+	{
+		Type = ValueType.PackageReference;
+		RawValue = value;
+	}
+
 	public Value Clone()
 	{
 		return new Value(Type, RawValue);
@@ -144,6 +157,45 @@ public bool AsBoolean()
 			throw new InvalidOperationException("Attempt to get value as incorrect type: Boolean");
 	}
 
+	public bool IsVersion()
+	{
+		return Type == ValueType.Version;
+	}
+
+	public SemanticVersion AsVersion()
+	{
+		if (IsVersion() && RawValue is SemanticVersion result)
+			return result;
+		else
+			throw new InvalidOperationException("Attempt to get value as incorrect type: Version");
+	}
+
+	public bool IsLanguageReference()
+	{
+		return Type == ValueType.LanguageReference;
+	}
+
+	public LanguageReference AsLanguageReference()
+	{
+		if (IsLanguageReference() && RawValue is LanguageReference result)
+			return result;
+		else
+			throw new InvalidOperationException("Attempt to get value as incorrect type: LanguageReference");
+	}
+
+	public bool IsPackageReference()
+	{
+		return Type == ValueType.PackageReference;
+	}
+
+	public PackageReference AsPackageReference()
+	{
+		if (IsPackageReference() && RawValue is PackageReference result)
+			return result;
+		else
+			throw new InvalidOperationException("Attempt to get value as incorrect type: PackageReference");
+	}
+
 	public override string ToString()
 	{
 		return Type switch
@@ -154,7 +206,9 @@ public override string ToString()
 			ValueType.Integer => AsInteger().ToString(CultureInfo.InvariantCulture),
 			ValueType.Float => AsFloat().ToString(CultureInfo.InvariantCulture),
 			ValueType.Boolean => AsBoolean().ToString(),
-			ValueType.Empty => string.Empty,
+			ValueType.Version => AsVersion().ToString(),
+			ValueType.PackageReference => AsPackageReference().ToString(),
+			ValueType.LanguageReference => AsLanguageReference().ToString(),
 			_ => "UNKNOWN",
 		};
 	}

Source/GenerateSharp/Utilities/ValueTable/ValueTableReader.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
+using Opal;
 using System;
 
 namespace Soup.Build.Utilities;
@@ -66,7 +67,9 @@ private static Value ReadValue(System.IO.BinaryReader reader)
 			ValueType.Integer => new Value(reader.ReadInt64()),
 			ValueType.Float => new Value(reader.ReadDouble()),
 			ValueType.Boolean => new Value(ReadBoolean(reader)),
-			ValueType.Empty => throw new NotImplementedException(),
+			ValueType.Version => new Value(ReadVersion(reader)),
+			ValueType.PackageReference => new Value(ReadPackageReference(reader)),
+			ValueType.LanguageReference => new Value(ReadLanguageReference(reader)),
 			_ => throw new InvalidOperationException("Unknown ValueType"),
 		};
 	}
@@ -121,4 +124,22 @@ private static string ReadString(System.IO.BinaryReader reader)
 
 		return new string(result);
 	}
+
+	private static SemanticVersion ReadVersion(System.IO.BinaryReader reader)
+	{
+		var result = ReadString(reader);
+		return SemanticVersion.Parse(result);
+	}
+
+	private static LanguageReference ReadLanguageReference(System.IO.BinaryReader reader)
+	{
+		var result = ReadString(reader);
+		return LanguageReference.Parse(result);
+	}
+
+	private static PackageReference ReadPackageReference(System.IO.BinaryReader reader)
+	{
+		var result = ReadString(reader);
+		return PackageReference.Parse(result);
+	}
 }

Source/GenerateSharp/Utilities/ValueTable/ValueTableWriter.cs

@@ -54,7 +54,14 @@ private static void WriteValue(BinaryWriter writer, Value value)
 			case ValueType.Boolean:
 				WriteValue(writer, value.AsBoolean());
 				break;
-			case ValueType.Empty:
+			case ValueType.Version:
+				WriteValue(writer, value.AsVersion().ToString());
+				break;
+			case ValueType.LanguageReference:
+				WriteValue(writer, value.AsLanguageReference().ToString());
+				break;
+			case ValueType.PackageReference:
+				WriteValue(writer, value.AsPackageReference().ToString());
 				break;
 			default:
 				throw new InvalidOperationException("Unknown ValueType");

Source/GenerateSharp/Utilities/ValueTable/ValueType.cs

@@ -41,7 +41,17 @@ public enum ValueType
 	Boolean = 6,
 
 	/// <summary>
-	/// Empty
+	/// Version
 	/// </summary>
-	Empty = 7,
+	Version = 7,
+
+	/// <summary>
+	/// PackageReference
+	/// </summary>
+	PackageReference = 8,
+
+	/// <summary>
+	/// LanguageReference
+	/// </summary>
+	LanguageReference = 9,
 }

Source/Monitor/Client/FileSystemAccessSandbox.h

@@ -75,9 +75,9 @@ namespace Monitor
 				return true;
 
 			auto normalizedFileName = NormalizePath(fileName);
-			for (const auto& allowedDiractory : m_allowedReadDirectories)
+			for (const auto& allowedDirectory : m_allowedReadDirectories)
 			{
-				if (IsUnderDirectory(normalizedFileName, allowedDiractory))
+				if (IsUnderDirectory(normalizedFileName, allowedDirectory))
 					return true;
 			}
 

Source/Monitor/Host/IMonitorProcessManager.h

@@ -46,8 +46,8 @@ namespace Monitor
 			const std::map<std::string, std::string>& environmentVariables,
 			std::shared_ptr<IMonitorCallback> callback,
 			bool enableAccessChecks,
-			const std::vector<Path>& allowedReadAccess,
-			const std::vector<Path>& allowedWriteAccess) = 0;
+			std::vector<Path> allowedReadAccess,
+			std::vector<Path> allowedWriteAccess) = 0;
 
 	private:
 		static std::shared_ptr<IMonitorProcessManager> _current;

Source/Monitor/Host/Linux/LinuxMonitorProcessManager.h

@@ -34,8 +34,8 @@ namespace Monitor::Linux
 			const std::map<std::string, std::string>& environmentVariables,
 			std::shared_ptr<IMonitorCallback> callback,
 			bool enableAccessChecks,
-			const std::vector<Path>& allowedReadAccess,
-			const std::vector<Path>& allowedWriteAccess) override final
+			std::vector<Path> allowedReadAccess,
+			std::vector<Path> allowedWriteAccess) override final
 		{
 			return std::make_shared<LinuxMonitorProcess>(
 				executable,

Source/Monitor/Host/Mock/MockMonitorProcessManager.h

@@ -75,8 +75,8 @@ namespace Monitor
 			const std::map<std::string, std::string>& environmentVariables,
 			std::shared_ptr<IMonitorCallback> callback,
 			bool enableAccessChecks,
-			const std::vector<Path>& allowedReadAccess,
-			const std::vector<Path>& allowedWriteAccess) override final
+			std::vector<Path> allowedReadAccess,
+			std::vector<Path> allowedWriteAccess) override final
 		{
 			std::stringstream message;
 			auto id = m_uniqueId++;

Source/Monitor/Host/Windows/WindowsMonitorProcess.h

@@ -78,8 +78,8 @@ namespace Monitor::Windows
 			const std::map<std::string, std::string>& environmentVariables,
 			std::shared_ptr<IMonitorCallback> callback,
 			bool enableAccessChecks,
-			const std::vector<Path>& allowedReadAccess,
-			const std::vector<Path>& allowedWriteAccess) :
+			std::vector<Path> allowedReadAccess,
+			std::vector<Path> allowedWriteAccess) :
 			m_executable(executable),
 			m_arguments(std::move(arguments)),
 			m_workingDirectory(workingDirectory),

Source/Monitor/Host/Windows/WindowsMonitorProcessManager.h

@@ -31,8 +31,8 @@ namespace Monitor::Windows
 			const std::map<std::string, std::string>& environmentVariables,
 			std::shared_ptr<IMonitorCallback> callback,
 			bool enableAccessChecks,
-			const std::vector<Path>& allowedReadAccess,
-			const std::vector<Path>& allowedWriteAccess) override final
+			std::vector<Path> allowedReadAccess,
+			std::vector<Path> allowedWriteAccess) override final
 		{
 			return std::make_shared<WindowsMonitorProcess>(
 				executable,
@@ -41,8 +41,8 @@ namespace Monitor::Windows
 				environmentVariables,
 				std::move(callback),
 				enableAccessChecks,
-				allowedReadAccess,
-				allowedWriteAccess);
+				std::move(allowedReadAccess),
+				std::move(allowedWriteAccess));
 		}
 	};
 }