v1.0.3 is out

Author: MF366-Coding

.github/workflows/dotnet_build_release.yml

@@ -0,0 +1,79 @@
+name: Build & Publish
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        arch: [x64, x86]
+        exclude:
+          - os: macos-latest
+            arch: x86
+
+    steps:
+      # Checkout the repo
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Build solution
+        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: Pack & push to NuGet
+        if: github.event_name == 'push' && matrix.os == 'windows-latest' && matrix.arch == 'x64'
+        run: |
+          dotnet pack ./RSML/RSML.csproj -c Release -o ./nupkg
+          dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
+
+      - name: Publish CLI archives
+        if: matrix.arch == 'x64'
+        run: |
+          dotnet publish ./RSML.CLI/RSML.CLI.csproj -c Release -r ${{ matrix.os == 'windows-latest' && 'win-x64' || matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }} --self-contained true -o publish
+
+          cd publish
+          zip -r ../RSML.CLI-${{ matrix.os }}.zip .
+          tar -czf ../RSML.CLI-${{ matrix.os }}.tar.gz .
+          cd ..
+          
+      - uses: actions/checkout@v4
+      
+  release:
+    name: Create GitHub Release
+    needs: [build]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download CLI archives
+        uses: actions/download-artifact@v4
+        with:
+          path: ./release-assets
+
+      - name: Display downloaded files
+        run: ls -R ./release-assets
+
+      - name: Upload release artifacts
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ./release-assets/**/**/*.zip
+            ./release-assets/**/**/*.tar.gz
+            ./release-assets/**/**/*.nupkg
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
+      - uses: actions/checkout@v4

.github/workflows/dotnet_release_winx64.yml

@@ -2,12 +2,11 @@
 using System.Threading.Tasks;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 using System.CommandLine;
 
-using RSML;
 using RSML.Parser;
-using System.Runtime.InteropServices;
 using RSML.Exceptions;
 
 
@@ -108,13 +107,19 @@ static async Task Main(string[] args)
 				description: "Custom RID to check against",
 				getDefaultValue: () => null
 			);
+			var expandAnyOption = new Option<bool>(
+				aliases: ["--expand-any", "-x"],
+				description: "Expands the any RID",
+				getDefaultValue: () => false
+			);
 
 			evaluateCommand.AddOption(printOnlyPrimaryOption);
 			evaluateCommand.AddOption(customRidOption);
+			evaluateCommand.AddOption(expandAnyOption);
 			evaluateCommand.AddOption(fallbackForErrorOption);
 			evaluateCommand.AddOption(fallbackForNullOption);
 
-			evaluateCommand.SetHandler(void (primaryOnly, nullFallback, errorFallback, customRid) =>
+			evaluateCommand.SetHandler(void (primaryOnly, nullFallback, errorFallback, customRid, expandAny) =>
 			{
 
 				string? currentInState = Console.In.ReadToEnd();
@@ -149,9 +154,26 @@ static async Task Main(string[] args)
 				try
 				{
 
-					Console.WriteLine(customRid is null
-						? document.EvaluateDocument() ?? ((nullFallback ?? "") == "" ? "[WARNING] No match was found." : nullFallback!)
-						: document.EvaluateDocument(customRid, null) ?? ((nullFallback ?? "") == "" ? "[WARNING] No match was found." : nullFallback!));
+					if (customRid is not null)
+					{
+
+						Console.WriteLine(
+							(document.EvaluateDocument(customRid, expandAny)) ??
+								((nullFallback is null)
+									? "[WARNING] No match was found."
+									: nullFallback));
+
+					}
+					else
+					{
+
+						Console.WriteLine(
+							(document.EvaluateDocument(expandAny)) ??
+								((nullFallback is null)
+									? "[WARNING] No match was found."
+									: nullFallback));
+
+					}
 
 				}
 				catch (RSMLRuntimeException ex)
@@ -164,7 +186,7 @@ static async Task Main(string[] args)
 
 				Environment.Exit(0);
 
-			}, printOnlyPrimaryOption, fallbackForNullOption, fallbackForErrorOption, customRidOption);
+			}, printOnlyPrimaryOption, fallbackForNullOption, fallbackForErrorOption, customRidOption, expandAnyOption);
 
 			evaluateCommand.AddAlias("eval");
 			evaluateCommand.AddAlias("parse");
@@ -175,7 +197,7 @@ static async Task Main(string[] args)
 			repoCommand.SetHandler(void () =>
 			{
 
-				Console.WriteLine("\033[1mVisit the repository at:\033[0m\033[4mhttps://github.com/OceanApocalypseStudios/RedSeaMarkupLanguage\033[0m");
+				Console.WriteLine("Visit the repository at: https://github.com/OceanApocalypseStudios/RedSeaMarkupLanguage");
 				Environment.Exit(0);
 
 			});

Assets/v1.0.3_Demo.png

@@ -19,12 +19,6 @@
 		<DebugType>none</DebugType>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<None Include="..\runner.ps1">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 	</ItemGroup>

RSML.CLI/Program.cs

@@ -1,5 +1,3 @@
-Imports System
-Imports System.Formats
 Imports System.IO
 
 
@@ -21,6 +19,7 @@ Module Program
 
 		Dim format As OutputFormat
 
+		Console.WriteLine("[DEPRECATION] Soon, RSML.Docs will be deprecated in favor of Org4Docs. This will NOT affect the actual documentation.")
 		Console.WriteLine("[WARNING] This program requires Emacs (recommended version: 30.1). Make sure it's on PATH.")
 		Console.WriteLine("[->] Press any key to continue or 'q' to abort...")
 		Console.Beep()

RSML.CLI/RSML.CLI.csproj

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 
 
 namespace RSML
@@ -21,6 +22,13 @@ public sealed partial class RSDocument
 		/// <returns>The RSML inside the file</returns>
 		public static string LoadRSMLFromFile(string filepath) => File.ReadAllText(filepath);
 
+		/// <summary>
+		/// Loads a RSML file into a string asynchronously.
+		/// </summary>
+		/// <param name="filepath">The path to the file</param>
+		/// <returns>The RSML inside the file</returns>
+		public static async Task<string> LoadRSMLFromFileAsync(string filepath) => await File.ReadAllTextAsync(filepath);
+
 		/// <summary>
 		/// Loads a RSML file into a document.
 		/// </summary>