ok we're ready

Author: mf366-dev

.github/workflows/dotnet_build_release.yml

@@ -12,10 +12,12 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        arch: [x64, x86]
+        arch: [x64, x86, arm64]
         exclude:
           - os: macos-latest
             arch: x86
+          - os: windows-latest
+            arch: arm64
 
     steps:
       # Checkout the repo
@@ -34,9 +36,8 @@ jobs:
         if: matrix.os != 'windows-latest'
         run: dotnet build RedSeaMarkupLanguage.sln -c Release -p:Platform=${{ matrix.arch }}
 
-      # to uncomment if I add unit testing
-      #- name: Run tests
-      #  run: dotnet test ./RSML.Tests/RSML.Tests.csproj --no-build
+      - name: Run tests
+        run: dotnet test ./RSML.Tests/RSML.Tests.csproj --no-build
 
       - name: Pack & push to NuGet
         if: github.event_name == 'push' && matrix.os == 'windows-latest' && matrix.arch == 'x64'
@@ -55,26 +56,28 @@ jobs:
 
       - name: Publish CLI archives (Windows)
         if: matrix.os == 'windows-latest' && matrix.arch == 'x64'
+        shell: pwsh
         run: |
           dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r win-${{ matrix.arch }} --self-contained true -o publish
-          
           cd publish
           Compress-Archive -Path * -DestinationPath ../RSML.CLI-windows-latest-${{ matrix.arch }}.zip
           tar -czf ../RSML.CLI-windows-latest-${{ matrix.arch }}.tar.gz *
           cd ..
-        shell: pwsh
 
       - name: Publish CLI archives (Linux and MacOS)
         if: matrix.os != 'windows-latest'
+        shell: bash
         run: |
-          dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r ${{ matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }} --self-contained true -o publish
-
+          if [[ "${{ matrix.arch }}" == "arm64" ]]; then
+            RID="${{ matrix.os == 'ubuntu-latest' && 'linux-arm64' || 'osx-arm64' }}"
+          else
+            RID="${{ matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }}"
+          fi
+          dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r $RID --self-contained true -o publish
           cd publish
           zip -r ../RSML.CLI-${{ matrix.os }}-${{ matrix.arch }}.zip .
           tar -czf ../RSML.CLI-${{ matrix.os }}-${{ matrix.arch }}.tar.gz .
           cd ..
-          
-      # maybe build docs here???
        
       - name: Upload CLI artifacts (Windows)
         if: matrix.os == 'windows-latest' && matrix.arch == 'x64'
@@ -120,7 +123,6 @@ jobs:
           files: |
             ./release-assets/**/**/*.zip
             ./release-assets/**/**/*.tar.gz
-            ./release-assets/**/**/*.nupkg
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -11,21 +11,52 @@
 
 > The modern fork of [MF's Crossroad](https://github.com/MF366-Coding/MFRoad) we're sure you'll love.
 
-<hr />
+---
 
-## Coming Soon*er*: RSML v2.0.0
-> [!NOTE]
-> RSML v2.0.0 is coming first as a `prerelease`. To be exact, this will be `prerelease8` with no native interop support
-> yet.
+## RSML v2.0.0 is here. What's next?
+- [ ] Finishing a stable version of `RSML.Native`
+- [ ] Creating a Python package for RSML
+- [ ] Creating documentation
 
-**Red Sea Markup Language v2.0.0** is currently **in the making** and will be a huge release, bringing native binding
-support into the table _(this also means AOT "friendliness")_, which will let you use RSML in Python, Go, Rust _(if
-you're about that)_, wherever you want, really _(that supports native interop)_.
+---
 
-RSML v2.0.0 will also improve the current API **a lot**, as v1.0.5 still has its fair share of issues, not to
-mention [RSML for Python](https://github.com/OceanApocalypseStudios/RSML.Python)'s ones.
+## CLI v2.0.0: An Improved Experience
+The CLI now has a **lot** more power. You can evaluate and tokenize RSML directly from the commandline and adjust things like what machine it's evaluating for, via JSON.
+
+---
+
+## Shells and JSON (CLI Issue)
+We encountered issues with JSON parsing via commandline arguments in certain shells, where even escaping quotes failed.
+
+We present the solutions to said issues here.
+
+Speaking of JSON, the schema for **local-machine parsing** can be found [**here**](https://oceanapocalypsestudios.org/schemas/rsml_cli_machine_schema.json).
+
+### Bash
+Bash did not present any issues.
+
+```bash
+./RSML.CLI.exe evaluate -m "{ \"processor\": { \"architecture\": \"arm64\" } }"
+```
+
+### PowerShell
+PowerShell presented a weird issue, where the quotes enveloping the property names seemed to vanish. Even escaping or introducing a here-string failed.
+
+The solution was a weird one, since usually escaping via `""` is done on CMD only.
+
+```powershell
+.\RSML.CLI.exe evaluate -m '{ ""test"": ""value"" }'
+```
+
+### CMD
+The CMD did not present any issues.
+
+```batch
+.\RSML.CLI.exe evaluate -m "{ ""test"": ""value"" }"
+```
+
+---
 
-<hr />
 
 ## See Also
 <ul>

RSML.CLI/Helpers/LocalMachineOutput.cs

@@ -140,20 +140,47 @@ public static LocalMachine FromJson(string? json)
 
 			using var document = JsonDocument.Parse(json);
 
-			var system = document.RootElement.GetProperty("system");
-			string? sysName = system.GetProperty("name").GetString();
-			int sysVersion = system.GetProperty("version").GetInt32();
+			string? systemName = null!;
+			int systemVersion = -1;
 
-			var linuxDistro = document.RootElement.GetProperty("linuxDistro");
-			string? distroName = linuxDistro.GetProperty("name").GetString();
-			string? distroFamily = linuxDistro.GetProperty("family").GetString();
+			string? distroName = null!;
+			string? distroFamily = null!;
 
-			string? procArch = document.RootElement.GetProperty("processor").GetProperty("architecture").GetString();
+			string? processorArchitecture = null!;
 
-			if (sysName == "linux")
-				return new(distroName, distroFamily, procArch, sysVersion);
+			if (document.RootElement.TryGetProperty("system", out var system))
+			{
 
-			return new(sysName, procArch, sysVersion);
+				if (system.TryGetProperty("name", out var systemNameProperty))
+					systemName = systemNameProperty.GetString();
+
+				if (system.TryGetProperty("version", out var systemVersionProperty) && systemVersionProperty.TryGetInt32(out systemVersion)) { }
+
+			}
+
+			if (document.RootElement.TryGetProperty("linuxDistro", out var linuxDistro))
+			{
+
+				if (linuxDistro.TryGetProperty("name", out var distroNameProperty))
+					distroName = distroNameProperty.GetString();
+
+				if (linuxDistro.TryGetProperty("family", out var distroFamilyProperty))
+					distroFamily = distroFamilyProperty.GetString();
+
+			}
+
+			if (document.RootElement.TryGetProperty("processor", out var processor))
+			{
+
+				if (processor.TryGetProperty("architecture", out var processorArchitectureProperty))
+					processorArchitecture = processorArchitectureProperty.GetString();
+
+			}
+
+			if (systemName is not null && systemName.Equals("linux", StringComparison.OrdinalIgnoreCase))
+				return new(distroName, distroFamily, processorArchitecture, systemVersion);
+
+			return new(systemName, processorArchitecture, systemVersion);
 
 		}
 

RSML/StringExtensions.cs

@@ -175,7 +175,7 @@ internal static unsafe bool IsAsciiEqualsIgnoreCase(this ReadOnlyMemory<char> ch
 		internal static bool IsAsciiEqualsIgnoreCase(this ReadOnlyMemory<char> chars, ImmutableArray<ReadOnlyMemory<char>> arr)
 		{
 
-			// i want performance, not linq ass
+			// I want performance, not linq ass
 			// ReSharper disable once ForCanBeConvertedToForeach
 			// ReSharper disable once LoopCanBeConvertedToQuery
 			for (int i = 0; i < arr.Length; i++)