Merge branch 'enhancement/wrapper-bundle'

Author: hugoalh

hugoalh.GitHubActionsToolkit/hugoalh.GitHubActionsToolkit.psd1

@@ -3,7 +3,7 @@
 	RootModule = 'hugoalh.GitHubActionsToolkit.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '1.1.1'
+	ModuleVersion = '1.2.0'
 
 	# Supported PSEditions
 	# CompatiblePSEditions = @()
@@ -249,7 +249,7 @@
 			ReleaseNotes = '(Please visit https://github.com/hugoalh-studio/ghactions-toolkit-powershell/releases.)'
 
 			# Prerelease string of this module
-			# Prerelease = ''
+			Prerelease = 'beta1'
 
 			# Flag to indicate whether the module requires explicit user acceptance for install/update/save
 			RequireLicenseAcceptance = $False

hugoalh.GitHubActionsToolkit/module/artifact.psm1

@@ -74,7 +74,7 @@ Function Export-Artifact {
 		If ($RetentionTime -igt 0) {
 			$InputObject.RetentionTIme = $RetentionTime
 		}
-		Invoke-GitHubActionsNodeJsWrapper -Path 'artifact\upload.js' -InputObject ([PSCustomObject]$InputObject) |
+		Invoke-GitHubActionsNodeJsWrapper -Name 'artifact/upload' -InputObject ([PSCustomObject]$InputObject) |
 			Write-Output
 	}
 }
@@ -118,13 +118,13 @@ Function Import-Artifact {
 		}
 		Switch ($PSCmdlet.ParameterSetName) {
 			'All' {
-				Invoke-GitHubActionsNodeJsWrapper -Path 'artifact\download-all.js' -InputObject ([PSCustomObject]@{
+				Invoke-GitHubActionsNodeJsWrapper -Name 'artifact/download-all' -InputObject ([PSCustomObject]@{
 					Destination = $Destination
 				}) |
 					Write-Output
 			}
 			'Single' {
-				Invoke-GitHubActionsNodeJsWrapper -Path 'artifact\download.js' -InputObject ([PSCustomObject]@{
+				Invoke-GitHubActionsNodeJsWrapper -Name 'artifact/download' -InputObject ([PSCustomObject]@{
 					Name = $Name
 					Destination = $Destination
 					CreateSubfolder = $CreateSubfolder.IsPresent

hugoalh.GitHubActionsToolkit/module/cache.psm1

@@ -74,7 +74,7 @@ Function Restore-Cache {
 		}
 		[System.Environment]::SetEnvironmentVariable('SEGMENT_DOWNLOAD_TIMEOUT_MINS', $SegmentTimeout) |
 			Out-Null
-		(Invoke-GitHubActionsNodeJsWrapper -Path 'cache\restore.js' -InputObject ([PSCustomObject]$InputObject))?.CacheKey |
+		(Invoke-GitHubActionsNodeJsWrapper -Name 'cache/restore' -InputObject ([PSCustomObject]$InputObject))?.CacheKey |
 			Write-Output
 	}
 }
@@ -130,7 +130,7 @@ Function Save-Cache {
 		If ($UploadConcurrency -igt 0) {
 			$InputObject.UploadConcurrency = $UploadConcurrency
 		}
-		(Invoke-GitHubActionsNodeJsWrapper -Path 'cache\save.js' -InputObject ([PSCustomObject]$InputObject))?.CacheId |
+		(Invoke-GitHubActionsNodeJsWrapper -Name 'cache/save' -InputObject ([PSCustomObject]$InputObject))?.CacheId |
 			Write-Output
 	}
 }

hugoalh.GitHubActionsToolkit/module/nodejs-invoke.psm1

@@ -7,14 +7,14 @@ Import-Module -Name (
 	) |
 		ForEach-Object -Process { Join-Path -Path $PSScriptRoot -ChildPath $_ }
 ) -Prefix 'GitHubActions' -Scope 'Local'
-[String]$WrapperRoot = Join-Path -Path $PSScriptRoot -ChildPath 'nodejs-wrapper'
+[String]$Wrapper = (Join-Path -Path $PSScriptRoot -ChildPath 'nodejs-wrapper' -AdditionalChildPath @('dist', 'main.js')) -ireplace '\\', '/'
 <#
 .SYNOPSIS
 GitHub Actions (Private) - Invoke NodeJS Wrapper
 .DESCRIPTION
 Invoke NodeJS wrapper.
-.PARAMETER Path
-Relative literal path of the NodeJS wrapper.
+.PARAMETER Name
+Name of the NodeJS wrapper.
 .PARAMETER InputObject
 Arguments of the NodeJS wrapper.
 .OUTPUTS
@@ -25,28 +25,27 @@ Function Invoke-NodeJsWrapper {
 	[CmdletBinding()]
 	[OutputType(([PSCustomObject], [PSCustomObject[]]))]
 	Param (
-		[Parameter(Mandatory = $True, Position = 0)][String]$Path,
+		[Parameter(Mandatory = $True, Position = 0)][String]$Name,
 		[Parameter(Mandatory = $True, Position = 1)][Alias('Argument', 'Arguments', 'Input', 'Object', 'Parameter', 'Parameters')][PSCustomObject]$InputObject
 	)
 	If (!(Test-GitHubActionsNodeJsEnvironment)) {
-		Write-Error -Message 'This function requires to invoke with the compatible NodeJS and NPM environment!' -Category 'ResourceUnavailable'
+		Write-Error -Message 'This function requires to invoke with the compatible NodeJS environment!' -Category 'ResourceUnavailable'
 		Return
 	}
-	[String]$WrapperFullName = Join-Path -Path $WrapperRoot -ChildPath $Path
-	If (!(Test-Path -LiteralPath $WrapperFullName -PathType 'Leaf')) {
-		Write-Error -Message "``$Path`` is not an exist and valid NodeJS wrapper path! Most likely some of the files are missing." -Category 'ResourceUnavailable'
+	If (!(Test-Path -LiteralPath $Wrapper -PathType 'Leaf')) {
+		Write-Error -Message 'Wrapper is missing!' -Category 'ResourceUnavailable'
 		Return
 	}
 	[String]$ResultSeparator = "=====$(New-GitHubActionsRandomToken -Length 32)====="
 	Try {
-		[String[]]$Result = node --no-deprecation --no-warnings "$($WrapperFullName -ireplace '\\', '/')" "$(
+		[String[]]$Result = node --no-deprecation --no-warnings "$Wrapper" "$Name" "$(
 			$InputObject |
 				ConvertTo-Json -Depth 100 -Compress
 		)" "$ResultSeparator"
 		[UInt32]$ResultSkipIndex = @()
 		For ([UInt32]$ResultIndex = 0; $ResultIndex -ilt $Result.Count; $ResultIndex++) {
 			[String]$Item = $Result[$ResultIndex]
-			If ($Item -imatch '^::.+$') {
+			If ($Item -imatch '^::.+?::.*$') {
 				Write-Host -Object $Item
 				$ResultSkipIndex += $ResultIndex
 			}
@@ -64,7 +63,7 @@ Function Invoke-NodeJsWrapper {
 			Write-Output
 	}
 	Catch {
-		Write-Error -Message "Unable to successfully invoke NodeJS wrapper ``$Path``! $_" -Category 'InvalidData'
+		Write-Error -Message "Unable to successfully invoke NodeJS wrapper ``$Name``! $_" -Category 'InvalidData'
 	}
 }
 Export-ModuleMember -Function @(

hugoalh.GitHubActionsToolkit/module/nodejs-test.psm1

@@ -3,36 +3,32 @@
 [Boolean]$EnvironmentResult = $False
 [Boolean]$EnvironmentTested = $False
 [SemVer]$NodeJsMinimumVersion = [SemVer]::Parse('14.15.0')
-[SemVer]$NpmMinimumVersion = [SemVer]::Parse('6.14.8')
 [RegEx]$SemVerRegEx = '^v?\d+\.\d+\.\d+$'
-[String]$WrapperRoot = Join-Path -Path $PSScriptRoot -ChildPath 'nodejs-wrapper'
 <#
 .SYNOPSIS
 GitHub Actions - Test NodeJS Environment
 .DESCRIPTION
-Test the current machine whether has compatible NodeJS and NPM environment, and has dependencies ready; Test result always cache for reuse.
-.PARAMETER ReinstallDependencies
-Whether to force reinstall dependencies even though available.
+Test the current machine whether has compatible NodeJS environment; Test result always cache for reuse.
 .PARAMETER Retest
-Whether to redo this test, ignore the cached test result.
+Whether to redo this test by ignore the cached test result.
 .OUTPUTS
 [Boolean] Test result.
 #>
 Function Test-NodeJsEnvironment {
 	[CmdletBinding()]
 	[OutputType([Boolean])]
 	Param (
-		[Alias('Reinstall', 'ReinstallDependency', 'ReinstallPackage', 'ReinstallPackages')][Switch]$ReinstallDependencies,
+		[Alias('Reinstall', 'ReinstallDependency', 'ReinstallPackage', 'ReinstallPackages')][Switch]$ReinstallDependencies,# Deprecated, keep as legacy.
 		[Alias('Redo')][Switch]$Retest
 	)
-	If ($EnvironmentTested -and !$ReinstallDependencies.IsPresent -and !$Retest.IsPresent) {
+	If ($EnvironmentTested -and !$Retest.IsPresent) {
 		Write-Verbose -Message 'Previously tested NodeJS environment; Return previous result.'
 		Write-Output -InputObject $EnvironmentResult
 		Return
 	}
+	$Script:EnvironmentResult = $False
 	$Script:EnvironmentTested = $False
 	Try {
-		Write-Verbose -Message 'Test NodeJS.'
 		Get-Command -Name 'node' -CommandType 'Application' -ErrorAction 'Stop' |# `Get-Command` will throw error when nothing is found.
 			Out-Null# No need the result.
 		[String]$ExpressionNodeJsVersionResult = node --no-deprecation --no-warnings --version |
@@ -43,53 +39,15 @@ Function Test-NodeJsEnvironment {
 		) {
 			Throw
 		}
-		Write-Verbose -Message 'Test NPM.'
-		Get-Command -Name 'npm' -CommandType 'Application' -ErrorAction 'Stop' |# `Get-Command` will throw error when nothing is found.
-			Out-Null# No need the result.
-		[String]$ExpressionNpmVersionResult = npm --version |
-			Join-String -Separator "`n"
-		If (
-			$ExpressionNpmVersionResult -inotmatch $SemVerRegEx -or
-			$NpmMinimumVersion -igt [SemVer]::Parse(($ExpressionNpmVersionResult -ireplace '^v', ''))
-		) {
-			Throw
-		}
 	}
 	Catch {
-		$Script:EnvironmentTested = $True
 		$Script:EnvironmentResult = $False
-		Write-Output -InputObject $EnvironmentResult
-		Return
-	}
-	$OriginalWorkingDirectory = Get-Location
-	Write-Verbose -Message 'Test NodeJS wrapper API dependencies.'
-	Set-Location -LiteralPath $WrapperRoot
-	Try {
-		If (
-			$ReinstallDependencies.IsPresent -or
-			(
-				npm outdated |
-					Join-String -Separator "`n"
-			) -cmatch 'MISSING'
-		) {
-			Write-Verbose -Message 'Install/Reinstall NodeJS wrapper API dependencies.'
-			npm ci --ignore-scripts --no-audit --no-fund |
-				Out-Null# No need the result.
-			If ($LASTEXITCODE -ine 0) {
-				Throw
-			}
-		}
-	}
-	Catch {
-		Set-Location -LiteralPath $OriginalWorkingDirectory
 		$Script:EnvironmentTested = $True
-		$Script:EnvironmentResult = $False
 		Write-Output -InputObject $EnvironmentResult
 		Return
 	}
-	Set-Location -LiteralPath $OriginalWorkingDirectory
-	$Script:EnvironmentTested = $True
 	$Script:EnvironmentResult = $True
+	$Script:EnvironmentTested = $True
 	Write-Output -InputObject $EnvironmentResult
 }
 Export-ModuleMember -Function @(