20230627A

Author: hugoalh

hugoalh.GitHubActionsToolkit/module/command-base.psm1

@@ -1,10 +1,10 @@
 #Requires -PSEdition Core -Version 7.2
 Import-Module -Name (
 	@(
-		'internal\new-random-token'
+		'new-random-token'
 	) |
-		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath "$_.psm1" }
-) -Prefix 'GitHubActions' -Scope 'Local'
+		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath 'internal' -AdditionalChildPath @("$_.psm1") }
+) -Scope 'Local'
 Class GitHubActionsStdOutCommand {
 	Static [String]EscapeValue([String]$Value) {
 		Return ($Value -ireplace '%', '%25' -ireplace '\n', '%0A' -ireplace '\r', '%0D')
@@ -58,7 +58,7 @@ Function Write-FileCommand {
 		Else {
 			[String]$ItemRaw = "$Name=$Value" -ireplace '\r?\n', ''
 			Do {
-				[String]$Token = New-GitHubActionsRandomToken
+				[String]$Token = New-RandomToken
 			}
 			While ($ItemRaw -imatch [RegEx]::Escape($Token))
 			@(

hugoalh.GitHubActionsToolkit/module/command-control.psm1

@@ -1,8 +1,13 @@
 #Requires -PSEdition Core -Version 7.2
 Import-Module -Name (
 	@(
-		'command-base',
-		'internal\new-random-token'
+		'new-random-token'
+	) |
+		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath 'internal' -AdditionalChildPath @("$_.psm1") }
+) -Scope 'Local'
+Import-Module -Name (
+	@(
+		'command-base'
 	) |
 		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath "$_.psm1" }
 ) -Prefix 'GitHubActions' -Scope 'Local'
@@ -162,7 +167,7 @@ Function New-CommandsEndToken {
 	[OutputType([String])]
 	Param ()
 	Do {
-		[String]$Result = New-GitHubActionsRandomToken
+		[String]$Result = New-RandomToken
 	}
 	While ($Result -iin $GitHubActionsCommandsEndTokensUsed)
 	$Script:GitHubActionsCommandsEndTokensUsed += $Result

hugoalh.GitHubActionsToolkit/module/environment-variable.psm1

@@ -1,8 +1,13 @@
 #Requires -PSEdition Core -Version 7.2
 Import-Module -Name (
 	@(
-		'command-base',
-		'internal\test-parameter-input-object'
+		'test-parameter-input-object'
+	) |
+		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath 'internal' -AdditionalChildPath @("$_.psm1") }
+) -Scope 'Local'
+Import-Module -Name (
+	@(
+		'command-base'
 	) |
 		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath "$_.psm1" }
 ) -Prefix 'GitHubActions' -Scope 'Local'
@@ -77,7 +82,7 @@ Function Set-EnvironmentVariable {
 	[CmdletBinding(DefaultParameterSetName = 'Single', HelpUri = 'https://github.com/hugoalh-studio/ghactions-toolkit-powershell/wiki/api_function_setgithubactionsenvironmentvariable')]
 	[OutputType([Void])]
 	Param (
-		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-GitHubActionsParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
+		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-ParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 0, ValueFromPipelineByPropertyName = $True)][ValidateScript({ Test-EnvironmentVariableName -InputObject $_ }, ErrorMessage = '`{0}` is not a valid environment variable name!')][Alias('Key')][String]$Name,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 1, ValueFromPipelineByPropertyName = $True)][String]$Value,
 		[Parameter(ValueFromPipelineByPropertyName = $True)][Alias('NoToUpperCase')][Switch]$NoToUpper,

hugoalh.GitHubActionsToolkit/module/nodejs-wrapper.psm1

@@ -1,10 +1,10 @@
 #Requires -PSEdition Core -Version 7.2
 Import-Module -Name (
 	@(
-		'internal\new-random-token'
+		'new-random-token'
 	) |
-		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath "$_.psm1" }
-) -Prefix 'GitHubActions' -Scope 'Local'
+		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath 'internal' -AdditionalChildPath @("$_.psm1") }
+) -Scope 'Local'
 [SemVer]$NodeJsVersionMinimum = [SemVer]::Parse('14.15.0')
 [String]$WrapperRoot = Join-Path -Path $PSScriptRoot -ChildPath 'nodejs-wrapper'
 [String]$WrapperPackageFilePath = Join-Path -Path $WrapperRoot -ChildPath 'package.json'
@@ -80,7 +80,7 @@ Function Invoke-NodeJsWrapper {
 		}
 	}
 	Try {
-		[String]$ResultSeparator = "=====$(New-GitHubActionsRandomToken)====="
+		[String]$ResultSeparator = "=====$(New-RandomToken)====="
 		[String]$Base64Name = Convert-FromUtf8StringToBase64String -InputObject $Name
 		[String]$Base64Argument = $Argument |
 			ConvertTo-Json -Depth 100 -Compress |

hugoalh.GitHubActionsToolkit/module/parameter.psm1

@@ -1,8 +1,13 @@
 #Requires -PSEdition Core -Version 7.2
+Import-Module -Name (
+	@(
+		'test-parameter-input-object'
+	) |
+		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath 'internal' -AdditionalChildPath @("$_.psm1") }
+) -Scope 'Local'
 Import-Module -Name (
 	@(
 		'command-base',
-		'internal\test-parameter-input-object',
 		'log'
 	) |
 		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath "$_.psm1" }
@@ -170,7 +175,7 @@ Function Set-Output {
 	[CmdletBinding(DefaultParameterSetName = 'Single', HelpUri = 'https://github.com/hugoalh-studio/ghactions-toolkit-powershell/wiki/api_function_setgithubactionsoutput')]
 	[OutputType([Void])]
 	Param (
-		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-GitHubActionsParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
+		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-ParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 0, ValueFromPipelineByPropertyName = $True)][ValidatePattern('^(?:[\da-z][\da-z_-]*)?[\da-z]$', ErrorMessage = '`{0}` is not a valid GitHub Actions output name!')][Alias('Key')][String]$Name,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 1, ValueFromPipelineByPropertyName = $True)][AllowEmptyString()][String]$Value
 	)
@@ -209,7 +214,7 @@ Function Set-State {
 	[CmdletBinding(DefaultParameterSetName = 'Single', HelpUri = 'https://github.com/hugoalh-studio/ghactions-toolkit-powershell/wiki/api_function_setgithubactionsstate')]
 	[OutputType([Void])]
 	Param (
-		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-GitHubActionsParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
+		[Parameter(Mandatory = $True, ParameterSetName = 'Multiple', Position = 0, ValueFromPipeline = $True)][ValidateScript({ Test-ParameterInputObject -InputObject $_ })][Alias('Input', 'Object')]$InputObject,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 0, ValueFromPipelineByPropertyName = $True)][ValidatePattern('^(?:[\da-z][\da-z_-]*)?[\da-z]$', ErrorMessage = '`{0}` is not a valid GitHub Actions state name!')][Alias('Key')][String]$Name,
 		[Parameter(Mandatory = $True, ParameterSetName = 'Single', Position = 1, ValueFromPipelineByPropertyName = $True)][AllowEmptyString()][String]$Value
 	)