Skip to content

Finally extract the Metadata module! #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jaykul merged 8 commits into from
Jul 3, 2021
Merged

Finally extract the Metadata module! #44

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
443e641
Copy the variables to local scope
Feb 10, 2021
35365e5
Use PSVariable to get variable values from callers
Feb 11, 2021
2879bda
Let AllowedVariables flow through the whole module
Feb 11, 2021
285ace8
Clean up debug messages
Feb 12, 2021
bac222e
Extract Metadata
Jaykul Jul 3, 2021
171e029
Reconfigure build (without Metadata)
Jaykul Jul 3, 2021
366d907
Add Metadata to RequiredModules.psd1
Jaykul Jul 3, 2021
e1d8930
Extend testing to 'nix and OSX
Jaykul Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Copy the variables to local scope
  • Loading branch information
Joel Bennett
Joel Bennett committed Feb 10, 2021
commit 443e6414ec1ff5187548fcbed3980f4bd9aa31fe
25 changes: 18 additions & 7 deletions Source/Metadata/Public/ConvertFrom-Metadata.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,21 @@ function ConvertFrom-Metadata {
$Tokens += $Tokens | Where-Object { "StringExpandable" -eq $_.Kind } | Select-Object -ExpandProperty NestedTokens

# Work around PowerShell rules about magic variables
# Replace "PSScriptRoot" magic variables with the non-reserved "ScriptRoot"
if ($scriptroots = @($Tokens | Where-Object { ("Variable" -eq $_.Kind) -and ($_.Name -eq "PSScriptRoot") } | ForEach-Object { $_.Extent } )) {
$ScriptContent = $Ast.ToString()
for ($r = $scriptroots.count - 1; $r -ge 0; $r--) {
$ScriptContent = $ScriptContent.Remove($scriptroots[$r].StartOffset, ($scriptroots[$r].EndOffset - $scriptroots[$r].StartOffset)).Insert($scriptroots[$r].StartOffset, '$ScriptRoot')
# Change all the "ValidVariables" to use names like __ModuleBuilder__OriginalName__
# Later, we'll try to make sure these are all set!
if (($UsedVariables = $Tokens | Where-Object { "Variable" -eq $_.Kind -and $_.Name -in $ValidVariables })) {
if ($scriptroots = @( $UsedVariables | ForEach-Object { $_.Extent | Add-Member NoteProperty Name $_.Name } )) {
$ScriptContent = $Ast.ToString()
for ($r = $scriptroots.count - 1; $r -ge 0; $r--) {
$ScriptContent = $ScriptContent.Remove($scriptroots[$r].StartOffset, ($scriptroots[$r].EndOffset - $scriptroots[$r].StartOffset)).Insert($scriptroots[$r].StartOffset, '$__ModuleBuilder__' + $_.Name + '__')
}
}
$AST = [System.Management.Automation.Language.Parser]::ParseInput($ScriptContent, [ref]$Tokens, [ref]$ParseErrors)
}
$AST = [System.Management.Automation.Language.Parser]::ParseInput($ScriptContent, [ref]$Tokens, [ref]$ParseErrors)

$Script = $AST.GetScriptBlock()
try {
$Script.CheckRestrictedLanguage( $ValidCommands, $ValidVariables, $true )
$Script.CheckRestrictedLanguage( $ValidCommands, [string[]]($ValidVariables -replace ".*", '__ModuleBuilder__$0__'), $true )
} catch {
ThrowError -Exception $_.Exception.InnerException -ErrorId "Metadata Error" -Category "InvalidData" -TargetObject $Script
}
Expand All @@ -163,6 +166,14 @@ function ConvertFrom-Metadata {
foreach ($point in $Hashtables) {
$ScriptContent = $ScriptContent.Insert($point.Position, $point.Type)
}

# Set the ValidVariables in our scope to allow using variables from the caller's scope
foreach ($name in $ValidVariables) {
if (!($Value = $PSCmdlet.SessionState.PSVariable.GetValue($Name))) {
$Value = $Name
}
Set-Variable "__ModuleBuilder__${Name}__" $Value
}
$AST = [System.Management.Automation.Language.Parser]::ParseInput($ScriptContent, [ref]$Tokens, [ref]$ParseErrors)
$Script = $AST.GetScriptBlock()
}
Expand Down