fix: PipeScript Namespaced Object Improvements ( Fixes #1060 )

Exporting singletons
StartAutomating · Mar 16, 2024 · b5ee836 · b5ee836
1 parent 7ad49e1
commit b5ee836
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Languages/PipeScript/Templates/Syntax/PipeScript-Template-NamespacedObject.ps.ps1 b/Languages/PipeScript/Templates/Syntax/PipeScript-Template-NamespacedObject.ps.ps1
@@ -83,6 +83,8 @@ Template function PipeScript.NamespacedObject {
 
         $SingletonForms = 'singleton','single','constant','const','the','c','s','t'
         $singletonPattern = "(?>$($SingletonForms -join '|'))"
+
+
 
         $defineInstance = 
             if ($objectDefinition -is [Management.Automation.Language.HashtableAst]) {
@@ -97,6 +99,11 @@ Template function PipeScript.NamespacedObject {
             \#\> # the closing tag
             ", 'IgnoreCase,IgnorePatternWhitespace', '00:00:01')
                 $foundBlockComments = $objectDefinition -match $findBlockComments
+                $objectDefinition = "{
+$($objectDefinition -replace '^\{' -replace '\}$')
+Export-ModuleMember -Function * -Alias * -Cmdlet * -Variable *
+}"
+
                 if ($foundBlockComments -and $matches.Block) {
                     $blockComments = $null,"<#",$($matches.Block),"#>",$null -join [Environment]::Newline
                 }
@@ -112,12 +119,7 @@ Template function PipeScript.NamespacedObject {
                 elseif ($matches.0 -eq '<') { '>' }
             }
         ) -ne '' -join ''
-
-        $objectDefinition = "{
-$($objectDefinition -replace '^\{' -replace '\}$')
-Export-ModuleMember -Function * -Alias * -Cmdlet * -Variable *
-}"
-
+
         $objectDefinition = 
             if ($objectType -match $singletonPattern) {
                 "{$(if ($blockComments) {$blockComments})