[Hotfix] Update injection and config formats and fixed github workflow permissions.

Author: MattEdwardsWaggleBee

.github/workflows/create-release.yml

@@ -14,6 +14,9 @@ on:
         required: true
         default: false
 
+permissions:
+    contents: write
+
 env:
   ALLOW_PRERELEASE: ${{ startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/heads/hotfix/') }}
 

.github/workflows/format.yml

@@ -14,6 +14,9 @@ on:
     - main
     - develop
 
+permissions:
+    contents: write
+
 env:
   DOTNET_VERSION: "9.0.x"
 

.github/workflows/issue-branch.yml

@@ -12,6 +12,10 @@ on:
   pull_request:
     types: [ opened, closed ]
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   create_issue_branch_job:
     runs-on: ubuntu-latest

.github/workflows/publish.yml

@@ -14,6 +14,11 @@ env:
   BUILD_CONFIGURATION: ''
   VERSION_SUFFIX: ''
 
+permissions:
+  contents: write
+  packages: write
+  actions: read
+
 jobs:
   build-publish:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -14,6 +14,10 @@ on:
     - main
     - develop
 
+permissions:
+  contents: read
+  actions: read
+
 env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   SOLUTION_NAME: ${{ vars.SOLUTION_NAME }}

.github/workflows/unlist-nuget.yml

@@ -8,7 +8,10 @@ on:
 env:
   BRANCH_NAME: ${{ github.event.release.target_commitish }}
   PROJECT_NAME: ${{ vars.PROJECT_NAME }}
-    
+
+permissions:
+  contents: write
+ 
 jobs:
   publish:
     name: unlist on nuget

.github/workflows/update-version.yml

@@ -13,6 +13,10 @@ on:
         required: true
         default: 'patch'
 
+permissions:
+    contents: write
+    actions: read
+
 env:
   ALLOW_UPDATES: ${{ startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/heads/hotfix/') }}
 

Directory.Build.props

@@ -2,8 +2,8 @@
   <!-- Solution version numbers -->
   <PropertyGroup>
     <MajorVersion>1</MajorVersion>
-    <MinorVersion>2</MinorVersion>
-    <PatchVersion>3</PatchVersion>
+    <MinorVersion>3</MinorVersion>
+    <PatchVersion>0</PatchVersion>
     <RevisionVersion>0</RevisionVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <FileVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion).$(RevisionVersion)</FileVersion>

Hyperbee.XS.sln

@@ -17,11 +17,14 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{4DBDB7F5-3F66-4572-80B5-3322449C77A4}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\create-release.yml = .github\workflows\create-release.yml
+		.github\workflows\deploy-gh-pages.yml = .github\workflows\deploy-gh-pages.yml
 		.github\workflows\format.yml = .github\workflows\format.yml
 		.github\workflows\issue-branch.yml = .github\workflows\issue-branch.yml
 		.github\workflows\publish.yml = .github\workflows\publish.yml
 		.github\workflows\test-report.yml = .github\workflows\test-report.yml
 		.github\workflows\test.yml = .github\workflows\test.yml
+		.github\workflows\unlist-nuget.yml = .github\workflows\unlist-nuget.yml
+		.github\workflows\update-version.yml = .github\workflows\update-version.yml
 	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "docs", "docs\docs.shproj", "{FC3B0A95-4DA0-43A0-A19D-624152BDF2F6}"

src/Hyperbee.XS.Extensions/ConfigurationParseExtension.cs

@@ -1,7 +1,5 @@
 using System.Linq.Expressions;
-using Hyperbee.Collections;
 using Hyperbee.Expressions;
-using Hyperbee.XS;
 using Hyperbee.XS.Core;
 using Hyperbee.XS.Core.Parsers;
 using Hyperbee.XS.Core.Writer;
@@ -17,22 +15,27 @@ public class ConfigurationParseExtension : IParseExtension, IExpressionWriter, I
 
     public Parser<Expression> CreateParser( ExtensionBinder binder )
     {
-        return Between(
-                Terms.Char( '<' ),
-                XsParsers.TypeRuntime(),
-                Terms.Char( '>' )
-            )
-            .And(
+        // var mongo = config::connections.mongo;
+        // var isSecure = config<bool>::connections.sql.secure;
+
+        return ZeroOrOne(
                 Between(
-                    Terms.Char( '(' ),
-                    ZeroOrOne( Terms.String( StringLiteralQuotes.Double ) ),
-                    Terms.Char( ')' )
+                    Terms.Char( '<' ),
+                    XsParsers.TypeRuntime(),
+                    Terms.Char( '>' )
                 )
             )
+            .AndSkip( Terms.Text( "::" ) )
+            .And( Terms.NamespaceIdentifier() )
             .Then<Expression>( static ( _, parts ) =>
                 {
                     var (type, key) = parts;
-                    return ExpressionExtensions.ConfigurationValue( type, key.ToString() );
+
+                    if ( key == null )
+                        throw new InvalidOperationException( "Key must be specified." );
+
+                    var configKey = key.ToString()!.Replace( '.', ':' );
+                    return ExpressionExtensions.ConfigurationValue( type ?? typeof( string ), configKey );
                 }
             )
             .Named( "config" );
@@ -72,13 +75,8 @@ public void WriteExpression( Expression node, XsWriterContext context )
 
         if ( configurationExpression.Key != null )
         {
-            writer.Write( "(" );
-            writer.Write( $"\"{configurationExpression.Key}\"" );
-            writer.Write( ")" );
-        }
-        else
-        {
-            writer.Write( "()" );
+            writer.Write( "::" );
+            writer.Write( configurationExpression.Key.Replace( ':', '.' ) );
         }
     }
 }