Fold all updates since May from master and internal repo into v1

.github/workflows/packages.yml

@@ -8,12 +8,14 @@ jobs:
     steps:
     - id: set-matrix
       run: |
-        matrix=`curl https://pm.community.intersystems.com/packages/-/all  | jq '.[].name' | jq -s`
-        echo "::set-output name=matrix::$matrix"
+        matrix=`curl https://pm.community.intersystems.com/packages/-/all?allVersions=1  | jq 'reduce .[] as $item ([]; if $item.allVersions | length >= 10 then . + [$item.name] else . end)' | tr -d '\n\t\r '`
+        echo $matrix
+        echo "matrix=${matrix}" >> "$GITHUB_OUTPUT"
   job2:
     needs: job1
     runs-on: ubuntu-latest
     strategy:
-      matrix: ${{fromJson(needs.job1.outputs.matrix)}}
+      matrix:
+        package: ${{fromJson(needs.job1.outputs.matrix)}}
     steps:
     - run: echo test

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "intersystems.language-server",
+    "intersystems-community.testingmanager",
+    "intersystems-community.vscode-objectscript",
+    "ms-azuretools.vscode-docker"
+  ]
+}

.vscode/settings.json

@@ -6,6 +6,6 @@
     "username": "_system",
     "password": "SYS",
     "ns": "%SYS"
-  }
-
+  },
+  "intersystems.testingManager.client.relativeTestRoot": "tests/unit_tests"
 }

CHANGELOG.md

@@ -0,0 +1,43 @@
+# InterSystems Package Manager
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased - 0.9.0+snapshot]
+
+### Added
+-
+
+### Changed
+- HSIEO-9484: Add additional argument to buildDepsGraph to allow putting in an additional list element of dependency's DisplayName
+- HSIEO-9484: Add additional property DisplayName to %IPM.Storage.ModuleReference
+
+### Fixed
+- HSIEO-9269, HSIEO-9402: % percent perforce directories are no longer necessary
+- HSIEO-9269, HSIEO-9404: Repo check should happen in the order to repo creation, not by repo name
+- HSIEO-9269, HSIEO-9411: Make sure can load and export xml Package-type resource
+- HSIEO-9269, HSIEO-9403: Ensure studio project uses display name.
+- HSIEO-9269, HSIEO-9404: Repo check should happen in the order to repo creation, not by repo name
+- HSIEO-9269, HSIEO-9366: Make sure VersionInfo uses exact database namespace instead
+- HSIEO-9269, HSIEO-9384: %IPM.Utils.Build:CreateNamespace should not call %IPM class from %SYS namespace
+- HSIEO-9269, HSIEO-9333: OnDetermineResourceDeployability should make sure to check uppercase of item suffix
+- HSIEO-9269, HSIEO-9315: HSCC needs to re-create %IPM mapping for application namespace because of its mapping deletion
+- HSIEO-9269, HSIEO-9276: Fix dependency analyzer issue
+- HSIEO-9269, HSIEO-9275: IsAvailable() method need to work robustly
+- HSIEO-9269, HSIEO-9277, HSIEO-9235: Remove exportDeployedItem temporarily until HSIEO-9235
+- HSIEO-9269, HSIEO-9278: Mark based module as non deployed if install in dev mode
+- HSIEO-9269, HSIEO-9279: Enable resource mapping creation during build
+- HSIEO-9269, HSIEO-9280: Load unittest code during module install
+- HSIEO-9430: Module definition should not expose DisplayName + deprecate DisplayNameInternal as it will not be used anymore
+- HSIEO-9924: RunDev needs to do complete installation of component and dependencies via ignoreInstalled, so adding ignoreInstalledModules checker in syncLoadDependencies
+
+### Security
+-
+
+### Removed
+- 
+
+### Deprecated
+-

Dockerfile

@@ -5,6 +5,5 @@ ARG REGISTRY=https://pm.community.intersystems.com
 
 RUN --mount=type=bind,src=.,dst=/home/irisowner/zpm/ \
   iris start iris && \
-  iris session iris "##class(%SYSTEM.OBJ).Load(\"/home/irisowner/zpm/Installer.cls\",\"ck\")" && \
-  iris session iris "##class(IPM.Installer).setup(\"/home/irisowner/zpm/\",3)" && \
+	iris session IRIS < /home/irisowner/zpm/iris.script && \
   iris stop iris quietly

README.md

@@ -10,6 +10,13 @@ Helps to install ObjectScript classes and routines, globals, Embedded Python mod
 
 ## Installing ObjectScript Package Manager Client:
 
+0. Use one-liner in terminal call or programmatically:
+```
+s r=##class(%Net.HttpRequest).%New(),r.Server="pm.community.intersystems.com",r.SSLConfiguration="ISC.FeatureTracker.SSL.Config" d r.Get("/packages/zpm/latest/installer"),$system.OBJ.LoadStream(r.HttpResponse.Data,"c")
+```
+
+OR:
+
 1. Download the  [latest version](https://pm.community.intersystems.com/packages/zpm/latest/installer) of zpm from the registry
 2. Import the zpm.xml into IRIS and compile via any desired way (Management Portal, Studio or Terminal)
 

iris.script

@@ -0,0 +1,6 @@
+  zn "USER"
+  do $System.OBJ.Load("/home/irisowner/zpm/Installer.cls","ck")
+  do ##class(IPM.Installer).setup("/home/irisowner/zpm/",3)
+  do ##class(%IPM.Main).Shell("install vscode-per-namespace-settings")
+  set ^UnitTestRoot="/usr/irissys/.vscode/%SYS/UnitTestRoot"
+  halt

scripts/make-release.sh

@@ -8,7 +8,7 @@ rm -rf /opt/out/*
 iris start $ISC_PACKAGE_INSTANCENAME
 /bin/echo -e \
         " zpm \"package zpm -only -p \"\"/tmp/zpm-${VERSION}\"\" \":1\n" \
-        " set sc = ##class(%ZPM.Installer).MakeFile(\"/tmp/zpm-${VERSION}.tgz\", \"${RELEASE_FILE}\")\n" \
+        " set sc = ##class(IPM.Installer).MakeFile(\"/tmp/zpm-${VERSION}.tgz\", \"${RELEASE_FILE}\")\n" \
         " halt" \
 | iris session $ISC_PACKAGE_INSTANCENAME -U%SYS
 

src/cls/IPM/DependencyAnalyzer.cls

@@ -371,7 +371,7 @@ ClassMethod FindReferenceHelper(pIsModule As %Boolean, pName As %String = "", pI
 		If $IsObject(tHomeModule) {
 			Set tHomeModuleName = tHomeModule.Name
 		}
-		If 'pIsModule && ($ZConvert(tRawFileName_tFileType,"U") '= $ZConvert(pName,"U")) {
+		If pIsModule || ('pIsModule && ($ZConvert(tRawFileName_tFileType,"U") '= $ZConvert(pName,"U"))) {
 			// For non modules, need to ensure references to class itself aren't output
 			Merge pReferences(tHomeModuleName,tRawFileName,tFileType) = $$$ZPMDependencyTempData(tNextCounter,tReferenceKey)
 		}

src/cls/IPM/ExtensionBase/CompositeMethodOverrides.cls

@@ -128,7 +128,7 @@ ClassMethod SetSubExtensionClasses(pClassNames As %List) As %Status
 			}
 		}
 		$$$ThrowOnError(tStatus)
-		Set @..#SUBEXTENSIONGBL = tClassNames
+		Set @..#SUBEXTENSIONGBL = pClassNames
 	} Catch e {
 		Set tStatus = e.AsStatus()
 	}

src/cls/IPM/General/ModuleInfo.cls

@@ -9,7 +9,7 @@ Parameter XMLIGNOREINVALIDTAG = 1;
 Parameter XMLIGNOREINVALIDATTRIBUTE = 1;
 
 /// lowercase storage name of the module
-Property Name As %IPM.DataType.ModuleName(%JSONFIELDNAME = "name") [ Required ];
+Property Name As %IPM.DataType.ModuleName(%JSONINCLUDE = "NONE", XMLPROJECTION = "NONE") [ Required ];
 
 Property Description As %String(%JSONFIELDNAME = "description", MAXLEN = 1000);
 
@@ -31,14 +31,24 @@ Property PlatformVersion As %String(%JSONFIELDNAME = "platform_version", MAXLEN
 Property Repository As %String(MAXLEN = "", XMLPROJECTION = "NONE");
 
 /// Case-sensitive display name of the module as it appears in the module manifest
-Property DisplayNameInternal As %IPM.DataType.ModuleName(%JSONINCLUDE = "NONE") [ Internal ];
+Property DisplayName As %IPM.DataType.ModuleName(%JSONFIELDNAME = "name", XMLNAME = "Name");
 
-Property DisplayName As %IPM.DataType.ModuleName(%JSONFIELDNAME = "displayName") [ Calculated, SqlComputeCode = { Set {*} = $Case({DisplayNameInternal}, "": {Name}, : {DisplayNameInternal})}, SqlComputed ];
+Method NameSet(val As %String) As %Status
+{
+	Set i%Name = $$$lcase(val)
+	Set i%DisplayName = val
+	Return $$$OK
+}
 
-Method NameSet(val As %RawString) As %Status
+Method DisplayNameSet(val As %String) As %Status
 {
+	If (i%Name '= "") {
+    If (i%Name '= $$$lcase(val)) {
+		  Return $$$ERROR($$$GeneralError, "DisplayName needs to be case sensitive form of module name: "_i%Name)
+    }
+  }
+  Set i%DisplayName = val
 	Set i%Name = $$$lcase(val)
-	Set i%DisplayNameInternal = val
 	Return $$$OK
 }
 
@@ -54,4 +64,4 @@ Method VersionStringGet() As %String
 	Quit ..Version.ToString()
 }
 
-}
+}

src/cls/IPM/Lifecycle/Base.cls

@@ -1090,6 +1090,8 @@ Method %Verify(ByRef pParams) As %Status
 				// Create a new namespace and load the module in it.
 				#dim tNSConfig As %IPM.Storage.ModuleSetting.NamespaceConfig
 				Set tNSConfig = ..Module.GetNamespaceConfig()
+        Set tSysReqs = ..Module.SystemRequirements
+        If $IsObject(tSysReqs), tSysReqs.Interoperability = "enabled" Set tNSConfig.EnableEnsemble = 1
 
 				// Create namespace in which to run tests and switch to it.
 				$$$ThrowOnError(##class(%IPM.Utils.Build).InitializeNamespace("VERIFY",tVerbose,.tNewNamespace,tNSConfig))
@@ -1492,7 +1494,7 @@ Method OnDetermineResourceDeployability(ByRef pParams, ByRef pResourceInfo, Outp
 	Set tSC = $$$OK
 	Try {
 		If $Data(pParams("Deploy","Parameter"),tDeployParameter)#2 && (tDeployParameter '= "") {
-			If ($Piece(pResourceInfo("Name"),".",*) = "CLS") {
+			If ($ZCVT($Piece(pResourceInfo("Name"),".",*), "U") = "CLS") {
 				Set tClass = $Piece(pResourceInfo("Name"),".",1,*-1)
 				If $$$comClassDefined(tClass) && $$$defMemberDefined(tClass,$$$cCLASSparameter,tDeployParameter) {
 					// e.g., HSDEPLOY, HSAADEPLOY
@@ -1608,4 +1610,3 @@ Query Packaging(pPackaging As %String = "") As %SQLQuery [ Final, SqlProc ]
 }
 
 }
-

src/cls/IPM/Main.cls

@@ -676,6 +676,30 @@ ClassMethod TerminalPrompt() As %String
 	Quit prompt
 }
 
+/// @API.Method
+/// Get Version modules and current registry
+/// example do ##class(%IPM.Main).GetVersion("zpm,zpm-registry",.out,.list)
+ClassMethod GetVersion(ModuleName, ByRef out, list)
+{
+	Do ..GetListModules("*", ModuleName, .list)
+	for i=1:1 { quit:'$d(list(i),ns)
+	 	set ns=$lg(ns,1)
+	 	for ii=1:1 { quit:'$d(list(i,"modules",ii),module)
+	 		set out($lg(module,1))=$lb(ns,$lg(module,2))
+	 	}
+	}
+	set sc=$$$OK
+	set sql="select URL from %IPM_Repo_Remote.Definition where Enabled = 1"
+		,rs=##class(%ResultSet).%New()
+		,sc=rs.Prepare(sql)
+	Set:sc sc=rs.Execute("")
+	If sc {
+		Quit:'rs.%Next()  
+		set out=rs.Get("URL")
+	}
+	Quit sc
+}
+
 /// For use in unit tests that need to test if a command threw any exceptions.
 ClassMethod ShellInternal(pCommand As %String, Output pException As %Exception.AbstractException) [ Internal ]
 {
@@ -685,9 +709,11 @@ ClassMethod ShellInternal(pCommand As %String, Output pException As %Exception.A
 	If (tCommand '= "") {
 		Set tOneCommand = 1
 	}
+	do ##class(%IPM.Main).GetVersion("zpm",.out)	
 	Set introMessageList = $ListBuild(
 		"Welcome to the Package Manager Shell (ZPM). Version: "_$$$FormattedLine($$$Green, ..GetVersionModule("zpm")),
-		"Enter q/quit to exit the shell. Enter ?/help to view available commands"
+		"Enter q/quit to exit the shell. Enter ?/help to view available commands",
+		"Current registry "_$$$FormattedLine($$$Cyan,$g(out))
 	)
 	Set tInShell = 0
 	For {
@@ -732,7 +758,7 @@ ClassMethod ShellInternal(pCommand As %String, Output pException As %Exception.A
 				Do ..Repository(.tCommandInfo)
 			} ElseIf (tCommandInfo = "load") {
 				Do ..Load(.tCommandInfo)
-			} ElseIf (tCommandInfo = "cos") {
+			} ElseIf (tCommandInfo = "exec") {
 				Write !
 				Xecute tCommandInfo("parameters","cos")
 			} ElseIf (tCommandInfo = "install") {
@@ -1127,12 +1153,14 @@ ClassMethod IsAvailable(pModuleName As %String, pNamespace As %String = "", pArg
 	If pNamespace'="" {
 		Set $namespace = pNamespace
 	}
-	Set module = ##class(%IPM.Storage.Module).NameOpen(pModuleName,0,.sc)
-	$$$ThrowOnError(sc)
-	If module.AvailabilityClass ="" {
-		Quit 1
+	If '##class(%IPM.Storage.Module).NameExists(pModuleName,.id) {
+		Return 0
+	}
+	Set availabilityClass = ##class(%IPM.Storage.Module).AvailabilityClassGetStored(id)
+	If availabilityClass = "" {
+		Return 1
 	}
-	Quit $ClassMethod(module.AvailabilityClass,"IsAvailable",pNamespace,pArgs...)
+	Quit $ClassMethod(availabilityClass,"IsAvailable",pNamespace,pArgs...)
 }
 
 ClassMethod GetNamespaceDefaultModifiers(Output pDefaultArray) [ Internal ]
@@ -2945,3 +2973,4 @@ ClassMethod DisplayModules(ByRef pList, pNumbered As %Boolean = 0, pWithNamespac
 }
 
 }
+

src/cls/IPM/Repo/Filesystem/Cache.cls

@@ -150,7 +150,7 @@ Storage Default
 <Value>PlatformVersion</Value>
 </Value>
 <Value name="16">
-<Value>DisplayNameInternal</Value>
+<Value>DisplayName</Value>
 </Value>
 </Data>
 <DataLocation>^IPM.Repo.Filesystem.CacheD</DataLocation>

src/cls/IPM/Repo/Manager.cls

@@ -61,8 +61,8 @@ Method SearchRepositoriesForModule(pSearchCriteria As %IPM.Repo.SearchCriteria,
 			If $$$ISERR(tSC) {
 				Quit
 			}
-
-			Set tServer = ##class(%IPM.Repo.Definition).%OpenId(tRes.%Get("ID"),,.tSC)
+			Set repoID = tRes.%Get("ID")
+			Set tServer = ##class(%IPM.Repo.Definition).%OpenId(repoID,,.tSC)
 			If $$$ISERR(tSC) {
 				Quit
 			}
@@ -93,34 +93,39 @@ Method SearchRepositoriesForModule(pSearchCriteria As %IPM.Repo.SearchCriteria,
 			For i=1:1:tServerResults.Count() {
         Set item = tServerResults.GetAt(i)
         #; Sorting versions
-        Set versions(tServer.Name, +item.Version.Major, +item.Version.Minor, +item.Version.Patch, " "_item.Version.Patch_"_"_item.Version.Prerelease) = item
+        Set versions(+item.Version.Major, +item.Version.Minor, +item.Version.Patch, " "_item.Version.Patch_"_"_item.Version.Prerelease, repoID, tServer.Name) = item
 			}
 		}
-    Set name = ""
-    For {
-      Set name = $Order(versions(name))
-      Quit:name=""
-      Set major = ""
-      For {
-        Set major = $Order(versions(name, major), -1)
-        Quit:major=""
-        Set minor = ""
-        For  {
-          Set minor = $Order(versions(name, major, minor), -1)
+	Set major = ""
+	For {
+		Set major = $Order(versions(major), -1)
+		Quit:major=""
+		Set minor = ""
+		For  {
+          Set minor = $Order(versions(major, minor), -1)
           Quit:minor=""
           Set patch = ""
           For  {
-            Set patch = $Order(versions(name, major, minor, patch), -1)
+            Set patch = $Order(versions(major, minor, patch), -1)
             Quit:patch=""
             Set sub = ""
             For  {
-              Set sub = $Order(versions(name, major, minor, patch, sub), 1, item)
+              Set sub = $Order(versions(major, minor, patch, sub), 1)
               Quit:sub=""
-              Do pResults.Insert(##class(%IPM.Storage.QualifiedModuleInfo).%New(name, item))
+              Set repoOrder = ""
+              For {
+	              Set repoOrder = $Order(versions(major, minor, patch, sub, repoOrder), 1)
+	              Quit:repoOrder=""
+	              Set name = ""
+	              For {
+		              Set name = $Order(versions(major, minor, patch, sub, repoOrder, name), 1, item)
+		              Quit:name=""
+		              Do pResults.Insert(##class(%IPM.Storage.QualifiedModuleInfo).%New(name, item))
+	              }
+              }
             }
           }
         }
-      }
     }
 	} Catch e {
 		If (e.Name["ZSOAP") && $Data(%objlasterror) {