fix

Author: onikolaiev

fscps.tools/fscps.tools.psm1

@@ -45,9 +45,24 @@ function Import-ModuleFile
 		$Path
 	)
 
-	$resolvedPath = $ExecutionContext.SessionState.Path.GetResolvedPSPathFromPSPath($Path).ProviderPath
-	if ($doDotSource) { . $resolvedPath }
-	else { $ExecutionContext.InvokeCommand.InvokeScript($false, ([scriptblock]::Create([io.file]::ReadAllText($resolvedPath))), $null, $null) }
+	try {
+		$resolvedPath = $ExecutionContext.SessionState.Path.GetResolvedPSPathFromPSPath($Path).ProviderPath
+		if ($script:doDotSource) { 
+			. $resolvedPath 
+		}
+		else { 
+			$content = [io.file]::ReadAllText($resolvedPath)
+			if (-not [string]::IsNullOrWhiteSpace($content)) {
+				$scriptBlock = [scriptblock]::Create($content)
+				if ($scriptBlock) {
+					$ExecutionContext.InvokeCommand.InvokeScript($false, $scriptBlock, $null, $null)
+				}
+			}
+		}
+	}
+	catch {
+		Write-Warning "Failed to import module file '$Path': $($_.Exception.Message)"
+	}
 }
 
 

fscps.tools/functions/get-fscpsmodelversion.ps1

@@ -22,6 +22,32 @@
     .NOTES
         Author: Oleksandr Nikolaiev (@onikolaiev)
 #>
+
+# Helper function to convert layer number to layer name
+function Get-LayerName {
+    param([int]$LayerNumber)
+    
+    switch ($LayerNumber) {
+        0 { return "SYS" }
+        1 { return "SYP" }
+        2 { return "GLS" }
+        3 { return "GLP" }
+        4 { return "FPK" }
+        5 { return "FPP" }
+        6 { return "SLN" }
+        7 { return "SLP" }
+        8 { return "ISV" }
+        9 { return "ISP" }
+        10 { return "VAR" }
+        11 { return "VAP" }
+        12 { return "CUS" }
+        13 { return "CUP" }
+        14 { return "USR" }
+        15 { return "USP" }
+        default { return "Unknown" }
+    }
+}
+
 function Get-FSCPSModelVersion {
     [CmdletBinding()]
     param(
@@ -37,31 +63,6 @@ function Get-FSCPSModelVersion {
         if (-not (Test-Path -LiteralPath $ModelPath -PathType Container)) {
             throw "Model path '$ModelPath' does not exist or is not a directory"
         }
-        
-        # Function to convert layer number to layer name
-        function Get-LayerName {
-            param([int]$LayerNumber)
-            
-            switch ($LayerNumber) {
-                0 { return "SYS" }
-                1 { return "SYP" }
-                2 { return "GLS" }
-                3 { return "GLP" }
-                4 { return "FPK" }
-                5 { return "FPP" }
-                6 { return "SLN" }
-                7 { return "SLP" }
-                8 { return "ISV" }
-                9 { return "ISP" }
-                10 { return "VAR" }
-                11 { return "VAP" }
-                12 { return "CUS" }
-                13 { return "CUP" }
-                14 { return "USR" }
-                15 { return "USP" }
-                default { return "Unknown" }
-            }
-        }
     }
 
     process{

fscps.tools/internal/functions/test-configstoreagelocation.ps1

@@ -30,24 +30,24 @@
 #>
 function Test-ConfigStorageLocation {
     [CmdletBinding()]
-    [OutputType('System.String')]
+    [OutputType([PSFramework.Configuration.ConfigScope])]
     param (
         [ValidateSet('User', 'System')]
         [string] $ConfigStorageLocation = "User"
     )
 
-    $configScope = "UserDefault"
+    $configScope = [PSFramework.Configuration.ConfigScope]::UserDefault
 
     if ($ConfigStorageLocation -eq "System") {
         if ($Script:IsAdminRuntime) {
-            $configScope = "SystemDefault"
+            $configScope = [PSFramework.Configuration.ConfigScope]::SystemDefault
         }
         else {
             Write-PSFMessage -Level Host -Message "Unable to locate save the <c='em'>configuration objects</c> in the <c='em'>system wide configuration store</c> on the machine. Please start an elevated session and run the cmdlet again."
             Stop-PSFFunction -Message "Elevated permissions needed. Please start an elevated session and run the cmdlet again." -StepsUpward 1
-            return
+            return $null
         }
     }
 
-    $configScope
+    return $configScope
 }