Packaging should recognize resources in dependency modules set to deploy (#1123)

* Packaging should recognize resources in dependency modules set to deploy

* No need to check export path specifically just that the recurse flag is present

* Removing phaselist check + unused variables

* integeration test

---------

Co-authored-by: James Lechtner <James.Lechtner@intersystems.com>
Co-authored-by: Carolina Borbon Miranda <carolina.borbonmiranda@intersystems.com>

Author: 3 people

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #1102: %IPM.Storage.QualifiedModuleInfo:%New() will now copy over version properties when passed in a resolvedReference
 - #1112: Packaging a module with a globals resource now respects SourcesRoot, placing the exported file at the correct path in the tarball
 - #1057: Fix IPM not cleaning up after itself on self-uninstall
+- #1122: Packaging should recognize resources in dependency modules set to deploy
 
 ## [0.10.6] - 2026-02-24
 

src/cls/IPM/Lifecycle/Base.cls

@@ -1190,16 +1190,6 @@ Method %Export(
             }
         }
 
-        // Deployed items should be exported as a studio project to a designated directory
-        set tDeployedProjectName = ##class(%IPM.Utils.Module).GetDeployedProjectName(..Module.Name)
-        set tDeployedProject = ##class(%Studio.Project).%OpenId(tDeployedProjectName)
-        if '$isobject(tDeployedProject) {
-            set tDeployedProject = ##class(%Studio.Project).%New()
-            set tDeployedProject.Name = tDeployedProjectName
-        }
-        do tDeployedProject.Items.Clear()
-        set tParams($$$DeployedProjectIndex) = tDeployedProject
-
         set tModuleName = ""
         set exportPythonDependencies = $get(pParams("ExportPythonDependencies"), 0)
         for {
@@ -1215,14 +1205,26 @@ Method %Export(
             }
             kill tSingleModuleArray
             merge tSingleModuleArray = tResourceArray(tModuleName)
+
+            // Deployed items for each module + dependency should be exported as a studio project to a designated directory
+            set tDeployedProjectName = ##class(%IPM.Utils.Module).GetDeployedProjectName(tModuleName)
+            set tDeployedProject = ##class(%Studio.Project).%OpenId(tDeployedProjectName)
+            if '$isobject(tDeployedProject) {
+                set tDeployedProject = ##class(%Studio.Project).%New()
+                set tDeployedProject.Name = tDeployedProjectName
+            }
+            do tDeployedProject.Items.Clear()
+            set tParams($$$DeployedProjectIndex) = tDeployedProject
+
             do ..ExportSingleModule(.tSingleModuleArray, pTargetDirectory, .pDependencyGraph, .tParams, tVerbose)
-        }
 
-        // Export the deployed project to the target directory, if it's non-empty
-        if tDeployedProject.Items.Count() > 0 {
-            // Intentionally not calling .%Save() on the project; we don't want to persist it.
-            set tDeployedProjectPath = ##class(%IPM.Utils.Module).GetDeployedProjectPath(pTargetDirectory)
-            $$$ThrowOnError(tDeployedProject.DeployToFile(tDeployedProjectPath, $select(tVerbose:"d",1:"-d")_"/createdirs"))
+            // Export the deployed project for this module to the target directory, if it's non-empty
+            if tDeployedProject.Items.Count() > 0 {
+                // Intentionally not calling .%Save() on the project; we don't want to persist it.
+                set tDeployTargetDirectory = pTargetDirectory _ $get(pDependencyGraph(tModuleName, "Location"))
+                set tDeployedProjectPath = ##class(%IPM.Utils.Module).GetDeployedProjectPath(tDeployTargetDirectory)
+                $$$ThrowOnError(tDeployedProject.DeployToFile(tDeployedProjectPath, $select(tVerbose:"d",1:"-d")_"/createdirs"))
+            }
         }
 
         /// Always keep these files

src/cls/IPM/Lifecycle/Module.cls

@@ -135,6 +135,9 @@ Method %Package(ByRef pParams) As %Status
 {
     set tSC = $$$OK
     try {
+        if ($get(pParams("ExportDependencies"), 0)) {
+            set pParams("Recurse") = 1
+        }
         set tVerbose = $get(pParams("Verbose"))
         if ..Module.HaveToDeploy() {
             $$$ThrowOnError(..MakeDeployed(.pParams))

src/cls/IPM/ResourceProcessor/Default/Document.cls

@@ -280,14 +280,11 @@ Method OnExportDeployedItem(
     try {
         set tVerbose = $get(pParams("Verbose"),0)
         set tDeveloperMode = $get(pParams("DeveloperMode"),0)
-        if (tDeveloperMode || ('..ResourceReference.Deploy) || ('$listlength(..ResourceReference.Module.Lifecycle.PhaseList))) {
-            // Only export deployed items if we say to, are in a non-developer-mode context, and are currently executing module lifecycle phases.
-            // OnExportItem may also be called from a source control extension context, and in this case PhaseList will be empty.
+        if (tDeveloperMode || ('..ResourceReference.Deploy)) {
+            // Only export deployed items if they are marked for deploy, we are in a non-developer-mode context
             quit
         }
-        set tModuleName = ..ResourceReference.Module.Name
         set fileExt = $$$ucase($piece(pItemName, ".", *))
-        set tName = $piece(pItemName, ".", 1, * - 1)
         quit:'($listfind($listbuild("CLS","MAC","INT"), fileExt))
         if $data(pParams($$$DeployedProjectIndex), deployedProject) {
             if tVerbose {

tests/integration_tests/Test/PM/Integration/DeployedItems.cls

@@ -103,4 +103,31 @@ Method TestPublishWithoutDevMode()
   do ..DeployedItemsHelper(1)
 }
 
+Method TestDeployedDependencies()
+{
+    do ..SetupModule()
+
+    set tmpDir = $$$FileTempDir _ "package"
+    set sc = ##class(%IPM.Main).Shell("package " _..#ModuleName _ " -v -export-deps 1 -path " _ tmpDir)
+    do $$$AssertStatusOK(sc, "Successfully packaged module to "_tmpDir)
+
+    // Uninstall modules and delete repos, then load from tarball
+    set sc = ##class(%IPM.Main).Shell("uninstall -all")
+    do $$$AssertStatusOK(sc, "Successfully uninstalled modules")
+    set sc = ##class(%IPM.Main).Shell("repo -delete-all")
+    do $$$AssertStatusOK(sc, "Successfully deleted repos")
+    set sc = ##class(%IPM.Main).Shell("load -v "_tmpDir_".tgz")
+    do $$$AssertStatusOK(sc, "Successfully loaded module with deployed items at "_tmpDir)
+
+    // Check the class properties to confirm loaded as deployed
+    set baseClass = ##class(%Dictionary.ClassDefinition).%OpenId("DeployableTest.Main")
+    do $$$AssertTrue(baseClass.Deployed, "Base class deployed.")
+    set depClass = ##class(%Dictionary.ClassDefinition).%OpenId("DeployableDepTest.Main")
+    do $$$AssertTrue(depClass.Deployed, "Dep class deployed.")
+
+    // Uninstall module and reset registry
+    do ..UninstallModule()
+    do ..RestoreDefaultRegistry()
+}
+
 }