Merge branch 'main' into settings-schema-review

Author: MariusStorhaug

.github/actions/Build-PSModule/src/helpers/Build/Add-ContentFromItem.ps1

@@ -1,4 +1,4 @@
-function Add-ContentFromItem {
+function Add-ContentFromItem {
     <#
         .SYNOPSIS
         Add the content of a folder or file to the root module file.
@@ -22,13 +22,10 @@
         [Parameter(Mandatory)]
         [string] $RootPath
     )
-    # Get the path separator for the current OS
-    $pathSeparator = [System.IO.Path]::DirectorySeparatorChar
+    $separators = [char[]]@([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar)
 
-    $relativeFolderPath = $Path -replace $RootPath, ''
-    $relativeFolderPath = $relativeFolderPath -replace $file.Extension, ''
-    $relativeFolderPath = $relativeFolderPath.TrimStart($pathSeparator)
-    $relativeFolderPath = $relativeFolderPath -split $pathSeparator | ForEach-Object { "[$_]" }
+    $relativeFolderPath = [System.IO.Path]::GetRelativePath($RootPath, $Path)
+    $relativeFolderPath = $relativeFolderPath.Split($separators, [System.StringSplitOptions]::RemoveEmptyEntries) | ForEach-Object { "[$_]" }
     $relativeFolderPath = $relativeFolderPath -join ' - '
 
     Add-Content -Path $RootModuleFilePath -Force -Value @"
@@ -37,11 +34,11 @@ Write-Debug "[`$scriptName] - $relativeFolderPath - Processing folder"
 "@
 
     $files = $Path | Get-ChildItem -File -Force -Filter '*.ps1' | Sort-Object -Property FullName
+
     foreach ($file in $files) {
-        $relativeFilePath = $file.FullName -replace $RootPath, ''
-        $relativeFilePath = $relativeFilePath -replace $file.Extension, ''
-        $relativeFilePath = $relativeFilePath.TrimStart($pathSeparator)
-        $relativeFilePath = $relativeFilePath -split $pathSeparator | ForEach-Object { "[$_]" }
+        $relativeFilePath = [System.IO.Path]::GetRelativePath($RootPath, $file.FullName)
+        $relativeFilePath = [System.IO.Path]::ChangeExtension($relativeFilePath, $null).TrimEnd('.')
+        $relativeFilePath = $relativeFilePath.Split($separators, [System.StringSplitOptions]::RemoveEmptyEntries) | ForEach-Object { "[$_]" }
         $relativeFilePath = $relativeFilePath -join ' - '
 
         Add-Content -Path $RootModuleFilePath -Force -Value @"

.github/actions/Build-PSModule/src/helpers/Build/Build-PSModuleRootModule.ps1

@@ -48,8 +48,7 @@
         [System.IO.DirectoryInfo] $ModuleOutputFolder
     )
 
-    # Get the path separator for the current OS
-    $pathSeparator = [System.IO.Path]::DirectorySeparatorChar
+    $separators = [char[]]@([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar)
 
     Set-GitHubLogGroup 'Build root module' {
         $rootModuleFile = New-Item -Path $ModuleOutputFolder -Name "$ModuleName.psm1" -Force
@@ -185,22 +184,21 @@ Write-Debug "[$scriptName] - [data] - Done"
         )
 
         foreach ($scriptFolder in $scriptFoldersToProcess) {
-            $scriptFolder = Join-Path -Path $ModuleOutputFolder -ChildPath $scriptFolder
-            if (-not (Test-Path -Path $scriptFolder)) {
+            $scriptFolderPath = Join-Path -Path $ModuleOutputFolder -ChildPath $scriptFolder
+            if (-not (Test-Path -Path $scriptFolderPath)) {
                 continue
             }
-            Add-ContentFromItem -Path $scriptFolder -RootModuleFilePath $rootModuleFile -RootPath $ModuleOutputFolder
-            Remove-Item -Path $scriptFolder -Force -Recurse
+            Add-ContentFromItem -Path $scriptFolderPath -RootModuleFilePath $rootModuleFile -RootPath $ModuleOutputFolder
+            Remove-Item -Path $scriptFolderPath -Force -Recurse
         }
         #endregion - Add content from subfolders
 
         #region - Add content from *.ps1 files on module root
         $files = $ModuleOutputFolder | Get-ChildItem -File -Force -Filter '*.ps1' | Sort-Object -Property FullName
         foreach ($file in $files) {
-            $relativePath = $file.FullName -replace $ModuleOutputFolder, ''
-            $relativePath = $relativePath -replace $file.Extension, ''
-            $relativePath = $relativePath.TrimStart($pathSeparator)
-            $relativePath = $relativePath -split $pathSeparator | ForEach-Object { "[$_]" }
+            $relativePath = [System.IO.Path]::GetRelativePath($ModuleOutputFolder, $file.FullName)
+            $relativePath = [System.IO.Path]::ChangeExtension($relativePath, $null).TrimEnd('.')
+            $relativePath = $relativePath.Split($separators, [System.StringSplitOptions]::RemoveEmptyEntries) | ForEach-Object { "[$_]" }
             $relativePath = $relativePath -join ' - '
 
             Add-Content -Path $rootModuleFile -Force -Value @"

.github/workflows/Lint-Repository.yml

@@ -54,6 +54,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           DEFAULT_WORKSPACE: ${{ fromJson(env.Settings).WorkingDirectory }}
           FILTER_REGEX_INCLUDE: ${{ fromJson(env.Settings).WorkingDirectory }}
+          FILTER_REGEX_EXCLUDE: ${{ fromJson(env.Settings).WorkingDirectory }}/src/classes/public/.*\.ps1$
           ENABLE_GITHUB_ACTIONS_STEP_SUMMARY: false
           SAVE_SUPER_LINTER_SUMMARY: true
 

.github/workflows/Linter.yml

@@ -28,6 +28,7 @@ jobs:
         uses: super-linter/super-linter@4ce20838b8ab83717e78138c5b3a1407148e0918 # v8.7.0
         env:
           GITHUB_TOKEN: ${{ github.token }}
+          FILTER_REGEX_EXCLUDE: 'tests/src(TestRepo|WithManifestTestRepo)/src/classes/public/.*\.ps1$'
           VALIDATE_BIOME_FORMAT: false
           VALIDATE_GITHUB_ACTIONS: false
           VALIDATE_JSCPD: false

.github/workflows/Release.yml

@@ -13,6 +13,7 @@ on:
       - synchronize
       - labeled
     paths:
+      - '.github/actions/**'
       - '.github/workflows/**'
       - '!.github/workflows/Release.yml'
       - '!.github/workflows/Linter.yml'

.github/workflows/Workflow-Test-Default.yml

@@ -6,6 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
+      - '.github/actions/**'
       - '.github/workflows/**'
       - '!.github/workflows/Release.yml'
       - '!.github/workflows/Linter.yml'
@@ -43,4 +44,5 @@ jobs:
       ImportantFilePatterns: |
         ^src/
         ^README\.md$
+        ^\.github/actions/
         ^\.github/workflows/(?!Release\.yml$|Linter\.yml$)

.github/workflows/Workflow-Test-WithManifest.yml

@@ -6,6 +6,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
+      - '.github/actions/**'
       - '.github/workflows/**'
       - '!.github/workflows/Release.yml'
       - '!.github/workflows/Linter.yml'
@@ -43,4 +44,5 @@ jobs:
       ImportantFilePatterns: |
         ^src/
         ^README\.md$
+        ^\.github/actions/
         ^\.github/workflows/(?!Release\.yml$|Linter\.yml$)

tests/srcTestRepo/src/classes/public/ActiveLoanRegister.ps1

@@ -0,0 +1,11 @@
+class ActiveLoanRegister {
+    [System.Collections.Generic.List[BookLoan]] $Loans
+
+    ActiveLoanRegister() {
+        $this.Loans = [System.Collections.Generic.List[BookLoan]]::new()
+    }
+
+    [void] AddLoan([BookLoan]$Loan) {
+        $this.Loans.Add($Loan)
+    }
+}

tests/srcTestRepo/src/classes/public/AlphaCirculationNode.ps1

@@ -0,0 +1,9 @@
+class AlphaCirculationNode {
+    [string] $Id
+    [ZetaCirculationNode] $Next
+
+    AlphaCirculationNode([string]$Id, [ZetaCirculationNode]$Next) {
+        $this.Id = $Id
+        $this.Next = $Next
+    }
+}

tests/srcTestRepo/src/classes/public/AuthorIndex.ps1

@@ -0,0 +1,11 @@
+class AuthorIndex {
+    [string] $Name
+    [AuthorProfile[]] $Authors
+    [ZCatalog] $Catalog
+
+    AuthorIndex([string]$Name, [ZCatalog]$Catalog) {
+        $this.Name = $Name
+        $this.Catalog = $Catalog
+        $this.Authors = @()
+    }
+}