Add Class Modules

Author: DecimalTurn

scripts/Build-VBA.ps1

@@ -121,17 +121,63 @@ if ($null -eq $doc) {
 }
 
 # Define the module folder path
-
 $moduleFolder = GetAbsPath -path "$folderName/Modules" -basePath $currentDir
 Write-Host "Module folder path: $moduleFolder"
 
+# Define the class modules folder path
+$classModulesFolder = GetAbsPath -path "$folderName/Class Modules" -basePath $currentDir
+Write-Host "Class Modules folder path: $classModulesFolder"
+
 #Check if the module folder does not exist create an empty one
 if (-not (Test-Path $moduleFolder)) {
     Write-Host "Module folder not found: $moduleFolder"
     New-Item -ItemType Directory -Path $moduleFolder -Force | Out-Null
     Write-Host "Created module folder: $moduleFolder"
 }
 
+#Check if the class modules folder does not exist create an empty one
+if (-not (Test-Path $classModulesFolder)) {
+    Write-Host "Class Modules folder not found: $classModulesFolder"
+    New-Item -ItemType Directory -Path $classModulesFolder -Force | Out-Null
+    Write-Host "Created class modules folder: $classModulesFolder"
+}
+
+# Import class modules first (.cls files)
+$clsFiles = Get-ChildItem -Path $classModulesFolder -Filter *.cls -ErrorAction SilentlyContinue
+Write-Host "Found $($clsFiles.Count) .cls files to import"
+
+# Loop through each class module file
+$clsFiles | ForEach-Object {
+    Write-Host "Importing class module $($_.Name)..."
+    try {
+        $vbProject = $doc.VBProject
+        # Check if the VBProject is accessible
+        if ($null -eq $vbProject) {
+            Write-Host "VBProject is not accessible. Attempting to re-open the application..."
+            $officeApp.Quit()
+            Start-Sleep -Seconds 2
+            $officeApp = New-Object -ComObject $officeApp.Application
+            $doc = $officeApp.Workbooks.Open($outputFilePath)
+            
+            $vbProject = $doc.VBProject
+
+            if ($null -eq $vbProject) {
+                Write-Host "VBProject is still not accessible after re-opening the application."
+                # Throw an error to trigger the catch block
+                exit 1
+            } else {
+                Write-Host "VBProject is now accessible after re-opening the application."
+            }
+        }
+
+        $vbProject.VBComponents.Import($_.FullName)
+        
+        Write-Host "Successfully imported class module $($_.Name)"
+    } catch {
+        Write-Host "Failed to import class module $($_.Name): $($_.Exception.Message)"
+    }
+}
+
 # First check if there are any .bas files
 $basFiles = Get-ChildItem -Path $moduleFolder -Filter *.bas
 Write-Host "Found $($basFiles.Count) .bas files to import"

tests/ExcelAddin.xlam/Class Modules/Class1.cls

@@ -0,0 +1,32 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Class1"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+'@Lang VBA
+Option Explicit
+
+
+Public Sub ExecuteWrite()
+    Dim filePath As String
+    Dim fileNum As Integer
+    
+    ' Specify the path to the text file
+    filePath = ThisWorkbook.Path & "\ExcelAddin.txt"
+    
+    ' Get a free file number
+    fileNum = FreeFile
+    
+    ' Open the file for output
+    Open filePath For Output As #fileNum
+    
+    ' Write some text to the file
+    Print #fileNum, "Hello, World!"
+    
+    ' Close the file
+    Close #fileNum
+End Sub

tests/ExcelAddin.xlam/Modules/Module1.bas

@@ -9,21 +9,5 @@ End Sub
 
 'This code will be called via COM to test if the VBA import was successful
 Sub WriteToFile()
-    Dim filePath As String
-    Dim fileNum As Integer
-    
-    ' Specify the path to the text file
-    filePath = ThisWorkbook.Path & "\ExcelAddin.txt"
-    
-    ' Get a free file number
-    fileNum = FreeFile
-    
-    ' Open the file for output
-    Open filePath For Output As #fileNum
-    
-    ' Write some text to the file
-    Print #fileNum, "Hello, World!"
-    
-    ' Close the file
-    Close #fileNum
+    Class1.ExecuteWrite()
 End Sub

tests/WordDocument.docm/Class Modules/Class1.cls

@@ -0,0 +1,32 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Class1"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+'@Lang VBA
+Option Explicit
+
+
+Public Sub ExecuteWrite()
+    Dim filePath As String
+    Dim fileNum As Integer
+
+    ' Specify the path to the text file
+    filePath = ThisDocument.Path & "\WordDocument.txt"
+
+    ' Get a free file number
+    fileNum = FreeFile
+
+    ' Open the file for output
+    Open filePath For Output As #fileNum
+
+    ' Write some text to the file
+    Print #fileNum, "Hello, World!"
+
+    ' Close the file
+    Close #fileNum
+End Sub

tests/WordDocument.docm/Modules/Module1.bas

@@ -8,22 +8,6 @@ Sub Demo()
 End Sub
 
 'This code will be called via COM to test if the VBA import was successful
-Sub WriteToFile()
-    Dim filePath As String
-    Dim fileNum As Integer
-    
-    ' Specify the path to the text file
-    filePath = ThisDocument.Path & "\WordDocument.txt"
-    
-    ' Get a free file number
-    fileNum = FreeFile
-    
-    ' Open the file for output
-    Open filePath For Output As #fileNum
-    
-    ' Write some text to the file
-    Print #fileNum, "Hello, World!"
-    
-    ' Close the file
-    Close #fileNum
+Public Sub WriteToFile()
+    Class1.ExecuteWrite()
 End Sub