fixes

src/Cascadium.csproj

@@ -3,13 +3,14 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace>Cascadium</RootNamespace>
+		<AssemblyName>Cascadium.Core</AssemblyName>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Title>Cascadium</Title>
-		<PackageId>Cascadium</PackageId>
+		<Title>Cascadium Compiler</Title>
+		<PackageId>Cascadium.Compiler</PackageId>
 
 		<Authors>CypherPotato</Authors>
 		<Company>Project Principium</Company>

src/Converters/StaticCSSConverter.cs

@@ -57,17 +57,28 @@ public override Boolean CanConvert(String propertyName, String value)
     /// <inheritdoc/>
     public override void Convert(String? value, NameValueCollection outputDeclarations)
     {
-        string[] arguments = SafeSplit(value);
-        foreach (KeyValuePair<string, string> pair in Output)
+        if (ArgumentCount != null)
         {
-            string newValue = pair.Value;
+            string[] arguments = SafeSplit(value);
+            foreach (KeyValuePair<string, string> pair in Output)
+            {
+                string newValue = pair.Value;
+
+                for (int i = 0; i < arguments.Length; i++)
+                {
+                    newValue = newValue.Replace("$" + (i + 1), arguments[i]);
+                }
 
-            for (int i = 0; i < arguments.Length; i++)
+                outputDeclarations.Add(pair.Key, newValue);
+            }
+        }
+        else
+        {
+            foreach (KeyValuePair<string, string> pair in Output)
             {
-                newValue = newValue.Replace("$" + (i + 1), arguments[i]);
+                string newValue = pair.Value.Replace("$*", value);
+                outputDeclarations.Add(pair.Key, newValue);
             }
-
-            outputDeclarations.Add(pair.Key, newValue);
         }
     }
 }

tests/build/CssTests/CssTests.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\SimpleCSSCompiler.csproj" />
+    <ProjectReference Include="..\..\..\src\Cascadium.csproj" />
   </ItemGroup>
 
 </Project>

tool/Cascadium-Utility.csproj

@@ -13,15 +13,15 @@
 
 		<AssemblyVersion>0.1.0.1</AssemblyVersion>
 		<FileVersion>0.1.0.1</FileVersion>
-		<RootNamespace>csssimple</RootNamespace>
+		<RootNamespace>cascadiumtool</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\src\Cascadium.csproj" />
+	  <ProjectReference Include="..\src\Cascadium.csproj" />
 	</ItemGroup>
 
 </Project>

tool/CommandLineArguments.cs

@@ -7,7 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace cssimple;
+namespace cascadiumtool;
 
 internal class CommandLineArguments
 {

tool/Compiler.cs

@@ -9,7 +9,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace cssimple;
+namespace cascadiumtool;
 
 internal class Compiler
 {
@@ -31,6 +31,7 @@ public static int RunCompiler(CommandLineArguments args)
             Pretty = args.Pretty == BoolType.True,
             UseVarShortcut = args.UseVarShortcuts == BoolType.True,
             KeepNestingSpace = args.KeepNestingSpace == BoolType.True,
+            Merge = args.Merge == BoolType.True
         };
 
         Program.CompilerOptions?.ApplyConfiguration(options);

tool/JsonCompilerOptions.cs

@@ -11,7 +11,7 @@
 using System.Text.Json;
 using System.IO;
 
-namespace cssimple;
+namespace cascadiumtool;
 
 [JsonSerializable(typeof(ICollection<string>))]
 [JsonSerializable(typeof(string))]

tool/Log.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace cssimple;
+namespace cascadiumtool;
 internal static class Log
 {
     public static bool LoggingEnabled { get; set; } = true;
@@ -23,6 +23,6 @@ public static int Info(string message, bool force=false)
 
     private static void Write(string level, string message)
     {
-        Console.WriteLine("xcss {0,5}: {1}", level, message);
+        Console.WriteLine("cascadium {0,5}: {1}", level, message);
     }
 }

tool/PathUtils.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace cssimple;
+namespace cascadiumtool;
 internal static class PathUtils
 {
     private const int UnitKb = 1024;

tool/Program.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
-namespace cssimple;
+namespace cascadiumtool;
 
 internal class Program
 {

tool/Watcher.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace cssimple;
+namespace cascadiumtool;
 
 internal static class Watcher
 {
@@ -40,6 +40,11 @@ public static int Watch(CommandLineArguments args)
         watchingDirectories = paths.ToArray();
         foreach (string p in paths)
         {
+            if(!Directory.Exists(p))
+            {
+                return Log.ErrorKill("the detected directory path at " + p + " does not exists.");
+            }
+
             if (smallestPath == null || p.Length < smallestPath.Length)
             {
                 smallestPath = p;
@@ -53,7 +58,7 @@ public static int Watch(CommandLineArguments args)
         fsWatcher.IncludeSubdirectories = true;
         fsWatcher.EnableRaisingEvents = true;
 
-        Log.Info("xcss is watching for file changes");
+        Log.Info("cascadium is watching for file changes");
         Log.LoggingEnabled = false;
 
         Compiler.RunCompiler(args);

tool/xcss.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<AssemblyName>xcss</AssemblyName>
+		<PublishSingleFile>true</PublishSingleFile>
+		<PublishTrimmed>true</PublishTrimmed>
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<InvariantGlobalization>true</InvariantGlobalization>
+
+		<AssemblyVersion>1.0.7.14</AssemblyVersion>
+		<FileVersion>1.0.7.14</FileVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="CommandLineParser" Version="2.9.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\src\SimpleCSSCompiler.csproj" />
+	</ItemGroup>
+
+</Project>